From 0dc43cfbc5f245272ae4b689eaeae1c94b01edca Mon Sep 17 00:00:00 2001 From: Terran McCanna <tmccanna@georgialibraries.org> Date: Tue, 5 Mar 2019 12:34:49 -0500 Subject: [PATCH] LP#1818576 Offline Noncataloged Checkout Preview This adds the noncataloged type and number to the right-hand preview when doing an offline checkout. (Prior to this, the display was blank if there was no barcode.) Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> Signed-off-by: Garry Collum <gcollum@gmail.com> Signed-off-by: Bill Erickson <berickxx@gmail.com> --- Open-ILS/src/templates/staff/offline-interface.tt2 | 5 ++++- Open-ILS/web/js/ui/default/staff/offline.js | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/staff/offline-interface.tt2 b/Open-ILS/src/templates/staff/offline-interface.tt2 index fafc74e12b..dc7b56ba9b 100644 --- a/Open-ILS/src/templates/staff/offline-interface.tt2 +++ b/Open-ILS/src/templates/staff/offline-interface.tt2 @@ -358,7 +358,10 @@ <tbody> <tr ng-repeat="xact in xact_page.checkout track by $index"> <td>{{xact.patron_barcode}}</td> - <td>{{xact.barcode}}</td> + <td> + <div ng-if="xact.barcode">{{xact.barcode}}</div> + <div ng-if="!xact.barcode">{{lookupNoncatTypeName(xact.noncat_type)}} ({{xact.noncat_count}})</div> + </td> <td>{{xact.due_date | date:'shortDate'}}</td> </tr> </tbody> diff --git a/Open-ILS/web/js/ui/default/staff/offline.js b/Open-ILS/web/js/ui/default/staff/offline.js index 7ab361f34b..7d80de6d5f 100644 --- a/Open-ILS/web/js/ui/default/staff/offline.js +++ b/Open-ILS/web/js/ui/default/staff/offline.js @@ -330,6 +330,12 @@ function($routeProvider , $locationProvider , $compileProvider) { egCore.hatch.setItem('eg.offline.print_receipt', $scope.do_print) } + $scope.lookupNoncatTypeName = function (type) { + var nc = $scope.noncats.filter(function(n){ return n.id() == type })[0]; + if (nc) return nc.name(); + return ''; + } + $scope.logged_in = egCore.auth.token() ? true : false; -- 2.11.0