From d735d5b27ce51a7bbef8b013d00bb514b2e20483 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 Signed-off-by: Sam Lau --- .../prog/en/modules/members/printnotice.tt | 16 +++++++++------- members/printnotice.pl | 3 +-- 2 files changed, 10 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 a5f78dbb1f..e6ae248c90 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,16 @@ [% 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 ) %] + [% PROCESS 'slip_content.inc' notice=slip %] + [% 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 8fb6b20d87..fe570b02fc 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