Attachment 151591 Details for Bug 33478 – Bug 33478: Apply formatting to ACCOUNTS_SUMMARY

[patch] Bug 33478: Apply formatting to ACCOUNTS_SUMMARY

Bug-33478-Apply-formatting-to-ACCOUNTSSUMMARY.patch (text/plain), 2.08 KB, created by Sam Lau on 2023-05-23 15:22:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Lau

Created: 2023-05-23 15:22:01 UTC

Size: 2.08 KB

patch

obsolete

>From d735d5b27ce51a7bbef8b013d00bb514b2e20483 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>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 <samalau@gmail.com>
>---
> .../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 %]
> </head>
> 
>+[% PROCESS 'notice_format_translations.inc' %]
>+
> <body id="members_printslip" class="member">
>-    <div id="slip">
>-        [% IF plain %]
>-            <pre>[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]</pre>
>-        [% ELSE %]
>-            [% IF ( slip ) %][% slip | $raw %][% ELSE %]No slip template found[% END %]
>-        [% END %]
>-    </div>
>+<div id="slip">
>+    [% IF ( slip ) %]
>+        [% PROCESS 'slip_content.inc' notice=slip %]
>+    [% ELSE %]
>+        No slip template found
>+    [% END %]
>+</div>
> 
> [% 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

Actions: View | Diff | Splinter Review

Attachments on bug 33478: 149743 | 149785 | 149786 | 149787 | 149914 | 149915 | 149916 | 149917 | 149918 | 149999 | 150000 | 150001 | 150002 | 150003 | 150004 | 150005 | 150006 | 150007 | 150008 | 150009 | 150010 | 150011 | 150012 | 150265 | 150266 | 150267 | 150268 | 150269 | 150270 | 150271 | 150272 | 150273 | 150274 | 150275 | 150276 | 150277 | 150324 | 150325 | 150326 | 150327 | 150328 | 150329 | 150330 | 150331 | 150332 | 150333 | 150334 | 150335 | 150336 | 150337 | 150338 | 150339 | 150340 | 150341 | 150342 | 150343 | 150344 | 150345 | 151548 | 151580 | 151581 | 151582 | 151583 | 151584 | 151585 | 151586 | 151587 | 151588 | 151589 | 151590 | 151591 | 151592 | 151593 | 156469 | 157368 | 157369 | 157370 | 157371 | 157372 | 157373 | 157374 | 157375 | 157376 | 157377 | 157378 | 157379 | 157380 | 157381 | 157382 | 157387 | 158835 | 158836 | 158837 | 158838 | 158839 | 158840 | 158841 | 158842 | 158843 | 158844 | 158845 | 158846 | 158847 | 158848 | 158849 | 158856 | 162556 | 162557 | 162558 | 162559 | 162560 | 162561 | 162562 | 162563 | 162564 | 162565 | 162566 | 162567 | 162568 | 162569 | 163903 | 163904 | 163905 | 163906 | 163907 | 163908 | 163909 | 163910 | 163911 | 163912 | 163913 | 163914 | 163915 | 163916 | 163924 | 163925 | 163926 | 163927 | 163928 | 163929 | 163930 | 163931 | 163932 | 163933 | 163934 | 163935 | 163936 | 163937 | 163938 | 164719 | 164720 | 164721 | 164722 | 164723 | 164724 | 164725 | 164726 | 164727 | 164728 | 164729 | 164730 | 164731 | 164732 | 164733 | 164741 | 164742 | 164743 | 164744 | 164745 | 164746 | 164747 | 164748 | 164749 | 164750 | 164751 | 164752 | 164753 | 164754 | 164755