Attachment #170069 for bug #27339

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




use Koha::Item::Transfers;
use Koha::Items;
use Koha::Patrons;
use Koha::Patron::Messages;
use Koha::Recalls;

my $query = CGI->new;

            } else {
                $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
            }
            my $patron_messages = Koha::Patron::Messages->search(
            {
                borrowernumber => $riborrowernumber{$_},
                message_type => 'B',
            });


            $ri{patron} = $patron;
            $ri{messages} = $patron_messages;
            $ri{borissuescount} = $patron->checkouts->count;
        }
        else {

Lines 1363-1368 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +8 lines)
1363	[% IF ( riloo.patron.borrowernotes ) %]	1363	[% IF ( riloo.patron.borrowernotes ) %]
1364	<p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes \| $raw \| html_line_break %]</span></p>	1364	<p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes \| $raw \| html_line_break %]</span></p>
1365	[% END %]	1365	[% END %]
		1366	[% IF ( riloo.patron.opacnote ) %]
		1367	<p><span class="circ-hlt opac-note">[% riloo.patron.opacnote \| html %]</span></p>
		1368	[% END %]
		1369	[% IF ( riloo.messages.count ) %]
		1370	[% FOREACH message IN riloo.messages %]
		1371	<p><span class="circ-hlt patron-opac-messages">[% message.message \| html %]</span></p>
		1372	[% END %]
		1373	[% END %]
1366	[% IF ( riloo.itemnote ) %]	1374	[% IF ( riloo.itemnote ) %]
1367	<p><span class="circ-hlt item-note-public">[% riloo.itemnote \| html %]</span></p>	1375	<p><span class="circ-hlt item-note-public">[% riloo.itemnote \| html %]</span></p>
1368	[% END %]	1376	[% END %]
1369	-

Return to bug 27339

Lines 53-58 use Koha::Holds; Link Here

(-)a/circ/returns.pl (-1 / +10 lines)
53	use Koha::Item::Transfers;	53	use Koha::Item::Transfers;
54	use Koha::Items;	54	use Koha::Items;
55	use Koha::Patrons;	55	use Koha::Patrons;
		56	use Koha::Patron::Messages;
56	use Koha::Recalls;	57	use Koha::Recalls;
57		58
58	my $query = CGI->new;	59	my $query = CGI->new;
Lines 805-811 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
805	} else {	806	} else {
806	$ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);	807	$ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
807	}	808	}
808	$ri{patron} = $patron,	809	my $patron_messages = Koha::Patron::Messages->search(
		810	{
		811	borrowernumber => $riborrowernumber{$_},
		812	message_type => 'B',
		813	});
		814
		815
		816	$ri{patron} = $patron;
		817	$ri{messages} = $patron_messages;
809	$ri{borissuescount} = $patron->checkouts->count;	818	$ri{borissuescount} = $patron->checkouts->count;
810	}	819	}
811	else {	820	else {