Bugzilla – Attachment 86897 Details for
Bug 22521
Convert fines handling to use 'status' instead of two accounttypes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22521: Update UI to use accountlines.status
Bug-22521-Update-UI-to-use-accountlinesstatus.patch (text/plain), 11.59 KB, created by
Martin Renvoize (ashimema)
on 2019-03-22 11:48:21 UTC
(
hide
)
Description:
Bug 22521: Update UI to use accountlines.status
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-03-22 11:48:21 UTC
Size:
11.59 KB
patch
obsolete
>From 419e3624e3761dac23d53f9b4ae66b8449f10712 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 20 Mar 2019 16:09:55 +0000 >Subject: [PATCH] Bug 22521: Update UI to use accountlines.status > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/includes/accounts.inc | 52 +++++++++++-------- > .../en/modules/members/moremember-print.tt | 2 +- > .../prog/en/modules/members/pay.tt | 27 ++-------- > .../bootstrap/en/modules/opac-account.tt | 52 +++++++++++-------- > 4 files changed, 65 insertions(+), 68 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >index cf388239fb..fd306c77b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >@@ -1,27 +1,26 @@ > [%- BLOCK account_type_description -%] > [%- SWITCH account.accounttype -%] >- [%- CASE 'Pay' -%]<span>Payment, thanks</span> >- [%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span> >- [%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span> >- [%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span> >- [%- CASE 'VOID' -%]<span>Voided</span> >- [%- CASE 'N' -%]<span>New card</span> >- [%- CASE 'F' -%]<span>Fine</span> >- [%- CASE 'A' -%]<span>Account management fee</span> >- [%- CASE 'M' -%]<span>Sundry</span> >- [%- CASE 'L' -%]<span>Lost item</span> >- [%- CASE 'W' -%]<span>Writeoff</span> >- [%- CASE 'FU' -%]<span>Accruing fine</span> >- [%- CASE 'HE' -%]<span>Hold waiting too long</span> >- [%- CASE 'Rent' -%]<span>Rental fee</span> >- [%- CASE 'FOR' -%]<span>Forgiven</span> >- [%- CASE 'LR' -%]<span>Lost item fee refund</span> >- [%- CASE 'PF' -%]<span>Processing fee</span> >- [%- CASE 'PAY' -%]<span>Payment</span> >- [%- CASE 'WO' -%]<span>Writeoff</span> >- [%- CASE 'C' -%]<span>Credit</span> >- [%- CASE 'CR' -%]<span>Credit</span> >- [%- CASE -%][% account.accounttype | html %] >+ [%- CASE 'Pay' -%]<span>Payment, thanks</span> >+ [%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span> >+ [%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span> >+ [%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span> >+ [%- CASE 'VOID' -%]<span>Voided</span> >+ [%- CASE 'N' -%]<span>New card</span> >+ [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span> >+ [%- CASE 'A' -%]<span>Account management fee</span> >+ [%- CASE 'M' -%]<span>Sundry</span> >+ [%- CASE 'L' -%]<span>Lost item</span> >+ [%- CASE 'W' -%]<span>Writeoff</span> >+ [%- CASE 'HE' -%]<span>Hold waiting too long</span> >+ [%- CASE 'Rent' -%]<span>Rental fee</span> >+ [%- CASE 'FOR' -%]<span>Forgiven</span> >+ [%- CASE 'LR' -%]<span>Lost item fee refund</span> >+ [%- CASE 'PF' -%]<span>Processing fee</span> >+ [%- CASE 'PAY' -%]<span>Payment</span> >+ [%- CASE 'WO' -%]<span>Writeoff</span> >+ [%- CASE 'C' -%]<span>Credit</span> >+ [%- CASE 'CR' -%]<span>Credit</span> >+ [%- CASE -%][% account.accounttype | html %] > [%- END -%] > [%- END -%] > >@@ -37,3 +36,12 @@ > [%- CASE -%][% account_offset.type | html %] > [%- END -%] > [%- END -%] >+ >+[%- BLOCK account_status_description -%] >+ [%- SWITCH account.status -%] >+ [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span> >+ [%- CASE 'RETURNED' -%]<span> (Returned)</span> >+ [%- CASE 'FORGIVEN' -%]<span> (Forgiven)</span> >+ [%- CASE -%] >+ [%- END -%] >+[%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index 10ee5574e0..2bb327c13f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -120,7 +120,7 @@ > , [% account.description | html %] > [% END %] > >- [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %] >+ [% IF ( account.itemnumber AND account.accounttype != 'OVERDUE' ) %] > <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a> > [% END %] > </td> >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 7afd743acc..e5cfad05cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -7,6 +7,9 @@ > [% USE ColumnsSettings %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+ >+[% PROCESS 'accounts.inc' %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Make a payment for [% patron.firstname | html %] [% patron.surname | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -80,29 +83,7 @@ > <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 -%] >+ [% PROCESS account_type_description account=line %] > [%- IF line.description %], [% line.description | html %][% END %] > [% IF line.itemnumber %]([% line.item.biblio.title | html %])[% END %] > </td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 23229a0485..e01e6d0114 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -107,28 +107,28 @@ > [% END %] > <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td> > <td> >- [% SWITCH ACCOUNT_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 %][% ACCOUNT_LINE.accounttype | html %] >+ [%- SWITCH ACCOUNT_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 'VIOD' -%]Voided >+ [%- CASE 'N' -%]New card >+ [%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%] >+ [%- CASE 'A' -%]Account management fee >+ [%- CASE 'M' -%]Sundry >+ [%- CASE 'L' -%]Lost item >+ [%- CASE 'W' -%]Writeoff >+ [%- 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_LINE.accounttype | html %] > [%- END -%] > [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %] > [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %] >@@ -187,6 +187,14 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >+[%- BLOCK account_status_description -%] >+ [%- SWITCH account.status -%] >+ [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span> >+ [%- CASE 'RETURNED' -%]<span> (Returned)</span> >+ [%- CASE 'FORGIVEN' -%]<span> (Forgiven)</span> >+ [%- CASE -%] >+ [%- END -%] >+[%- END -%] > <script> > $( document ).ready(function() { > >-- >2.20.1
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 22521
:
86808
|
86890
|
86891
|
86892
|
86893
|
86894
|
86895
|
86896
|
86897
|
86898
|
86899
|
86900
|
86901
|
86902
|
86918
|
86919
|
86920
|
86921
|
87063
|
87083
|
87084
|
87085
|
87086
|
87087
|
87097
|
87098
|
87099
|
87100
|
87101
|
87209
|
87210
|
87211
|
87212
|
87213
|
87214
|
87215
|
87216
|
87217
|
87218
|
87219
|
87220
|
87619
|
87620
|
87621
|
87622
|
87623
|
87624
|
87678
|
87679
|
87680
|
87681
|
87682
|
87683
|
87787
|
87788
|
87789
|
87790
|
87791
|
87792
|
87808
|
87809
|
87810
|
87811
|
87812
|
87813
|
87814
|
87850
|
87851
|
87852
|
87853
|
87854
|
87855
|
87856
|
87857
|
87858
|
87859
|
87860
|
87861
|
87862
|
87863
|
87864
|
87865
|
88064
|
88065
|
88066
|
88067
|
88068
|
88069
|
88070
|
88071
|
88149
|
88150
|
88151
|
88152
|
88153
|
88154
|
88155
|
88156
|
88286