From 752b255caff6b2a1a90f92ccbb5063e9ff63ce32 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 30 Sep 2022 16:06:45 +0100
Subject: [PATCH] Bug 29987: Improve validation

This patch adds hinting to display the required state of the cash
register fields.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/modules/members/mancredit.tt         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index b2bad74872..87f606871a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -75,7 +75,7 @@
                             <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
                             <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
                             <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
-                            <li><label for="amount">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
+                            <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
                             [% INCLUDE 'transaction_types.inc' type="credit" %]
                             [% IF Koha.Preference('UseCashRegisters') %]
                             <li>
@@ -88,7 +88,7 @@
                                 </label>
 
                                 [% IF Koha.Preference('RequireCashRegister') %]
-                                    <select name="cash_register" id="cash_register" required>
+                                    <select name="cash_register" id="cash_register" required="required">
                                 [% ELSE %]
                                     <select name="cash_register" id="cash_register">
                                 [% END %]
@@ -131,6 +131,18 @@
         $(document).ready(function(){
             $('#mancredit').preventDoubleFormSubmit();
             $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
+            [% UNLESS Koha.Preference('RequireCashRegister') %]
+            $('#credit_type').on('change', function() {
+               let val = $(this).val();
+               if ( val == 'CASH' ) {
+                  $("label[for='cash_register']").addClass('required');
+                  $('#cash_register').attr('required','required').after( '<span class="required">Required</span>' );
+               } else {
+                  $("label[for='cash_register']").removeClass('required');
+                  $('#cash_register').removeAttr('required').next("span").remove();
+               }
+            });
+            [% END %]
         });
     </script>
 [% END %]
-- 
2.30.2