From 39ea3bb45fd3393eb2d58578a725570e70e70e14 Mon Sep 17 00:00:00 2001 From: Kyle Hall 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 Signed-off-by: Marcel de Rooy [EDIT] Reverting the KohaDates.now changes. We can simply use [% today %]. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer --- 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' %] @@ -85,7 +86,7 @@ return { - + [% IF ( borrower.account.balance <= 0 ) %] 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' %]" - "
Total outstanding dues as on date: Total outstanding dues as of [% today | $KohaDates %]: [% ELSE %][% END %][% borrower.account.balance | $Price %]
" @@ -1369,7 +1370,7 @@ tables: - "" - " " - " " - - " " + - " " - " [% IF ( borrower.account.balance <= 0 ) %]" - " " - " " -- 2.30.2
Total outstanding dues as on date: Total outstanding dues as of [% today | $KohaDates %]: [% ELSE %][% END %][% borrower.account.balance | $Price %]