@@ -, +, @@
---
.../prog/en/includes/payments.inc | 19 +++++++++
.../prog/en/modules/members/paycollect.tt | 39 +++----------------
.../intranet-tmpl/prog/en/modules/pos/pay.tt | 16 +-------
3 files changed, 27 insertions(+), 47 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
@@ -0,0 +1,19 @@
+[% USE AuthorisedValues %]
+[%- BLOCK account_payment_types -%]
+ [% SET payment_types = [] %]
+ [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
+ [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
+ [% payment_types.push(pt) %]
+ [% END %]
+ [% IF payment_types.size > 0 %]
+
+
+
+
+ [% END %]
+[%- END -%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -2,9 +2,9 @@
[% USE Asset %]
[% USE Koha %]
[% USE Branches %]
-[% USE AuthorisedValues %]
[% USE Price %]
[% SET footerjs = 1 %]
+[% PROCESS 'payments.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons ›
[% IF type == 'WRITEOFF' %]
@@ -123,22 +123,9 @@
0.00
- [% SET payment_types = [] %]
- [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
- [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
- [% payment_types.push(pt) %]
- [% END %]
- [% IF payment_types.size > 0 %]
-
-
-
-
- [% END %]
+
+ [% PROCESS account_payment_types %]
+
[% IF Koha.Preference('UseCashRegisters') %]
@@ -257,22 +244,8 @@
0.00
- [% SET payment_types = [] %]
- [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
- [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
- [% payment_types.push(pt) %]
- [% END %]
- [% IF payment_types.size > 0 %]
-
-
-
-
- [% END %]
+
+ [% PROCESS account_payment_types %]
[% IF Koha.Preference('UseCashRegisters') %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -1,9 +1,9 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
-[% USE AuthorisedValues %]
[% USE Price %]
[% SET footerjs = 1 %]
+[% PROCESS 'payments.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Payments
[% INCLUDE 'doc-head-close.inc' %]
@@ -112,19 +112,7 @@
- [% SET payment_types = [] %]
- [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
- [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
- [% payment_types.push(pt) %]
- [% END %]
-
-
-
-
+ [% PROCESS account_payment_types %]
[% IF Koha.Preference('UseCashRegisters') %]