From 9cc26cb796198b824633ec33343413111fa012d0 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 2 Aug 2012 08:23:50 -0400 Subject: [PATCH] Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table. Signed-off-by: Chris Cormack --- circ/circulation.pl | 5 +++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 551ceba..a2d70c4 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -97,6 +97,10 @@ my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers our %renew_failed = {}; for (@failedrenews) { $renew_failed{$_} = 1; } +my @failedreturns = $query->param('failedreturn'); +our %return_failed = {}; +for (@failedreturns) { $return_failed{$_} = 1; } + my $findborrower = $query->param('findborrower'); $findborrower =~ s|,| |g; my $borrowernumber = $query->param('borrowernumber'); @@ -462,6 +466,7 @@ sub build_issue_data { $it->{'od'} = $it->{'overdue'}; ($it->{'author'} eq '') and $it->{'author'} = ' '; $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; + $it->{'return_failed'} = $return_failed{$it->{'itemnumber'}}; if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) { (!$relatives) ? push @todaysissues, $it : push @relissues, $it; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6f72392..90e6231 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -741,7 +741,7 @@ No patron matched [% message %] [% END %] [% IF ( todayissue.return_failed ) %] - Checkin failed + Check-in failed [% ELSE %] [% IF ( todayissue.renew_error_on_reserve ) %] On hold @@ -816,7 +816,7 @@ No patron matched [% message %] [% END %] [% IF ( previssue.return_failed ) %] - Checkin failed + Check-in failed [% ELSE %] [% IF ( previssue.renew_error_on_reserve ) %] On hold diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index b6df1b3..d81ef57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -506,7 +506,7 @@ function validate1(date) { [% END %] [% IF ( issueloo.return_failed ) %] - Checkin failed + Check-in failed [% ELSE %] [% IF ( issueloo.norenew_reason_on_reserve ) %] On hold -- 1.7.10.4