Attachment #73564 for bug #19935

View | Details | Raw Unified | Return to bug 19935
Collapse All | Expand All




                                                    <td class="date_due overdue">
                                                        <span title="[% ISSUE.date_due %]">
                                                            <span class="tdlabel">Date due:</span>
                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                        </span>
                                                    </td>
                                                [% ELSE %]
                                                    <td class="date_due">
                                                        <span title="[% ISSUE.date_due %]">
                                                            <span class="tdlabel">Date due:</span>
                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                        </span>
                                                    </td>
                                                [% END %]

                                                <td>
                                                    <span title="[% OVERDUE.date_due %]">
                                                        <span class="tdlabel">Date due:</span>
                                                        [% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
                                                    </span>
                                                </td>
                                                [% IF ( OpacRenewalAllowed ) %]




my @overdues;
my @issuedat;
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
my $pending_checkouts = $patron->pending_checkouts({}, { order_by => [ { -desc => 'date_due' }, { -asc => 'issue_id' } ] });
if ( $pending_checkouts->count ) { # Useless test
    while ( my $c = $pending_checkouts->next ) {
        my $issue = $c->unblessed_all_relateds;
        # check for reserves
        my $restype = GetReserveStatus( $issue->{'itemnumber'} );
        if ( $restype ) {

            }
        }

        if ( $c->is_overdue ) {
            push @overdues, $issue;
            $overdues_count++;
            $issue->{'overdue'} = 1;
- 

Return to bug 19935

Lines 246-259 Using this account is not recommended because some parts of Koha will not functi Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +3 lines)
246	<td class="date_due overdue">	246	<td class="date_due overdue">
247	<span title="[% ISSUE.date_due %]">	247	<span title="[% ISSUE.date_due %]">
248	<span class="tdlabel">Date due:</span>	248	<span class="tdlabel">Date due:</span>
249	[% ISSUE.date_due_sql \| $KohaDates as_due_date => 1 %]	249	[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]
250	</span>	250	</span>
251	</td>	251	</td>
252	[% ELSE %]	252	[% ELSE %]
253	<td class="date_due">	253	<td class="date_due">
254	<span title="[% ISSUE.date_due %]">	254	<span title="[% ISSUE.date_due %]">
255	<span class="tdlabel">Date due:</span>	255	<span class="tdlabel">Date due:</span>
256	[% ISSUE.date_due_sql \| $KohaDates as_due_date => 1 %]	256	[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]
257	</span>	257	</span>
258	</td>	258	</td>
259	[% END %]	259	[% END %]
Lines 540-546 Using this account is not recommended because some parts of Koha will not functi Link Here
540	<td>	540	<td>
541	<span title="[% OVERDUE.date_due %]">	541	<span title="[% OVERDUE.date_due %]">
542	<span class="tdlabel">Date due:</span>	542	<span class="tdlabel">Date due:</span>
543	[% OVERDUE.date_due_sql \| $KohaDates as_due_date => 1 %]	543	[% OVERDUE.date_due \| $KohaDates as_due_date => 1 %]
544	</span>	544	</span>
545	</td>	545	</td>
546	[% IF ( OpacRenewalAllowed ) %]	546	[% IF ( OpacRenewalAllowed ) %]

Lines 184-192 my $overdues_count = 0; Link Here

(-)a/opac/opac-user.pl (-5 / +5 lines)
184	my @overdues;	184	my @overdues;
185	my @issuedat;	185	my @issuedat;
186	my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };	186	my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
187	my $issues = GetPendingIssues($borrowernumber);	187	my $pending_checkouts = $patron->pending_checkouts({}, { order_by => [ { -desc => 'date_due' }, { -asc => 'issue_id' } ] });
188	if ($issues){	188	if ( $pending_checkouts->count ) { # Useless test
189	foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {	189	while ( my $c = $pending_checkouts->next ) {
		190	my $issue = $c->unblessed_all_relateds;
190	# check for reserves	191	# check for reserves
191	my $restype = GetReserveStatus( $issue->{'itemnumber'} );	192	my $restype = GetReserveStatus( $issue->{'itemnumber'} );
192	if ( $restype ) {	193	if ( $restype ) {
Lines 251-257 if ($issues){ Link Here
251	}	252	}
252	}	253	}
253		254
254	if ( $issue->{'overdue'} ) {	255	if ( $c->is_overdue ) {
255	push @overdues, $issue;	256	push @overdues, $issue;
256	$overdues_count++;	257	$overdues_count++;
257	$issue->{'overdue'} = 1;	258	$issue->{'overdue'} = 1;
258	-