From 21cd9c3e047c775369728f29246291749ee2bc7c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 22 Mar 2019 12:00:00 +0000 Subject: [PATCH] Bug 22511: Update UI to use accountlines.status Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/includes/accounts.inc | 16 ++++++++-------- .../bootstrap/en/modules/opac-account.tt | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index fd306c77b4..d9ea72c433 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -4,22 +4,21 @@ [%- 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 'W' -%]Writeoff[%- PROCESS account_status_description account=account -%] [%- CASE 'HE' -%]Hold waiting too long [%- CASE 'Rent' -%]Rental fee - [%- CASE 'FOR' -%]Forgiven - [%- CASE 'LR' -%]Lost item fee refund + [%- CASE 'FOR' -%]Forgiven[%- PROCESS account_status_description account=account -%] + [%- CASE 'LR' -%]Lost item fee refund[%- PROCESS account_status_description account=account -%] [%- CASE 'PF' -%]Processing fee - [%- CASE 'PAY' -%]Payment - [%- CASE 'WO' -%]Writeoff - [%- CASE 'C' -%]Credit - [%- CASE 'CR' -%]Credit + [%- CASE 'PAY' -%]Payment[%- PROCESS account_status_description account=account -%] + [%- CASE 'WO' -%]Writeoff[%- PROCESS account_status_description account=account -%] + [%- CASE 'C' -%]Credit[%- PROCESS account_status_description account=account -%] + [%- CASE 'CR' -%]Credit[%- PROCESS account_status_description account=account -%] [%- CASE -%][% account.accounttype | html %] [%- END -%] [%- END -%] @@ -42,6 +41,7 @@ [%- CASE 'UNRETURNED' -%] (Accruing) [%- CASE 'RETURNED' -%] (Returned) [%- CASE 'FORGIVEN' -%] (Forgiven) + [%- CASE 'VOID' -%] (Voided) [%- CASE -%] [%- END -%] [%- END -%] 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 04798489c9..2ccd7a0401 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -117,16 +117,16 @@ [%- CASE 'A' -%]Account management fee [%- CASE 'M' -%]Sundry [%- CASE 'L' -%]Lost item - [%- CASE 'W' -%]Writeoff + [%- CASE 'W' -%]Writeoff[%- PROCESS account_status_description account=account -%] [%- CASE 'HE' -%]Hold waiting too long [%- CASE 'Rent' -%]Rental fee - [%- CASE 'FOR' -%]Forgiven - [%- CASE 'LR' -%]Lost item fee refund + [%- CASE 'FOR' -%]Forgiven[%- PROCESS account_status_description account=account -%] + [%- CASE 'LR' -%]Lost item fee refund[%- PROCESS account_status_description account=account -%] [%- CASE 'PF' -%]Processing fee - [%- CASE 'PAY' -%]Payment - [%- CASE 'WO' -%]Writeoff - [%- CASE 'C' -%]Credit - [%- CASE 'CR' -%]Credit + [%- CASE 'PAY' -%]Payment[%- PROCESS account_status_description account=account -%] + [%- CASE 'WO' -%]Writeoff[%- PROCESS account_status_description account=account -%] + [%- CASE 'C' -%]Credit[%- PROCESS account_status_description account=account -%] + [%- CASE 'CR' -%]Credit[%- PROCESS account_status_description account=account -%] [%- CASE -%][% ACCOUNT_LINE.accounttype | html %] [%- END -%] [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %] -- 2.20.1