From 1a6fd422014f7aece8f349e457f3b5d4d9f263d3 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_CREDIT 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 Signed-off-by: Sam Lau --- .../prog/en/modules/members/printfeercpt.tt | 15 +++++---------- members/printfeercpt.pl | 3 +-- 2 files changed, 6 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 5693c3188cb..212ec61c2f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -18,20 +18,15 @@ [% INCLUDE 'blocking_errors.inc' %] - +[% PROCESS 'notice_format_translations.inc' %] +
- [% IF slip %] - [% IF plain %] - 
-      [% slip | html %]
-
+ [% IF ( slip ) %] + [% PROCESS 'slip_content.inc' notice=slip %] [% 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