Attachment 87223 Details for Bug 22511 – Bug 22511: Update UI to use accountlines.status

[patch] Bug 22511: Update UI to use accountlines.status

Bug-22511-Update-UI-to-use-accountlinesstatus.patch (text/plain), 5.39 KB, created by Martin Renvoize (ashimema) on 2019-03-29 15:05:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-03-29 15:05:56 UTC

Size: 5.39 KB

patch

obsolete

>From 1b92c7280facd649f7bc6cd4da54e75b8153fdcd Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 22 Mar 2019 12:00:00 +0000
>Subject: [PATCH] Bug 22511: Update UI to use accountlines.status
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/en/includes/accounts.inc | 16 ++++++++--------
> .../bootstrap/en/includes/account-table.inc | 15 ++++++++-------
> 2 files changed, 16 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 ee649300b3..76c797500c 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 -%]
>@@ -43,6 +42,7 @@
> [%- CASE 'RETURNED' -%] (Returned)
> [%- CASE 'REPLACED' -%] (Replaced)
> [%- CASE 'FORGIVEN' -%] (Forgiven)
>+ [%- CASE 'VOID' -%] (Voided)
> [%- CASE -%]
> [%- END -%]
> [%- END -%]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>index 80cb713fa9..c7b41a167e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>@@ -37,16 +37,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 %]
>@@ -116,6 +116,7 @@
> [%- CASE 'RETURNED' -%] (Returned)
> [%- CASE 'REPLACED' -%] (Replaced)
> [%- CASE 'FORGIVEN' -%] (Forgiven)
>+ [%- CASE 'VOID' -%] (Voided)
> [%- CASE -%]
> [%- END -%]
> [%- END -%]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22511: 86674 | 86675 | 86903 | 86904 | 86905 | 86915 | 86916 | 86917 | 87088 | 87089 | 87090 | 87091 | 87221 | 87222 | 87223 | 87224 | 87632 | 87633 | 87634 | 87635 | 87650 | 87651 | 87652 | 87653 | 87654 | 87704 | 87706 | 87796 | 87797 | 87798 | 87799 | 87800 | 87869 | 87870 | 87871 | 87872 | 87873 | 88707 | 88708 | 88709 | 88710 | 88711 | 88712 | 88713 | 88714 | 88715 | 88748