From 9de9976cb279039a24749dc90853fee8330a0248 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 10 Feb 2020 09:15:51 +0000
Subject: [PATCH] Bug 24525: (QA follow-up) Make payment type required with
 cash registers

The use of cash registers adds the requirement to enter a payment type,
this patch adds the required status when cash registers are configured.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc | 4 ++++
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt    | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
index e6b5d597d5..8fa9b1d691 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
@@ -8,8 +8,12 @@
     [% IF payment_types.size > 0 %]
         <li>
             <label for="payment_type">Payment type: </label>
+            [% IF Koha.Preference('UseCashRegisters') %]
+            <select name="payment_type" id="payment_type" required>
+            [% ELSE %]
             <select name="payment_type" id="payment_type">
                 <option value=""></option>
+            [% END %]
                 [% FOREACH pt IN payment_types %]
                     <option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index f3c781034f..e0a68b1436 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -114,7 +114,6 @@
 
                             [% PROCESS account_payment_types %]
 
-                            [% IF Koha.Preference('UseCashRegisters') %]
                             <li>
                                 <label for="cash_register">Cash register: </label>
                                 <select name="cash_register" id="cash_register">
@@ -127,7 +126,6 @@
                                     [% END %]
                                 </select>
                             </li>
-                            [% END %]
                         </ol>
 
                     </fieldset>
-- 
2.39.5