From 950c6153163022ea7da92ceb15f6a4f722e4d3ed Mon Sep 17 00:00:00 2001 From: Dan Briem Date: Fri, 24 Jan 2020 18:03:07 -0500 Subject: [PATCH] LP1849370 Mark items as damaged - changing fee usability issues The prop that conditionally renders the fee interface is bound to the fee input so it removes itself from the DOM when cleared. The patch uses a separate prop. The fee input's by the edge so you may mistakenly close the modal if you try to click & drag to highlight the fee. The patch sets the prop backdrop to static. A $0 item price will cause the modal to keep reloading on submit. If you set a $0 fee manually without clicking No Charge it charges the full item price. The patch sets the apply_fines param for the Perl API dynamically on submission. To test: 1. Make sure the OU setting "Charge item price when marked damaged" is true 2. Check out an item with a price to a user 3. Mark it damaged (from Item Status or Checkin screen) 4. Note if you clear the fee input it removes itself, if you drag the mouse off the modal & release it closes, & if you charge $0 without using "No Charge" it charges the user the full item price 5. Apply patch and repeat steps 1-3 6. Note the input stays when cleared, the modal doesn't close if you release the mouse on the backdrop, & charging $0 doesn't charge the user Signed-off-by: Dan Briem Signed-off-by: Terran McCanna Signed-off-by: Chris Sharp --- .../staff/circ/share/t_mark_damaged.tt2 | 18 +++++++++--------- .../js/ui/default/staff/circ/services/circ.js | 15 ++++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 index 467fa13f32..52d1c8a784 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 @@ -9,45 +9,45 @@
[% l("Item [_1] will be marked damaged. ", "{{barcode}}") %] - [% l("Was returned ") %] + [% l("Was returned ") %] [% l("on [_1] ","{{circ_checkin_time | date:'MM/dd/yy H:mm a'}}") %] [% l("for [_1] : [_2]. ", "{{circ_patron_name}}", "{{circ.usr().usrname()}}") %] [% l("Confirmation required to charge this patron [_1] for the damage.", "{{billArgs.charge | currency}}") %]
-
+
-
+
-
+
- - + +
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js index ecbf03af24..64a68e14d7 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js +++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js @@ -1313,18 +1313,17 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl service.mark_damaged = function(params) { if (!params) return $q.when(); return $uibModal.open({ + backdrop: 'static', templateUrl: './circ/share/t_mark_damaged', controller: ['$scope', '$uibModalInstance', 'egCore', 'egBilling', 'egItem', function($scope, $uibModalInstance, egCore, egBilling, egItem) { var doRefresh = params.refresh; + $scope.showBill = params.charge != null && params.circ; $scope.billArgs = {charge: params.charge}; $scope.mode = 'charge'; $scope.barcode = params.barcode; - if (params.charge && params.charge > 0) { - $scope.applyFine = "apply"; - } if (params.circ) { $scope.circ = params.circ; $scope.circ_checkin_time = params.circ.checkin_time(); @@ -1339,12 +1338,10 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl $scope.btnChargeFees = function() { $scope.mode = 'charge'; $scope.billArgs.charge = params.charge; - $scope.applyFine = "apply"; } $scope.btnWaiveFees = function() { $scope.mode = 'waive'; $scope.billArgs.charge = 0; - $scope.applyFine = "noapply"; } $scope.cancel = function ($event) { @@ -1355,15 +1352,19 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl } var handle_mark_item_damaged = function() { + var applyFines; + if ($scope.showBill) + applyFines = $scope.billArgs.charge ? 'apply' : 'noapply'; + egCore.net.request( 'open-ils.circ', 'open-ils.circ.mark_item_damaged', egCore.auth.token(), params.id, { - apply_fines: $scope.applyFine, + apply_fines: applyFines, override_amount: $scope.billArgs.charge, override_btype: $scope.billArgs.type, override_note: $scope.billArgs.note, - handle_checkin: !$scope.applyFine + handle_checkin: !applyFines }).then(function(resp) { if (evt = egCore.evt.parse(resp)) { doRefresh = false; -- 2.43.2