better idea with Check Number

unset default Check Number, disable widget if not Check Payment,
and disable Apply Payment button if Check Payment with invalid Check Number

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

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 99abe6f..4378e32 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -64,7 +64,8 @@
           </label>
           <div class="col-md-6">
             <input type="number" min="1" step="any" id="check-input" 
-              ng-model="check_number" focus-me="focus_check" 
+              ng-model="check_number" focus-me="focus_check"
+              ng-disabled="payment_type!='check_payment'"
               value="" class="form-control col-md-6 "/>
           </div>
         <div class="form-group">
@@ -86,7 +87,7 @@
             <button
                 type="submit"
                 class="btn btn-default"
-                ng-disabled="!gridControls.selectedItems().length"
+                ng-disabled="invalid_check_number() || !gridControls.selectedItems().length"
             >[% 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 4412c97..35bab20 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -140,7 +140,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     billSvc.userId = $routeParams.id;
 
     // set up some defaults
-    $scope.check_number = 1;
+    $scope.check_number = null;
     $scope.payment_amount = null;
     $scope.session_voided = 0;
     $scope.payment_type = 'cash_payment';
@@ -229,6 +229,9 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
         });
         return -(amount / 100);
     }
+    $scope.invalid_check_number = function() { 
+        return $scope.payment_type == 'check_payment' && ! $scope.check_number; 
+    }
 
     // update the item.payment_pending value each time the user
     // selects different transactions to pay against.