From 63f8b696508ae6071f3fc558d6aa8682cba82188 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Fri, 29 May 2020 12:17:54 -0400 Subject: [PATCH] LP#1879983: Add curbside subtab to the My Account holds UI This updates the public catalog My Account holds tab to add a subtab for curbside appointments. This subtab is displayed only when the patron has available holds on the shelf at pickup libraries that have enabled the circ.curbside library setting. From this subtab, patrons can: * Set times for curbside appointments and specify notes. * Modify and cancel appointments. * Mark themselves has having arrived at the library. In addition to Mike Rylander, significant contributions to this patch were made by Galen Charlton. Sponsored-by: PaILS Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Signed-off-by: Michele Morgan --- Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 | 5 + .../templates/opac/myopac/ebook_holds_ready.tt2 | 5 + .../src/templates/opac/myopac/hold_history.tt2 | 5 + Open-ILS/src/templates/opac/myopac/holds.tt2 | 5 + .../src/templates/opac/myopac/holds_curbside.tt2 | 198 +++++++++++++++++++++ Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 1 + 6 files changed, 219 insertions(+) create mode 100644 Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 diff --git a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 index f862ed6c6a..bbf3b7fc6b 100644 --- a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 @@ -15,6 +15,11 @@
[% l("Items on Hold") %]
+ [% IF ctx.curbside_pickup_libs.size %] +
+ [% l("Curbside Pickup") %] +
+ [% END %]
[% l("E-Items on Hold") %]
diff --git a/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 index 55806d5f6e..578abeb7c9 100644 --- a/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 @@ -15,6 +15,11 @@
[% l("Items on Hold") %]
+ [% IF ctx.curbside_pickup_libs.size %] +
+ [% l("Curbside Pickup") %] +
+ [% END %]
[% l("E-Items on Hold") %]
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 index 068557fd47..c06ab40b7a 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 @@ -15,6 +15,11 @@
[% l("Items on Hold") %]
+ [% IF ctx.curbside_pickup_libs.size %] +
+ [% l("Curbside Pickup") %] +
+ [% END %] [% IF ebook_api.enabled == 'true' %]
[% l("E-Items on Hold") %] diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 index 9aa0b2a658..a4242fe7d1 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -16,6 +16,11 @@
[% l("Items on Hold") %]
+ [% IF ctx.curbside_pickup_libs.size %] +
+ [% l("Curbside Pickup") %] +
+ [% END %] [% IF ebook_api.enabled == 'true' %]
[% l("E-Items on Hold") %] diff --git a/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 new file mode 100644 index 0000000000..cf6b0f5f0c --- /dev/null +++ b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 @@ -0,0 +1,198 @@ +[% PROCESS "opac/parts/header.tt2"; + PROCESS "opac/parts/misc_util.tt2"; + PROCESS "opac/parts/hold_status.tt2"; + PROCESS "opac/parts/hold_notify.tt2"; + PROCESS "opac/parts/myopac/column_sort_support.tt2"; + WRAPPER "opac/parts/myopac/base.tt2"; + myopac_page = "holds_curbside"; +%] +

[% l('Curbside Pickup') %]

+
+ +
+
+ [% l("Items on Hold") %] +
+ [% IF ctx.curbside_pickup_libs.size > 0 %] +
+ [% l("Curbside Pickup") %] +
+ [% END %] + [% IF ebook_api.enabled == 'true' %] +
+ [% l("E-Items on Hold") %] +
+
+ [% l("E-Items Ready for Checkout") %] +
+ [% END %] +
+ [% l("Holds History") %] +
+
+ +
+ + [% l("Curbside Pickup Appointments") %] + +
+
+
+
+ [% l('Pickup Location') %] + [% l('Date') %] + [% l('Time') %] + [% l('Arrival Notes (vehicle description, etc)') %] + [% l('Action') %] +
+
+
+
+
+
+
+
+ [% FOR lib IN ctx.curbside_pickup_libs; + + cs_slot = ''; + cs_slot_id = ''; + cs_date = ''; + cs_time = ''; + cs_notes = ''; + + cs_org = ctx.cs_org; + IF cs_org == lib; + cs_slot = ctx.cs_slot; + cs_slot_id = ctx.cs_slot_id; + cs_date = ctx.cs_date; + cs_time = ctx.cs_time; + cs_notes = ctx.cs_notes; + END; + + appointment = ctx.curbside_appointments.$lib; + IF appointment; + cs_slot = appointment; + cs_slot_id = appointment.id; + IF appointment.slot; cs_date = date.format(ctx.parse_datetime(appointment.slot),'%F'); END; + IF appointment.slot; cs_time = date.format(ctx.parse_datetime(appointment.slot),'%T'); END; + cs_notes = appointment.notes; + END %] +
+ + + [% 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 %] + + [% ctx.get_aou(lib).name | html %]
+ [% l('Phone:')%] [% ctx.get_aou(lib).phone | html %] + + + + [% 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 %][% END %] + [% IF no_patron_input && date_started_null; %]  + [% ELSE; %][% END %] + + + [% IF appointment || cs_date; # checking times %] + [% current_date = cs_date %] + [% IF date_started_null && no_patron_input %]  + [% ELSIF appointment || ctx.cs_times.$current_date.size; # show a select %] + + [% ELSE %] + [% l('No times available') %] +
+ [% END %] + [% ELSE %] + [% IF !no_patron_input; %][% l('Select a date') %][% END %] + [% END %] + + + [% IF cs_date; # show the notes box %] + + [% ELSE %]   + [% END %] + + [% + disable_arrival_button = 1; # assume arrival is not yet allowed + IF appointment && appointment.slot; + stime = date.format(ctx.parse_datetime(appointment.slot), '%s'); + now_time = date.format(date.now, '%s'); + IF now_time >= stime; + disable_arrival_button = 0; # if 'now' is after the slot time, allow arrival + END; + END %] + [% IF no_patron_input %] + [% l('Please contact the library to schedule, change, or cancel your appointment.') %] + [% ELSIF appointment.staged && !appointment.arrival; # relevant submit action %] +
+ + [% ELSIF appointment.arrival %] + + + [% ELSIF appointment.slot %] +
+
+ + [% ELSIF cs_date %] + +
+ [% ELSE %] + + [% END %] + +
+
+
+
+
+
+
+
+ [% END %] +
+
+[% END %] diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 index 284fdabc48..c6e38e85d5 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 @@ -5,6 +5,7 @@ {url => "messages", name => l("Messages")}, {url => "circs", name => l("Items Checked Out")}, {url => "holds", name => l("Holds")}, + {url => "holds_curbside", name => l("Curbside Pickup")}, {url => "prefs", name => l("Account Preferences")}, {url => "lists", name => l("My Lists")} ]; -- 2.11.0