From 5cad2946ae3ec52daf425118ffb35787160da417 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 29 Mar 2019 14:31:22 +0000 Subject: [PATCH] Bug 22521: Update UI to use accountlines.status Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens --- .../prog/en/includes/accounts.inc | 52 +++++++++++-------- .../prog/en/modules/members/maninvoice.tt | 2 +- .../en/modules/members/moremember-print.tt | 2 +- .../bootstrap/en/includes/account-table.inc | 12 ++++- .../bootstrap/en/modules/opac-account.tt | 1 + opac/opac-user.pl | 2 +- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 504d1ab3de..ee1a90f47c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -1,29 +1,28 @@ [%- 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 '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 'FFOR' -%]Fine forgiven - [%- CASE 'LR' -%]Lost item fee refund + [%- CASE 'LR' -%]Lost item fee refund [%- CASE 'PF' -%]Lost item processing fee - [%- CASE 'PAY' -%]Payment - [%- CASE 'WO' -%]Writeoff - [%- CASE 'C' -%]Credit - [%- CASE 'CR' -%]Credit - [%- CASE 'Res' -%]Hold fee - [%- CASE -%][% account.accounttype | html %] + [%- CASE 'PAY' -%]Payment + [%- CASE 'WO' -%]Writeoff + [%- CASE 'C' -%]Credit + [%- CASE 'CR' -%]Credit + [%- CASE 'Res' -%]Hold fee + [%- CASE -%][% account.accounttype | html %] [%- END -%] [%- END -%] @@ -39,3 +38,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 -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 672c4cbd76..213641047a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/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 %]