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

(-)a/circ/returns.pl (-1 / +9 lines)
Lines 56-61 use Koha::DateUtils; Link Here
56
use Koha::Holds;
56
use Koha::Holds;
57
use Koha::Items;
57
use Koha::Items;
58
use Koha::Patrons;
58
use Koha::Patrons;
59
use Koha::Patron::Messages;
59
60
60
my $query = CGI->new;
61
my $query = CGI->new;
61
62
Lines 576-587 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
576
            $ri{minute}   = $duedate->minute();
577
            $ri{minute}   = $duedate->minute();
577
            $ri{duedate} = output_pref($duedate);
578
            $ri{duedate} = output_pref($duedate);
578
            my $patron = Koha::Patrons->find( $riborrowernumber{$_} );
579
            my $patron = Koha::Patrons->find( $riborrowernumber{$_} );
580
            my $patron_messages = Koha::Patron::Messages->search(
581
            {
582
                borrowernumber => $riborrowernumber{$_},
583
                message_type => 'B',
584
            });
585
579
            unless ( $dropboxmode ) {
586
            unless ( $dropboxmode ) {
580
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, dt_from_string()) == -1);
587
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, dt_from_string()) == -1);
581
            } else {
588
            } else {
582
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
589
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
583
            }
590
            }
584
            $ri{patron} = $patron,
591
            $ri{patron} = $patron;
592
            $ri{messages} = $patron_messages;
585
            $ri{borissuescount} = $patron->checkouts->count;
593
            $ri{borissuescount} = $patron->checkouts->count;
586
        }
594
        }
587
        else {
595
        else {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +8 lines)
Lines 916-921 Link Here
916
                                            [% IF ( riloo.patron.borrowernotes ) %]
916
                                            [% IF ( riloo.patron.borrowernotes ) %]
917
                                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | html %]</span></p>
917
                                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | html %]</span></p>
918
                                            [% END %]
918
                                            [% END %]
919
                                            [% IF ( riloo.patron.opacnote ) %]
920
                                                <p><span class="circ-hlt opac-note">[% riloo.patron.opacnote | html %]</span></p>
921
                                            [% END %]
922
                                            [% IF ( riloo.messages.count ) %]
923
                                                [% FOREACH message IN riloo.messages %]
924
                                                    <p><span class="circ-hlt patron-opac-messages">[% message.message | html %]</span></p>
925
                                                [% END %]
926
                                            [% END %]
919
                                            [% IF ( riloo.itemnote ) %]
927
                                            [% IF ( riloo.itemnote ) %]
920
                                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
928
                                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
921
                                            [% END %]
929
                                            [% END %]
922
- 

Return to bug 27339