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

(-)a/circ/returns.pl (-3 / +13 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 819-827 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
819
            } else {
820
            } else {
820
                $ri{return_overdue} = 1 if ( DateTime->compare( $duedate, $dropboxdate ) == -1 );
821
                $ri{return_overdue} = 1 if ( DateTime->compare( $duedate, $dropboxdate ) == -1 );
821
            }
822
            }
822
            $ri{patron} = $patron,
823
            my $patron_messages = Koha::Patron::Messages->search(
823
                $ri{borissuescount} = $patron->checkouts->count;
824
            {
824
        } else {
825
                borrowernumber => $riborrowernumber{$_},
826
                message_type => 'B',
827
            });
828
829
830
            $ri{patron} = $patron;
831
            $ri{messages} = $patron_messages;
832
            $ri{borissuescount} = $patron->checkouts->count;
833
        }
834
        else {
825
            $ri{borrowernumber} = $riborrowernumber{$_};
835
            $ri{borrowernumber} = $riborrowernumber{$_};
826
        }
836
        }
827
837
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +8 lines)
Lines 1397-1402 Link Here
1397
                            [% IF ( riloo.patron.borrowernotes ) %]
1397
                            [% IF ( riloo.patron.borrowernotes ) %]
1398
                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
1398
                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
1399
                            [% END %]
1399
                            [% END %]
1400
                            [% IF ( riloo.patron.opacnote ) %]
1401
                                <p><span class="circ-hlt opac-note">[% riloo.patron.opacnote | html %]</span></p>
1402
                            [% END %]
1403
                            [% IF ( riloo.messages.count ) %]
1404
                                [% FOREACH message IN riloo.messages %]
1405
                                    <p><span class="circ-hlt patron-opac-messages">[% message.message | html %]</span></p>
1406
                                [% END %]
1407
                            [% END %]
1400
                            [% IF ( riloo.itemnote ) %]
1408
                            [% IF ( riloo.itemnote ) %]
1401
                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
1409
                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
1402
                            [% END %]
1410
                            [% END %]
1403
- 

Return to bug 27339