Attachment 150008 Details for Bug 33478 – Bug 33478: Apply formatting to ACCOUNT_DEBIT

[patch] Bug 33478: Apply formatting to ACCOUNT_DEBIT

Bug-33478-Apply-formatting-to-ACCOUNTDEBIT.patch (text/plain), 2.60 KB, created by Aleisha Amohia on 2023-04-21 03:40:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2023-04-21 03:40:15 UTC

Size: 2.60 KB

patch

obsolete

>From 18bdb272ac98ba1a906f98517277a5f5ce006739 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>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' %]
> </head>
> 
>-<body id="pat_printfeercpt" class="pat">
>+[% PROCESS 'notice_format_translations.inc' %]
> 
>+<body id="pat_printfeercpt" class="pat">
> <div id="receipt">
>-  [% IF slip %]
>-    [% IF plain %]
>-    <pre>
>-      [% slip | html %]
>-    </pre>
>+    [% IF ( slip ) %]
>+        <div class="slip" style="
>+            text-align:[% PROCESS translate_justification_types type=slip.text_justify | trim %];
>+            font-size:[% slip.font_size %]px;
>+            width:[% slip.notice_width %][% PROCESS translate_unit_types type=slip.units | trim %];
>+            margin-top:[% slip.top_margin %][% PROCESS translate_unit_types type=slip.units | trim %];
>+            margin-left:[% slip.left_margin %][% PROCESS translate_unit_types type=slip.units | trim %];
>+        ">
>+            [% IF slip.is_html %]
>+                [% slip.content | $raw %]
>+            [% ELSE %]
>+            <pre>
>+                [% slip.content | html %]
>+            </pre>
>+            [% END %]
>+        </div>
>     [% ELSE %]
>-      [% slip | $raw %]
>+        No print template found
>     [% END %]
>-  [% ELSE %]
>-    <span>No print template found</span>
>-  [% END %]
> </div>
> 
> [% 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

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