From a0266df263d91fcadded58773c8c8112fa39706a Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 21 Apr 2023 03:18:05 +0000 Subject: [PATCH] Bug 33478: Apply formatting to ACCOUNTS_SUMMARY To test: 1. Go to a patron accounting page 2. Create a manual invoice and Save 3. Click the Print button in the patron toolbar 4. Click the 'Print account balance' button 5. Confirm your format settings for ACCOUNTS_SUMMARY are applied --- .../prog/en/modules/members/printnotice.tt | 30 ++++++++++++++----- members/printnotice.pl | 3 +- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt index a5f78dbb1f2..cea4c1a2e2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt @@ -16,14 +16,30 @@ [% END %] +[% PROCESS 'notice_format_translations.inc' %] + -
- [% IF plain %] - 
[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
- [% ELSE %] - [% IF ( slip ) %][% slip | $raw %][% ELSE %]No slip template found[% END %] - [% END %] -
+
+ [% IF ( slip ) %] +
+ [% IF slip.is_html %] + [% slip.content | $raw %] + [% ELSE %] + 
+                [% slip.content | html %]
+
+ [% END %] +
+ [% ELSE %] + No slip template found + [% END %] +
[% MACRO jsinclude BLOCK %] [% INCLUDE 'slip-print.inc' #printThenClose %] diff --git a/members/printnotice.pl b/members/printnotice.pl index 8fb6b20d872..fe570b02fc3 100755 --- a/members/printnotice.pl +++ b/members/printnotice.pl @@ -65,8 +65,7 @@ my $letter = C4::Letters::GetPreparedLetter( $template->param( title => $letter->{title}, - slip => $letter->{content}, - plain => !$letter->{is_html}, + slip => $letter, ); output_html_with_http_headers $input, $cookie, $template->output; -- 2.30.2