From 0b3f22710a45ccfcde8668494e2073ec8d51cdd8 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 19 May 2020 13:43:24 -0400 Subject: [PATCH] Bug 25534: Add reason to pendingreserves.pl Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Rebecca Coert Signed-off-by: Katrin Fischer Bug 25534: (QA follow-up) Fix typo Signed-off-by: Katrin Fischer Bug 25534: (QA follow-up) Add colon to label on pendingreserves.pl Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- circ/pendingreserves.pl | 3 ++- .../prog/en/modules/circ/pendingreserves.tt | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 081931816f..24d4f67f56 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -56,7 +56,8 @@ my @messages; if ( $op eq 'cancel_reserve' and $reserve_id ) { my $hold = Koha::Holds->find( $reserve_id ); if ( $hold ) { - $hold->cancel; + my $cancellation_reason = $input->param('cancellation-reason'); + $hold->cancel({ cancellation_reason => $cancellation_reason }); push @messages, { type => 'message', code => 'hold_cancelled' }; } } elsif ( $op =~ m|^mark_as_lost| ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 09ab9895ef..71527fc4c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -151,10 +151,24 @@
+ + [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] + [% IF hold_cancellation %] +
+ + +
+ [% END %] + [% IF reserveloo.holdingbranch != reserveloo.homebranch %] - + [% ELSE %] - + [% END %]
-- 2.39.5