From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Wed, 4 Oct 2017 18:01:25 +0000 (-0400)
Subject: LP#1712686 - display completed barcode on copy grids not partial input
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=176cb1a373d1f3cca1ebca615dc528c90576bbd5;p=working%2FEvergreen.git

LP#1712686 - display completed barcode on copy grids not partial input

The check in, check out, and renew interfaces were not displaying
the actual complete(d) barcode when barcode completion is on.
This saves the inputted partial barcode in row_item.input_barcode
and let's the returned acp.barcode be in row_item.copy_barcode for
display.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---

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 a9b70ca2b9..32f08f5841 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
@@ -176,7 +176,7 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro
 
         var row_item = {
             index : checkinSvc.checkins.length,
-            copy_barcode : params.copy_barcode
+            input_barcode : params.copy_barcode
         };
 
         // track the item in the grid before sending the request
@@ -185,11 +185,13 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro
 
         egCirc.checkin(params, options).then(
         function(final_resp) {
-
+            
             row_item.evt = final_resp.evt;
             angular.forEach(final_resp.data, function(val, key) {
                 row_item[key] = val;
             });
+            
+            row_item['copy_barcode'] = row_item.acp.barcode();
 
             if (row_item.mbts) {
                 var amt = Number(row_item.mbts.balance_owed());
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 e85a3f753d..89248cace1 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
@@ -137,7 +137,7 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
         // immediate reaction to their barcode input action.
         var row_item = {
             index : $scope.checkouts.length,
-            copy_barcode : params.copy_barcode,
+            input_barcode : params.copy_barcode,
             noncat_type : params.noncat_type
         };
 
@@ -165,6 +165,9 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
                 angular.forEach(co_resp.data, function(val, key) {
                     row_item[key] = val;
                 });
+               
+                row_item['copy_barcode'] = row_item.acp.barcode();
+
                 munge_checkout_resp(co_resp, row_item);
             },
             function() {
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 85ed29427c..92d84eaa4f 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
@@ -85,7 +85,7 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) {
         // immediate reaction to their barcode input action.
         var row_item = {
             index : $scope.renewals.length,
-            copy_barcode : params.copy_barcode,
+            input_barcode : params.copy_barcode,
             noncat_type : params.noncat_type
         };
 
@@ -103,6 +103,8 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) {
                     row_item[key] = val;
                 });
 
+                row_item['copy_barcode'] = row_item.acp.barcode();
+
                 if (row_item.mbts) {
                     var amt = Number(row_item.mbts.balance_owed());
                     if (amt != 0) {