From 9d5424db0b41509804352969609a4b12cabd16df Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 5 Jun 2020 09:19:48 +0100 Subject: [PATCH] Bug 23091: Add template handling for new messages This patch adds handling for the display of the two new messages added by this patchset in the returns screen. --- circ/returns.pl | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/circ/returns.pl b/circ/returns.pl index e1bce3c3f1..6f46d3b368 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -485,6 +485,12 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'LostItemFeeRefunded' ) { $template->param( LostItemFeeRefunded => 1 ); } + elsif ( $code eq 'LostItemFeeCharged' ) { + $template->param( LostItemFeeCharged => 1 ); + } + elsif ( $code eq 'LostItemRestored' ) { + $template->param( LostItemFeeRestored => 1 ); + } elsif ( $code eq 'ResFound' ) { ; # FIXME... anything to do here? } 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 43515dac30..0a4ff2b7df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -261,6 +261,10 @@ [% END %] [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]

A refund has been applied to the borrowing patron's account.

+ [% ELSIF LostItemFeeCharged and not Koha.Preference('BlockReturnOfLostItems') %] +

A refund for the lost item charge has been applied to the borrowing patron's account, and new overdue charge has been calculated and applied.

+ [% ELSIF LostItemFeeRestored and not Koha.Preference('BlockReturnOfLostItems') %] +

A refund for the lost item charge has been applied to the borrowing patron's account and if an overdue fine was forgiven when the item was marked as lost, it has been reverted.

[% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
Cannot check in

NOT CHECKED IN

-- 2.20.1