From 82a7f7ccdaebec13fe20ee2b46d868326b94203a Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 31 Jan 2014 13:56:47 -0500 Subject: [PATCH] Bug 11629 [QA Followup] - Add message for librarian that status was updated --- C4/Circulation.pm | 1 + circ/returns.pl | 3 +++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5d20b9e..28ffb37 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1766,6 +1766,7 @@ sub AddReturn { else { foreach my $key ( keys %$rules ) { if ( $item->{notforloan} eq $key ) { + $messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} }; ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber ); last; } diff --git a/circ/returns.pl b/circ/returns.pl index 93f36f2..f7356a6 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -467,6 +467,9 @@ foreach my $code ( keys %$messages ) { $err{debarborrowernumber} = $borrower->{borrowernumber}; $err{debarname} = "$borrower->{firstname} $borrower->{surname}"; } + elsif ( $code eq 'NotForLoanStatusUpdated' ) { + $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated}; + } else { die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die. # This forces the issue of staying in sync w/ Circulation.pm diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index aee0a5e..b25428c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1,5 +1,6 @@ [% USE KohaDates %] [% USE Branches %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Check in [% title |html %] @@ -319,6 +320,13 @@ $(document).ready(function () {

Check in message

[% FOREACH errmsgloo IN errmsgloop %] + [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] +

+ Not for loan status updated + from [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %] + to [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %] +

+ [% END %] [% IF ( errmsgloo.badbarcode ) %]

No item with barcode: [% errmsgloo.msg %]

[% END %] -- 1.7.2.5