[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 176cb1a373d1f3cca1ebca615dc528c90576bbd5

[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  176cb1a373d1f3cca1ebca615dc528c90576bbd5 (commit)
      from  009a5fadab63cffb9915d781b68f4514b2844c69 (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 176cb1a373d1f3cca1ebca615dc528c90576bbd5
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Wed Oct 4 14:01:25 2017 -0400

    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 at equinoxinitiative.org>
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at 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 a9b70ca..32f08f5 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 e85a3f7..89248ca 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 85ed294..92d84ea 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) {

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

Summary of changes:
 .../web/js/ui/default/staff/circ/checkin/app.js    |    6 ++++--
 .../js/ui/default/staff/circ/patron/checkout.js    |    5 ++++-
 Open-ILS/web/js/ui/default/staff/circ/renew/app.js |    4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS