From bf36aa1650682cc4aad7104b66a979998b1e812a Mon Sep 17 00:00:00 2001 From: Dan Briem Date: Fri, 9 Apr 2021 18:19:02 -0400 Subject: [PATCH] LP#1918362 Unchanged workstation settings applied on every checkin * Stop attempting to save the Update Inventory setting on every checkin - incorrect prefix & redundant (it's a modifier now) * Stop saving the Strict Barcode setting on every checkin, renewal, and checkout * Save Strict Barcode on user interaction with its checkbox To test: 1. confirm Strict Barcode and Do Inventory Update settings still apply and are "sticky" on the Circulation->Checkin interface 2. confirm Strict Barcode still applies and is "sticky" on the Circulation->Renew Items and Circulation->Checkout interfaces Signed-off-by: Dan Briem Signed-off-by: Jeff Davis Signed-off-by: Jane Sandberg --- Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 | 3 ++- Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 | 3 ++- Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 | 3 ++- Open-ILS/web/js/ui/default/staff/circ/checkin/app.js | 9 +++++++-- Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js | 8 +++++++- Open-ILS/web/js/ui/default/staff/circ/renew/app.js | 8 +++++++- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 index 6e505decf3..0606ce74b7 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 @@ -147,7 +147,8 @@
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 index 8744e0f7d8..2fab3c24a6 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 @@ -167,7 +167,8 @@
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 index 6447ecce20..3f54371b5b 100644 --- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 +++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 @@ -152,7 +152,8 @@
diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js index 5c8992241e..0cf3439b09 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js @@ -136,6 +136,13 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg } } + $scope.onStrictBarcodeChange = function() { + egCore.hatch.setItem( + 'circ.checkin.strict_barcode', + $scope.strict_barcode + ); + }; + $scope.onUntilLogoutChange = function() { if ($scope.backdate.untilLogout) egCore.hatch.setSessionItem('eg.circ.checkin.backdate', @@ -191,8 +198,6 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg } if ($scope.modifiers.do_inventory_update) params.do_inventory_update = true; - egCore.hatch.setItem('circ.checkin.strict_barcode', $scope.strict_barcode); - egCore.hatch.setItem('circ.checkin.do_inventory_update', $scope.modifiers.do_inventory_update); var options = { check_barcode : $scope.strict_barcode, no_precat_alert : $scope.modifiers.no_precat_alert, diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js index df4945bfbb..6715dd6473 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js @@ -201,7 +201,6 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc , $scope.checkouts.unshift(row_item); $scope.gridDataProvider.prepend(); - egCore.hatch.setItem('circ.checkout.strict_barcode', $scope.strict_barcode); var options = {check_barcode : $scope.strict_barcode}; egCirc.checkout(params, options).then( @@ -305,6 +304,13 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc , }); }; + $scope.onStrictBarcodeChange = function() { + egCore.hatch.setItem( + 'circ.checkout.strict_barcode', + $scope.strict_barcode + ); + }; + $scope.print_receipt = function() { var print_data = {circulations : []}; var cusr = patronSvc.current; diff --git a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js index 95f59ebd2c..93dc6a4d70 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js @@ -103,7 +103,6 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) { $scope.renewals.unshift(row_item); $scope.gridDataProvider.refresh(); - egCore.hatch.setItem('circ.renew.strict_barcode', $scope.strict_barcode); var options = {check_barcode : $scope.strict_barcode}; egCirc.renew(params, options).then( @@ -236,6 +235,13 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) { }); } + $scope.onStrictBarcodeChange = function() { + egCore.hatch.setItem( + 'circ.renew.strict_barcode', + $scope.strict_barcode + ); + }; + $scope.print_receipt = function() { var print_data = {circulations : []} -- 2.11.0