From: Jason Boyer <jboyer@equinoxinitiative.org>
Date: Mon, 15 Jun 2020 18:33:37 +0000 (-0400)
Subject: LP#1879983: Correct timeslot in Confirmation events
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=329b515f2ab6c658fd1fdd930198d7d73f882d10;p=working%2FEvergreen.git

LP#1879983: Correct timeslot in Confirmation events

If helpers.format_date is not used on timestamps in
templates TT gets confused and pulls the wrong time.

Signed-off-by: Jason Boyer <jboyer@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 8cb7d75f71..cdfac22810 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -20661,7 +20661,7 @@ Subject: Curbside Pickup Confirmed
 Auto-Submitted: auto-generated
 
 This email is to confirm that you have scheduled a curbside item
-pickup at [% target.org.name %] for [% date.format(target.slot, '%a, %d %b %Y %T') %].
+pickup at [% target.org.name %] for [% date.format(helpers.format_date(target.slot), '%a, %d %b %Y %T') %].
 
 You can cancel or change to your appointment, add vehicle description
 notes, and alert staff to your arrival by going to the link below.
@@ -20718,7 +20718,7 @@ Subject: Curbside Pickup Confirmed
 Auto-Submitted: auto-generated
 
 Location: [% target.org.name %]
-Time: [% date.format(target.slot, '%a, %d %b %Y %T') %]
+Time: [% date.format(helpers.format_date(target.slot), '%a, %d %b %Y %T') %]
 Make changes at https://example.org/eg/opac/myopac/holds_curbside
 $$
 );
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.curbside.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.curbside.sql
index 50808301df..b69f43ea3a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.curbside.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.curbside.sql
@@ -243,7 +243,7 @@ Subject: Curbside Pickup Confirmed
 Auto-Submitted: auto-generated
 
 This email is to confirm that you have scheduled a curbside item
-pickup at [% target.org.name %] for [% date.format(target.slot, '%a, %d %b %Y %T') %].
+pickup at [% target.org.name %] for [% date.format(helpers.format_date(target.slot), '%a, %d %b %Y %T') %].
 
 You can cancel or change to your appointment, add vehicle description
 notes, and alert staff to your arrival by going to the link below.
@@ -300,7 +300,7 @@ Subject: Curbside Pickup Confirmed
 Auto-Submitted: auto-generated
 
 Location: [% target.org.name %]
-Time: [% date.format(target.slot, '%a, %d %b %Y %T') %]
+Time: [% date.format(helpers.format_date(target.slot), '%a, %d %b %Y %T') %]
 Make changes at https://example.org/eg/opac/myopac/holds_curbside
 $$
 );