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

(-)a/circ/returns.pl (-1 / +10 lines)
Lines 52-57 use Koha::Holds; Link Here
52
use Koha::Item::Transfers;
52
use Koha::Item::Transfers;
53
use Koha::Items;
53
use Koha::Items;
54
use Koha::Patrons;
54
use Koha::Patrons;
55
use Koha::Patron::Messages;
55
use Koha::Recalls;
56
use Koha::Recalls;
56
57
57
my $query = CGI->new;
58
my $query = CGI->new;
Lines 798-804 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
798
            } else {
799
            } else {
799
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
800
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
800
            }
801
            }
801
            $ri{patron} = $patron,
802
            my $patron_messages = Koha::Patron::Messages->search(
803
            {
804
                borrowernumber => $riborrowernumber{$_},
805
                message_type => 'B',
806
            });
807
808
809
            $ri{patron} = $patron;
810
            $ri{messages} = $patron_messages;
802
            $ri{borissuescount} = $patron->checkouts->count;
811
            $ri{borissuescount} = $patron->checkouts->count;
803
        }
812
        }
804
        else {
813
        else {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +8 lines)
Lines 1378-1383 Link Here
1378
                                                [% IF ( riloo.patron.borrowernotes ) %]
1378
                                                [% IF ( riloo.patron.borrowernotes ) %]
1379
                                                    <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
1379
                                                    <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
1380
                                                [% END %]
1380
                                                [% END %]
1381
                                                [% IF ( riloo.patron.opacnote ) %]
1382
                                                    <p><span class="circ-hlt opac-note">[% riloo.patron.opacnote | html %]</span></p>
1383
                                                [% END %]
1384
                                                [% IF ( riloo.messages.count ) %]
1385
                                                    [% FOREACH message IN riloo.messages %]
1386
                                                        <p><span class="circ-hlt patron-opac-messages">[% message.message | html %]</span></p>
1387
                                                    [% END %]
1388
                                                [% END %]
1381
                                                [% IF ( riloo.itemnote ) %]
1389
                                                [% IF ( riloo.itemnote ) %]
1382
                                                    <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
1390
                                                    <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
1383
                                                [% END %]
1391
                                                [% END %]
1384
- 

Return to bug 27339