From 23acf817ffd119c33927e798c760c3d76aa22a9b Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 5 Jun 2020 17:02:28 -0400 Subject: [PATCH] give a friendlier error message if slot limit prevents an appointment Signed-off-by: Galen Charlton --- Open-ILS/src/templates/staff/circ/curbside/index.tt2 | 1 + .../staff/circ/curbside/directives/schedule_pickup.js | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/templates/staff/circ/curbside/index.tt2 b/Open-ILS/src/templates/staff/circ/curbside/index.tt2 index 822a73bbe9..bc51b4b9ba 100644 --- a/Open-ILS/src/templates/staff/circ/curbside/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/curbside/index.tt2 @@ -35,6 +35,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) { s.FAILED_CANCEL_APPOINTMENT = "[% l('Failed to cancel curbside appointment {{slot_id}} ({{evt_code}})') %]"; s.SUCCESS_SAVE_APPOINTMENT = "[% l('Saved curbside appointment {{slot_id}}') %]"; s.FAILED_SAVE_APPOINTMENT = "[% l('Failed to save changes to curbside appointment ({{evt_code}})') %]"; + s.FAILED_SAVE_APPOINTMENT_TOO_MANY = "[% l('Time slot is full; please choose another.') %]"; }]); [% END %] diff --git a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js index 6a3163f720..6d8ae65e0a 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js +++ b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js @@ -327,10 +327,17 @@ function($scope , $q , egCurbsideCoreSvc , egCore , patronSvc , appt.notes ).then(function(resp) { if (evt = egCore.evt.parse(resp)) { - ngToast.danger(egCore.strings.$replace( - egCore.strings.FAILED_SAVE_APPOINTMENT, - { evt_code : evt.code } - )); + if (evt.textcode === 'CURBSIDE_MAX_FOR_TIME') { + ngToast.danger(egCore.strings.$replace( + egCore.strings.FAILED_SAVE_APPOINTMENT_TOO_MANY, + { evt_code : evt.code } + )); + } else { + ngToast.danger(egCore.strings.$replace( + egCore.strings.FAILED_SAVE_APPOINTMENT, + { evt_code : evt.code } + )); + } } else { ngToast.success(egCore.strings.$replace( egCore.strings.SUCCESS_SAVE_APPOINTMENT, -- 2.11.0