From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 5 Jun 2020 21:02:28 +0000 (-0400)
Subject: give a friendlier error message if slot limit prevents an appointment
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=23acf817ffd119c33927e798c760c3d76aa22a9b;p=working%2FEvergreen.git

give a friendlier error message if slot limit prevents an appointment

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

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.') %]";
 }]);
 </script>
 [% 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,