From 1127398e503723cffa123d5846af3e6cd83e8cde Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 21 Apr 2023 03:00:02 +0000 Subject: [PATCH] Bug 33478: Apply formatting to ACCOUNT_DEBIT To test: 1. Go to a patron accounting page 2. Create a manual invoice and Save 3. You'll be redirected to the Transactions tab 4. Click the Pay button next to your invoice and confirm Payment 5. Click the Print button next to your Payment 6. Confirm your format settings for ACCOUNT_CREDIT are applied --- .../prog/en/modules/members/printfeercpt.tt | 29 ++++++++++++------- members/printfeercpt.pl | 3 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index ef68ee893ff..d1b35c7c606 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -14,20 +14,29 @@ [% INCLUDE 'blocking_errors.inc' %] - +[% PROCESS 'notice_format_translations.inc' %] +
- [% IF slip %] - [% IF plain %] -
-      [% slip | html %]
-    
+ [% IF ( slip ) %] +
+ [% IF slip.is_html %] + [% slip.content | $raw %] + [% ELSE %] +
+                [% slip.content | html %]
+            
+ [% END %] +
[% ELSE %] - [% slip | $raw %] + No print template found [% END %] - [% ELSE %] - No print template found - [% END %]
[% MACRO jsinclude BLOCK %] diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index 6c695e469a2..6ebb213b88f 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.pl @@ -88,8 +88,7 @@ $letter //= C4::Letters::GetPreparedLetter( ); $template->param( - slip => $letter->{content}, - plain => !$letter->{is_html}, + slip => $letter, patron => $patron, ); -- 2.30.2