@@ -, +, @@
- Test like the other patch, display in OPAC prog, OPAC bootstrap,
Staff Pay fines tab and Staff Accounts tab should be the same.
- No ' , ' should be seen.
- FU fines should now display a description.
---
.../prog/en/modules/members/boraccount.tt | 28 +++++++++++-----------
.../intranet-tmpl/prog/en/modules/members/pay.tt | 24 ++++++++++---------
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 24 ++++++++++---------
.../opac-tmpl/prog/en/modules/opac-account.tt | 22 +++++++++--------
4 files changed, 52 insertions(+), 46 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -39,26 +39,26 @@
[% END %]
[% account.date %] |
[% 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, [% account.title %]
- [% CASE 'A' %]Account management fee
- [% CASE 'M' %]Sundry
- [% CASE 'L' %]Lost
- [% CASE 'W' %]Writeoff
- [% CASE %][% account.accounttype %]
- [%- END -%]
- [%- IF account.description %], [% account.description %][% END %]
+ [%- 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 'FU' -%]Accrued fine
+ [%- CASE 'A' -%]Account management fee
+ [%- CASE 'M' -%]Sundry
+ [%- CASE 'L' -%]Lost
+ [%- CASE 'W' -%]Writeoff
+ [%- CASE 'Rent' -%]Rental
+ [%- CASE -%][% account.accounttype %]
+ [%- END -%][% IF account.description %], [% account.description %][% END %]
[% IF ( account.itemnumber ) %]View item [% END %] |
[% account.note | html_line_break %] |
[% IF ( account.amountcredit ) %][% ELSE %] | [% END %][% account.amount %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -115,17 +115,19 @@ function enableCheckboxActions(){
[% 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 %][% 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 'FU' -%]Accrued fine
+ [%- CASE 'A' -%]Account management fee
+ [%- CASE 'M' -%]Sundry
+ [%- CASE 'L' -%]Lost
+ [%- CASE 'W' -%]Writeoff
+ [%- CASE 'Rent' -%]Rental
+ [%- CASE -%][% line.accounttype %]
[%- END -%]
[%- IF line.description %], [% line.description %][% END %]
[% IF line.title %]([% line.title |html_entity %])[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -50,17 +50,19 @@
| [% ACCOUNT_LINE.date | $KohaDates %] |
[% 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 %][% 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 'FU' -%]Accrued fine
+ [%- CASE 'A' -%]Account management fee
+ [%- CASE 'M' -%]Sundry
+ [%- CASE 'L' -%]Lost
+ [%- CASE 'W' -%]Writeoff
+ [%- CASE 'Rent' -%]Rental
+ [%- CASE -%][% ACCOUNT_LINE.accounttype %]
[%- END -%]
[%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
[% IF line.title %]([% line.title |html_entity %])[% END %]
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
@@ -41,16 +41,18 @@
| [% ACCOUNT_LINE.date | $KohaDates %] |
[% 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 '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 'FU' -%]Accrued fine
+ [%- CASE 'A' -%]Account management fee
+ [%- CASE 'M' -%]Sundry
+ [%- CASE 'L' -%]Lost
+ [%- CASE 'W' -%]Writeoff
+ [%- CASE 'Rent' -%]Rental
[% CASE %][% ACCOUNT_LINE.accounttype %]
[%- END -%]
[%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
--
|