@@ -, +, @@
---
.../intranet-tmpl/prog/en/includes/accounts.inc | 52 +++++++++++++---------
.../prog/en/modules/members/maninvoice.tt | 2 +-
.../prog/en/modules/members/moremember-print.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 27 ++---------
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 51 ++++++++++++---------
opac/opac-user.pl | 2 +-
6 files changed, 66 insertions(+), 70 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -1,27 +1,26 @@
[%- BLOCK account_type_description -%]
[%- 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 'VOID' -%]Voided
- [%- 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 %]
+ [%- 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 'VOID' -%]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.accounttype | html %]
[%- END -%]
[%- END -%]
@@ -37,3 +36,12 @@
[%- CASE -%][% account_offset.type | html %]
[%- END -%]
[%- END -%]
+
+[%- BLOCK account_status_description -%]
+ [%- SWITCH account.status -%]
+ [%- CASE 'UNRETURNED' -%] (Accruing)
+ [%- CASE 'RETURNED' -%] (Returned)
+ [%- CASE 'FORGIVEN' -%] (Forgiven)
+ [%- CASE -%]
+ [%- END -%]
+[%- END -%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -79,7 +79,7 @@
[% INCLUDE 'str/members-menu.inc' %]
[% Asset.js("js/members-menu.js") | $raw %]