From 0b10629bc44118bbff4fee5db27f7777082026b0 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 9 Apr 2019 13:24:05 +0100
Subject: [PATCH] Bug 22628: Add VOID and FFOR to relevant templates

This patch adds the VOID and FFOR codes to the releveant templates for
display purposes

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc       | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt      | 2 ++
 koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index cf388239fb..1240601836 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -15,6 +15,7 @@
         [%- CASE 'HE'    -%]<span>Hold waiting too long</span>
         [%- CASE 'Rent'  -%]<span>Rental fee</span>
         [%- CASE 'FOR'   -%]<span>Forgiven</span>
+        [%- CASE 'FFOR'  -%]<span>Fine forgiven</span>
         [%- CASE 'LR'    -%]<span>Lost item fee refund</span>
         [%- CASE 'PF'    -%]<span>Processing fee</span>
         [%- CASE 'PAY'   -%]<span>Payment</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index 7afd743acc..acd8f13d02 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -85,6 +85,7 @@
           [% 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
@@ -95,6 +96,7 @@
           [% CASE 'HE' %]Hold waiting too long
           [% CASE 'Rent' %]Rental fee
           [% CASE 'FOR' %]Forgiven
+          [% CASE 'FFOR' %]Fine forgiven
           [% CASE 'LR' %]Lost item fee refund
           [% CASE 'PF' %]Processing fee
           [% CASE 'PAY' %]Payment
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 a73da77196..10a0b283aa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -32,6 +32,7 @@
                         [% 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
@@ -42,6 +43,7 @@
                         [% CASE 'HE' %]Hold waiting too long
                         [% CASE 'Rent' %]Rental fee
                         [% CASE 'FOR' %]Forgiven
+                        [% CASE 'FFOR' %]Fine forgiven
                         [% CASE 'LR' %]Lost item fee refund
                         [% CASE 'PF' %]Processing fee
                         [% CASE 'PAY' %]Payment
@@ -109,4 +111,4 @@
     </form>
 [% ELSE %]
     <h4>You have no fines or charges</h4>
-[% END %]
\ No newline at end of file
+[% END %]
-- 
2.11.0