From cff456e286f5f11176eb38fde98a421b7831cfac Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Date: Tue, 11 Jun 2024 10:43:24 +0000
Subject: [PATCH] Bug 28575: Add a new check-in message for the new syspref

Signed-off-by: Andrew Fuerste Henry <andrewfh@dubcolib.org>
---
 C4/Circulation.pm                                       | 2 ++
 circ/returns.pl                                         | 6 ++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index d8b75fe858..6e2081d69b 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2312,6 +2312,8 @@ sub AddReturn {
                   if $message->message eq 'processing_refunded';
                 $messages->{'LostItemFeeRestored'} = 1
                   if $message->message eq 'lost_restored';
+                $messages->{'LostItemPaymentNotRefunded'} = 1
+                  if $message->message eq 'payment_not_refunded';
 
                 if ( $message->message eq 'lost_charge' ) {
                     $issue //= Koha::Old::Checkouts->search(
diff --git a/circ/returns.pl b/circ/returns.pl
index fb3f135b71..34cb1d0a3c 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -696,6 +696,12 @@ foreach my $code ( keys %$messages ) {
     elsif ( $code eq 'LostItemFeeRefunded' ) {
         $template->param( LostItemFeeRefunded => 1 );
     }
+    elsif (
+        $code eq 'LostItemPaymentNotRefunded'
+        )
+    {
+        $template->param( LostItemPaymentNotRefunded => 1 );
+    }
     elsif ( $code eq 'LostItemFeeCharged' ) {
         $template->param( LostItemFeeCharged => 1 );
     }
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 474a3e6473..1343902efc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -350,6 +350,8 @@
                                                 <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 LostItemPaymentNotRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
+                                                <p class="problem ret_restored">No refund was applied to the patron's account for the previously paid lost item charge as the payment was made more than [% Koha.Preference('NoRefundOnLostFinesPaidAge') | html%] days ago.</p>
                                             [% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
                                                <h5>Cannot check in</h5>
                                                <p><strong>NOT CHECKED IN</strong></p>
-- 
2.39.2