Bugzilla – Attachment 78241 Details for
Bug 12186
Deduplicate TT code for account payments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12186: Deduplicate TT code for account payments
0001-Bug-12186-Deduplicate-TT-code-for-account-payments.patch (text/plain), 4.96 KB, created by
paxed
on 2018-08-29 05:04:51 UTC
(
hide
)
Description:
Bug 12186: Deduplicate TT code for account payments
Filename:
MIME Type:
Creator:
paxed
Created:
2018-08-29 05:04:51 UTC
Size:
4.96 KB
patch
obsolete
>From 72e8737a750cc8ed5e9250ca9bb7748af478dd3b Mon Sep 17 00:00:00 2001 >From: Pasi Kallinen <pasi.kallinen@joensuu.fi> >Date: Wed, 29 Aug 2018 07:48:39 +0300 >Subject: [PATCH] Bug 12186: Deduplicate TT code for account payments > >Instead of using the same accounttype switch statement multiple times, >just use the accounttype include file. > >Test plan: > >1) Apply patch >2) Go to Patron's Fines >3) in the Pay fines -tab, check that the description shows correctly >4) in the Account -tab, click on the "Print" after the entries and > check that the description shows correctly, both for invoices > and fees. > >Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi> >--- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 25 +--------------------- > .../prog/en/modules/members/printfeercpt.tt | 15 +------------ > .../prog/en/modules/members/printinvoice.tt | 15 +------------ > 3 files changed, 3 insertions(+), 52 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index ffac4d766c..0a47c24d6d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -76,30 +76,7 @@ > <input type="hidden" name="amountoutstanding[% line.accountlines_id | html %]" value="[% line.amountoutstanding | html %]" /> > <input type="hidden" name="borrowernumber[% line.accountlines_id | html %]" value="[% line.borrowernumber | html %]" /> > </td> >- <td> >- [% SWITCH line.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 %][% line.accounttype | html %] >- [%- END -%] >+ <td>[% PROCESS 'accounttype.inc' account=line %] > [%- IF line.description %], [% line.description | html %][% END %] > [% IF line.title %]([% line.title | html %])[% END %] > </td> >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 1ac29c900f..a5e5d0de5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -49,20 +49,7 @@ > [% FOREACH account IN accounts %] > <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 %][% account.accounttype | html %] >- [%- END -%] >+ <td>[% PROCESS 'accounttype.inc' %] > [%- 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 2b1e066cc3..173a99e37f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -49,20 +49,7 @@ > [% FOREACH account IN accounts %] > <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 %][% account.accounttype | html %] >- [%- END -%] >+ <td>[% PROCESS 'accounttype.inc' %] > [%- IF account.description %], [% account.description | html %][% END %] > </td> > <td>[% account.note | html %]</td> >-- >2.11.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12186
: 78241