From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Wed, 17 Jun 2020 18:09:09 +0000 (-0400)
Subject: LP#1879983: tweak OPAC when no patron input desired
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0539f7079cde816f8760134a6737b060525a956f;p=working%2FEvergreen.git

LP#1879983: tweak OPAC when no patron input desired

* Don't display a disabled date selector with today's date
  if no date has been set yet or an appointment doesn't
  exist.
* Tweak the wording directing the patron to contact the
  library.

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

diff --git a/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
index e18cc451a6..1698869e16 100644
--- a/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
@@ -83,6 +83,7 @@
             <input type="hidden" name="cs_slot_id" value="[% appointment.id %]"/>
             [% disable_me = 0 %]
             [% no_patron_input = 0 %]
+            [% date_started_null = 0 %]
             [% IF appointment && appointment.arrival; disable_me = 1; END %]
             [% IF ctx.get_org_setting(lib, 'circ.curbside.disable_patron_input'); no_patron_input = 1; END %]
             <span class="egtd">
@@ -91,15 +92,17 @@
                 <input type="hidden" name="cs_org" value="[% lib %]"/>
             </span>
             <span class="egtd">
-                [% IF !cs_date; tmp_cs_date = date.format(date.now, '%F') %]
+                [% IF !cs_date; tmp_cs_date = date.format(date.now, '%F'); date_started_null = 1; %]
                 [% ELSE; tmp_cs_date = cs_date; END %]
                 [% IF cs_date %]<input type="hidden" name="cs_date" value="[% cs_date | html %]"/>[% END %]
-                <input type="date" name="cs_date" value="[% tmp_cs_date | html %]" [% IF cs_date || no_patron_input %]disabled="disabled"[% END %]/>
+                [% IF no_patron_input && date_started_null; %]
+                [% ELSE; %]<input type="date" name="cs_date" value="[% tmp_cs_date | html %]" [% IF cs_date || no_patron_input %]disabled="disabled"[% END %]/>[% END %]
             </span>
             <span class="egtd">
                 [% IF appointment || cs_date; # checking times %]
                   [% current_date = cs_date %]
-                  [% IF appointment || ctx.cs_times.$current_date.size; # show a select %]
+                  [% IF date_started_null && no_patron_input %]
+                  [% ELSIF appointment || ctx.cs_times.$current_date.size; # show a select %]
                     <select name="cs_time" [% IF disable_me || no_patron_input %]disabled="disabled"[% END %]>
                       [% found_time = 0 %]
                       [% FOR t IN ctx.cs_times.$current_date %]
@@ -115,8 +118,6 @@
                         </option>
                       [% END %]
                     </select>
-                  [% ELSIF no_patron_input %]
-                    [% l('Please contact the library to select a date.') %]
                   [% ELSE %] 
                     [% l('No times available') %]
                     <button type="submit" name="cs_action" value="reset" class="opac-button">
@@ -124,7 +125,7 @@
                     </button><br/>
                   [% END %]
                 [% ELSE %] 
-                  [% l('Select a date') %]
+                  [% IF !no_patron_input; %][% l('Select a date') %][% END %]
                 [% END %]
             </span>
             <span class="egtd">
@@ -143,7 +144,7 @@
                     END;
                 END %]
                 [% IF no_patron_input %]
-                    [% l('Please contact the library to update or cancel your appointment.') %]
+                    [% l('Please contact the library to schedule, change, or cancel your appointment.') %]
                 [% ELSIF appointment.staged && !appointment.arrival; # relevant submit action %]
                     <button type="submit" name="cs_action" value="arrive" class="opac-button" [% IF disable_arrival_button %]disabled="disabled"[% END %]>
                         [% l('Alert staff of your arrival') %]