Attachment 79515 Details for Bug 21167 – Bug 21167: (QA follow-up) Use accounttype.inc for generating account description

[patch] Bug 21167: (QA follow-up) Use accounttype.inc for generating account description

Bug-21167-QA-follow-up-Use-accounttypeinc-for-gene.patch (text/plain), 3.66 KB, created by Martin Renvoize (ashimema) on 2018-09-27 13:59:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-09-27 13:59:26 UTC

Size: 3.66 KB

patch

obsolete

>From 7a118c9a434c3efc461494c14e883fedff4f517f Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Wed, 19 Sep 2018 08:07:57 +0000
>Subject: [PATCH] Bug 21167: (QA follow-up) Use accounttype.inc for generating
> account description
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/members/printfeercpt.tt   | 24 +------------------
> .../prog/en/modules/members/printinvoice.tt   | 24 +------------------
> 2 files changed, 2 insertions(+), 46 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 f57ef72fd3..74fbc2559c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>@@ -51,29 +51,7 @@
> <tr class="highlight">
>       <td>[% account.date | $KohaDates %]</td>
>       <td>
>-        [% SWITCH account.accounttype %]
>-            [% CASE 'Pay' %]Payment, thanks
>-            [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
>-            [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
>-            [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
>-            [% CASE 'N' %]New card
>-            [% CASE 'F' %]Fine
>-            [% CASE 'A' %]Account management fee
>-            [% CASE 'M' %]Sundry
>-            [% CASE 'L' %]Lost item
>-            [% CASE 'W' %]Writeoff
>-            [% CASE 'FU' %]Accruing fine
>-            [% CASE 'HE' %]Hold waiting too long
>-            [% CASE 'Rent' %]Rental fee
>-            [% CASE 'FOR' %]Forgiven
>-            [% CASE 'LR' %]Lost item fee refund
>-            [% CASE 'PF' %]Processing fee
>-            [% CASE 'PAY' %]Payment
>-            [% CASE 'WO' %]Writeoff
>-            [% CASE 'C' %]Credit
>-            [% CASE 'CR' %]Credit
>-            [% CASE %][% account.accounttype | html %]
>-        [%- END -%]
>+        [% INCLUDE 'accounttype.inc' account => account %]
>         [%- IF account.description %], [% account.description | html %][% END %]
>       </td>
>       <td>[% account.note | html %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>index 50cd64fd76..33ae62cfdf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>@@ -51,29 +51,7 @@
> <tr class="highlight">
>       <td>[% account.date | $KohaDates%]</td>
>        <td>
>-        [% SWITCH account.accounttype %]
>-            [% CASE 'Pay' %]Payment, thanks
>-            [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
>-            [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
>-            [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
>-            [% CASE 'N' %]New card
>-            [% CASE 'F' %]Fine
>-            [% CASE 'A' %]Account management fee
>-            [% CASE 'M' %]Sundry
>-            [% CASE 'L' %]Lost item
>-            [% CASE 'W' %]Writeoff
>-            [% CASE 'FU' %]Accruing fine
>-            [% CASE 'HE' %]Hold waiting too long
>-            [% CASE 'Rent' %]Rental fee
>-            [% CASE 'FOR' %]Forgiven
>-            [% CASE 'LR' %]Lost item fee refund
>-            [% CASE 'PF' %]Processing fee
>-            [% CASE 'PAY' %]Payment
>-            [% CASE 'WO' %]Writeoff
>-            [% CASE 'C' %]Credit
>-            [% CASE 'CR' %]Credit
>-            [% CASE %][% account.accounttype | html %]
>-        [%- END -%]
>+        [% INCLUDE 'accounttype.inc' account => account %]
>         [%- IF account.description %], [% account.description | html %][% END %]
>       </td>
>       <td>[% account.note | html %]</td>
>-- 
>2.18.0

Actions: View | Diff | Splinter Review

Attachments on bug 21167: 77518 | 77596 | 78209 | 78919 | 79020 | 79073 | 79074 | 79075 | 79076 | 79513 | 79514 | 79515