From 08401b41728cfad2c4e18fbd7073e707f7ff93fd Mon Sep 17 00:00:00 2001
From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>
Date: Fri, 17 Mar 2023 09:55:39 +0200
Subject: [PATCH] Bug 16223: Require fee limit only if "Lift after payment" is
 set as "Yes"
Content-Type: text/plain; charset=utf-8

Fee limit should only be required if restriction is
meant to be lifted after payment. This patch makes
"Fee limit" input field required based on value of
"Lift after payment" select field.

To test:
1. Create a new restriction.
2. "Lift after payment" should be set as "No".
3. Change value as "Yes".
=> "Fee limit" should now have "Required" text
after input field.
4. Try to save restriction.
=> Text "This field is required" should be
displayed after "Fee limit".
5. Change "Lift after payment" back to "No".
=> Both texts should now be lifted.

Also test with existing restriction and make sure
restrictions are still saved without problems.

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 .../prog/en/modules/admin/restrictions.tt     | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
index 0acd70ca68..93cf49f5e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
@@ -115,16 +115,19 @@
                     </li>
                     <li>
                         <label for="lift_after_payment" class="required">Lift after payment: </label>
-                        <select type="text" name="lift_after_payment" id="lift_after_payment" class="required" required="required" />
-                            <option value="1" selected="selected">Yes</option>
+                        <select type="text" name="lift_after_payment" id="lift_after_payment"/>
+                        [% IF restriction.lift_after_payment %]
                             <option value="0">No</option>
+                            <option value="1" selected="selected">Yes</option>
+                        [% ELSE %]
+                            <option value="0" selected="selected">No</option>
+                            <option value="1">Yes</option>
+                        [% END %]
                         </select>
-                        <span class="required">Required</span>
                     </li>
                     <li>
-                        <label for="fee_limit" class="required">Fee limit: </label>
-                        <input type="text" value="[% restriction.fee_limit | html %]" inputmode="decimal" pattern="^\d+(\.\d{2})?$" min="0" name="fee_limit" id="fee_limit" class="required" required="required" />
-                        <span class="required">Required</span>
+                        <label for="fee_limit">Fee limit: </label>
+                        <input type="text" value="[% restriction.fee_limit | html %]" inputmode="decimal" pattern="^\d+(\.\d{2})?$" min="0" name="fee_limit" id="fee_limit" />
                     </li>
                 [% ELSE %]
                     <li>
@@ -138,17 +141,15 @@
                         <span class="required">Required</span>
                     </li>
                     <li>
-                        <label for="lift_after_payment" class="required">Lift after payment: </label>
-                        <select type="text" name="lift_after_payment" id="lift_after_payment" class="required" required="required" />
-                            <option value="1" selected="selected">Yes</option>
-                            <option value="0">No</option>
+                        <label for="lift_after_payment">Lift after payment: </label>
+                        <select type="text" name="lift_after_payment" id="lift_after_payment" />
+                            <option value="0" selected="selected">No</option>
+                            <option value="1">Yes</option>
                         </select>
-                        <span class="required">Required</span>
                     </li>
                     <li>
-                        <label for="fee_limit" class="required">Fee limit: </label>
-                        <input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" min="0" name="fee_limit" id="fee_limit" class="required" required="required" />
-                        <span class="required">Required</span>
+                        <label for="fee_limit">Fee limit: </label>
+                        <input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" min="0" name="fee_limit" id="fee_limit" />
                     </li>
                 [% END %]
             </ol>
@@ -257,6 +258,15 @@
             [% ex.code | $raw %]: '[% ex.display_text | $raw %]',
         [% END %]
         };
+
+        //Require fee limit if "Lift after payment" is set true
+        $("#lift_after_payment").on("change", function(){
+            if($(this).val() == 1){
+                $("#fee_limit").prop("required",true).after('<span class="required">Required</span>');
+            } else {
+                $("#fee_limit").prop("required",false).nextAll().remove();
+            }
+        });
     </script>
     [% Asset.js("js/restrictiontypes.js") | $raw %]
 [% END %]
-- 
2.30.2