[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 9f63d10a10773ab3d3602234fe9df668ac1122f0

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  9f63d10a10773ab3d3602234fe9df668ac1122f0 (commit)
      from  cf61fa0b3ed22a0c67abc0dfe0cc6a30826980e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f63d10a10773ab3d3602234fe9df668ac1122f0
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue Feb 20 11:05:49 2018 -0500

    LP#1749992 Disable payment button during payment
    
    Since the display is not refreshed until the payment finishes, it
    is possible to fire off a second payment by double-clicking.
    
    This commit is a simple way to disable the button while a payment is
    in process, then enable it again after the display refreshes.
    
    Since the 'sendPayment()' function is wrapped, we may need to move
    this logic up, but this being a single promise is simpler, and it
    solved the problem in testing.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
index bbf6595..fe94996 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -87,7 +87,7 @@
             <button
                 type="submit"
                 class="btn btn-default"
-                ng-disabled="invalid_check_number() || !gridControls.selectedItems().length"
+                ng-disabled="invalid_check_number() || !gridControls.selectedItems().length || applyingPayment"
             >[% l('Apply Payment') %]</button>
           </div>
         </div>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 2c5f6e9..db1e3d9 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -299,6 +299,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     // generates payments, collects user note if needed, and sends payment
     // to server.
     function sendPayment(note) {
+        $scope.applyingPayment = true;
         var make_payments = generatePayments();
         billSvc.applyPayment(
             $scope.payment_type, make_payments, note, $scope.check_number)
@@ -311,6 +312,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
 
             refreshDisplay();
         })
+        .finally(function() { $scope.applyingPayment = false; })
     }
 
     function printReceipt(type, payment_ids, payments_made, note) {

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/staff/circ/patron/t_bills.tt2    |    2 +-
 .../web/js/ui/default/staff/circ/patron/bills.js   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS