From 1008e21d430177ebf41f6a22ba29299228dba949 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 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 d9a5dc0160..116ac3c15e 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -488,6 +488,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 'LostItemFeeRestored' ) {
+        $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 b52fc5becf..51d2b308ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -266,6 +266,10 @@
                                             [% END %]
                                             [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
                                                 <p class="problem ret_refund">A refund has been applied to the borrowing patron's account.</p>
+                                            [% ELSIF LostItemFeeCharged and not Koha.Preference('BlockReturnOfLostItems') %]
+                                                <p class="problem ret_charged">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.</p>
+                                            [% ELSIF LostItemFeeRestored and not Koha.Preference('BlockReturnOfLostItems') %]
+                                                <p class="problem ret_restored">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.</p>
                                             [% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
                                                <h5>Cannot check in</h5>
                                                <p><strong>NOT CHECKED IN</strong></p>
-- 
2.39.2