From 7a506ac4712f83c6e665242f8a7b3b0a85798811 Mon Sep 17 00:00:00 2001
From: Kyle Hall <kyle@bywatersolutions.com>
Date: Fri, 21 Oct 2022 08:20:33 -0400
Subject: [PATCH] Bug 31713: (QA follow-up) Add current date to slip

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
[EDIT] Reverting the KohaDates.now changes. We can simply use [% today %].
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 installer/data/mysql/atomicupdate/bug_31713.pl       | 5 +++--
 installer/data/mysql/en/mandatory/sample_notices.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_31713.pl b/installer/data/mysql/atomicupdate/bug_31713.pl
index 9ab4132d89..ee1681ccb2 100644
--- a/installer/data/mysql/atomicupdate/bug_31713.pl
+++ b/installer/data/mysql/atomicupdate/bug_31713.pl
@@ -8,8 +8,9 @@ return {
         my ($dbh, $out) = @$args{qw(dbh out)};
 
         my $slip_content = <<~'END_CONTENT';
-[% USE Koha %]
 [% USE Branches %]
+[% USE Koha %]
+[% USE KohaDates %]
 [% USE Price %]
 [% PROCESS 'accounts.inc' %]
 <table>
@@ -85,7 +86,7 @@ return {
 
   <tfoot>
     <tr>
-      <td colspan='3'>Total outstanding dues as on date: </td>
+      <td colspan='3'>Total outstanding dues as of [% today | $KohaDates  %]: </td>
       [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td>
     </tr>
   </tfoot>
diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 436a1ecc6a..c2dd1a59c4 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1292,8 +1292,9 @@ tables:
           message_transport_type: print
           lang: default
           content:
-            - "[% USE Koha %]"
             - "[% USE Branches %]"
+            - "[% USE Koha %]"
+            - "[% USE KohaDates %]"
             - "[% USE Price %]"
             - "[% PROCESS 'accounts.inc' %]"
             - "<table>"
@@ -1369,7 +1370,7 @@ tables:
             - ""
             - "  <tfoot>"
             - "    <tr>"
-            - "      <td colspan='3'>Total outstanding dues as on date: </td>"
+            - "      <td colspan='3'>Total outstanding dues as of [% today | $KohaDates %]: </td>"
             - "      [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td>"
             - "    </tr>"
             - "  </tfoot>"
-- 
2.20.1