From b4c9058b871b17a20f08a52875582c617bfd91d9 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 11 Jan 2019 16:05:12 +0000
Subject: [PATCH] Bug 11373: (follow-up) Add "change calculation" feature to
 the fine payment forms

This patch provides some follow-ups, including corrections to the
JavaScript and updates to the text for readability.

- Remove obsolete script "type" attribute
- Update the use of the obsolete jQuery method "bind"
- Use Bootstrap's built-in "show" option instead of simulated click
- Handle preventDoubleFormSubmit function's "waiting" class if modal is
  closed manually

To test, apply the patch and follow the original test plan. Everything
should work as expected.

Note that when the modal is shown, the cursor changes to the "waiting"
one when you hover over the body of the page. If you click "No" in the
modal, the cursor should return to normal.

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

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/members/paycollect.tt     | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index 82c4861ba8..f92f091a42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -99,11 +99,11 @@
 <ol>
 
     <li>
-        <label for="paid">Amount paid: </label>
+        <label for="paid">Amount being paid: </label>
         <input name="paid" id="paid" value="[% amountoutstanding | $Price %]"/>
     </li>
     <li>
-        <label for="collected">Collect from patron: </label>
+        <label for="collected">Collected from patron: </label>
         <input id="collected" value="[% amountoutstanding | $Price %]"/>
     </li>
     <li>
@@ -125,8 +125,10 @@
 </ol>
 </fieldset>
 
-    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
-        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></div>
+        <div class="action">
+            <input type="submit" name="submitbutton" value="Confirm" />
+            <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
+        </div>
     </form>
 [% ELSIF ( writeoff_individual ) %]
     <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
@@ -251,17 +253,16 @@
      </div> <!-- /.row -->
 
 <!-- Modal -->
-<a class="hidden" href="#confirm_change_form" data-toggle="modal"></a>
 <div id="confirm_change_form" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h3>Amount collected higher than paid</h3>
+                <h3>The amount collected is more than the outstanding charge</h3>
             </div>
             <div class="modal-body">
-                <p>The amount collected from the patron is higher than the amount paid.</p>
+                <p>The amount collected from the patron is higher than the amount to be paid.</p>
                 <p>The change to give is <b><span id="modal_change">0.00</span></b>.</p>
-                <p>Do you still confirm the payment?</p>
+                <p>Confirm this payment?</p>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-default approve" id="modal_submit" type="button"><i class="fa fa-check"></i> Yes</button>
@@ -288,14 +289,21 @@
             });
 
             if (change != undefined) {
-                forms.bind('submit', function(e) {
+                forms.on("submit", function(e) {
                     if (change.innerHTML > 0.00) {
                         e.preventDefault();
-                        $('a[href="#confirm_change_form"]').click();
+                        $("#confirm_change_form").modal("show");
+                    } else {
+                        return true;
                     }
                 });
             }
 
+            $("#confirm_change_form").on("hidden.bs.modal", function(){
+                // remove class added by preventDoubleFormSubmit if necessary
+                $("body, form input[type='submit'], form button[type='submit'], form a").removeClass('waiting');
+            });
+
             $('#modal_submit').click(function() {
                 forms[0].submit();
             });
-- 
2.39.5