[open-ils-commits] [GIT] Evergreen ILS branch master updated. ba689b93cc120ea22f0be821762157c0bad4e2eb
Evergreen Git
git at git.evergreen-ils.org
Wed Mar 2 14:35:55 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via ba689b93cc120ea22f0be821762157c0bad4e2eb (commit)
via 160310e06d359d5d0912cba46c1a79ddd94e5bbb (commit)
from 5f495322269441d4b19c45b8fdbfa219d12ac4c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ba689b93cc120ea22f0be821762157c0bad4e2eb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 14:32:35 2016 -0500
LP#1519911: upgrade script to fix self-checkout receipt A/T template
This patch adds an update to fix the "lb_addr.post_code" typo
in the stock A/T event definition for self-checkout receipts.
This update changes the definition *only* if it has not
been customized by the user, and it does not attempt to
fix any copies of that definition.
To test
-------
[1] Upon applying the update, generate a receipt from the
web-based self-check interface. The library's postal
code (if set) should now display in the receipt.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 544eb7a..e8620ff 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0964', :eg_version); -- jlitrell/kmlussier/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0965', :eg_version); -- gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0965.data.fix_atevdef_typo.sql b/Open-ILS/src/sql/Pg/upgrade/0965.data.fix_atevdef_typo.sql
new file mode 100644
index 0000000..295b161
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0965.data.fix_atevdef_typo.sql
@@ -0,0 +1,158 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0965', :eg_version);
+
+UPDATE action_trigger.event_definition SET template =
+$$
+[%- USE date -%]
+[%- SET user = target.0.usr -%]
+[%- SET lib = target.0.circ_lib -%]
+[%- SET lib_addr = target.0.circ_lib.billing_address -%]
+[%- SET hours = lib.hours_of_operation -%]
+<div>
+ <style> li { padding: 8px; margin 5px; }</style>
+ <div>[% date.format %]</div>
+ <div>[% lib.name %]</div>
+ <div>[% lib_addr.street1 %] [% lib_addr.street2 %]</div>
+ <div>[% lib_addr.city %], [% lib_addr.state %] [% lib_addr.post_code %]</div>
+ <div>[% lib.phone %]</div>
+ <br/>
+
+ [% user.family_name %], [% user.first_given_name %]
+ <ol>
+ [% FOR circ IN target %]
+ [%-
+ SET idx = loop.count - 1;
+ SET udata = user_data.$idx
+ -%]
+ <li>
+ <div>[% helpers.get_copy_bib_basics(circ.target_copy.id).title %]</div>
+ <div>Barcode: [% circ.target_copy.barcode %]</div>
+ [% IF user_data.renewal_failure %]
+ <div style='color:red;'>Renewal Failed</div>
+ [% ELSE %]
+ <div>Due Date: [% date.format(helpers.format_date(circ.due_date), '%Y-%m-%d') %]</div>
+ [% END %]
+ </li>
+ [% END %]
+ </ol>
+
+ <div>
+ Library Hours
+ [%- BLOCK format_time; date.format(time _ ' 1/1/1000', format='%I:%M %p'); END -%]
+ <div>
+ Monday
+ [% PROCESS format_time time = hours.dow_0_open %]
+ [% PROCESS format_time time = hours.dow_0_close %]
+ </div>
+ <div>
+ Tuesday
+ [% PROCESS format_time time = hours.dow_1_open %]
+ [% PROCESS format_time time = hours.dow_1_close %]
+ </div>
+ <div>
+ Wednesday
+ [% PROCESS format_time time = hours.dow_2_open %]
+ [% PROCESS format_time time = hours.dow_2_close %]
+ </div>
+ <div>
+ Thursday
+ [% PROCESS format_time time = hours.dow_3_open %]
+ [% PROCESS format_time time = hours.dow_3_close %]
+ </div>
+ <div>
+ Friday
+ [% PROCESS format_time time = hours.dow_4_open %]
+ [% PROCESS format_time time = hours.dow_4_close %]
+ </div>
+ <div>
+ Saturday
+ [% PROCESS format_time time = hours.dow_5_open %]
+ [% PROCESS format_time time = hours.dow_5_close %]
+ </div>
+ <div>
+ Sunday
+ [% PROCESS format_time time = hours.dow_6_open %]
+ [% PROCESS format_time time = hours.dow_6_close %]
+ </div>
+ </div>
+</div>
+$$
+WHERE id = 10 AND template =
+$$
+[%- USE date -%]
+[%- SET user = target.0.usr -%]
+[%- SET lib = target.0.circ_lib -%]
+[%- SET lib_addr = target.0.circ_lib.billing_address -%]
+[%- SET hours = lib.hours_of_operation -%]
+<div>
+ <style> li { padding: 8px; margin 5px; }</style>
+ <div>[% date.format %]</div>
+ <div>[% lib.name %]</div>
+ <div>[% lib_addr.street1 %] [% lib_addr.street2 %]</div>
+ <div>[% lib_addr.city %], [% lib_addr.state %] [% lb_addr.post_code %]</div>
+ <div>[% lib.phone %]</div>
+ <br/>
+
+ [% user.family_name %], [% user.first_given_name %]
+ <ol>
+ [% FOR circ IN target %]
+ [%-
+ SET idx = loop.count - 1;
+ SET udata = user_data.$idx
+ -%]
+ <li>
+ <div>[% helpers.get_copy_bib_basics(circ.target_copy.id).title %]</div>
+ <div>Barcode: [% circ.target_copy.barcode %]</div>
+ [% IF user_data.renewal_failure %]
+ <div style='color:red;'>Renewal Failed</div>
+ [% ELSE %]
+ <div>Due Date: [% date.format(helpers.format_date(circ.due_date), '%Y-%m-%d') %]</div>
+ [% END %]
+ </li>
+ [% END %]
+ </ol>
+
+ <div>
+ Library Hours
+ [%- BLOCK format_time; date.format(time _ ' 1/1/1000', format='%I:%M %p'); END -%]
+ <div>
+ Monday
+ [% PROCESS format_time time = hours.dow_0_open %]
+ [% PROCESS format_time time = hours.dow_0_close %]
+ </div>
+ <div>
+ Tuesday
+ [% PROCESS format_time time = hours.dow_1_open %]
+ [% PROCESS format_time time = hours.dow_1_close %]
+ </div>
+ <div>
+ Wednesday
+ [% PROCESS format_time time = hours.dow_2_open %]
+ [% PROCESS format_time time = hours.dow_2_close %]
+ </div>
+ <div>
+ Thursday
+ [% PROCESS format_time time = hours.dow_3_open %]
+ [% PROCESS format_time time = hours.dow_3_close %]
+ </div>
+ <div>
+ Friday
+ [% PROCESS format_time time = hours.dow_4_open %]
+ [% PROCESS format_time time = hours.dow_4_close %]
+ </div>
+ <div>
+ Saturday
+ [% PROCESS format_time time = hours.dow_5_open %]
+ [% PROCESS format_time time = hours.dow_5_close %]
+ </div>
+ <div>
+ Sunday
+ [% PROCESS format_time time = hours.dow_6_open %]
+ [% PROCESS format_time time = hours.dow_6_close %]
+ </div>
+ </div>
+</div>
+$$;
+
+COMMIT;
commit 160310e06d359d5d0912cba46c1a79ddd94e5bbb
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date: Tue Mar 1 18:09:05 2016 -0500
LP#1519911: fix typos in some seed A/T tempaltes
This corrects typos in the seed data for these action trigger templates:
- Self-Checkout Receipt
- Hold Cancelled (No Target) Email Notification
- Hold Cancelled (No Target) User Message
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
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 e234361..2a8026c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -8781,7 +8781,7 @@ $$
<div>[% date.format %]</div>
<div>[% lib.name %]</div>
<div>[% lib_addr.street1 %] [% lib_addr.street2 %]</div>
- <div>[% lib_addr.city %], [% lib_addr.state %] [% lb_addr.post_code %]</div>
+ <div>[% lib_addr.city %], [% lib_addr.state %] [% lib_addr.post_code %]</div>
<div>[% lib.phone %]</div>
<br/>
@@ -10797,7 +10797,7 @@ From: [%- params.sender_email || default_sender %]
Subject: Hold Request Cancelled
Dear [% user.family_name %], [% user.first_given_name %]
-The following holds were cancelled because no items were found to fullfil the hold.
+The following holds were cancelled because no items were found to fulfill the hold.
[% FOR hold IN target %]
Title: [% hold.bib_rec.bib_record.simple_record.title %]
@@ -14278,7 +14278,7 @@ INSERT INTO action_trigger.event_definition (
$$
[%- USE date -%]
[%- user = target.0.usr -%]
-The following holds were cancelled because no items were found to fullfil them.
+The following holds were cancelled because no items were found to fulfill them.
[% FOR hold IN target %]
Title: [% hold.bib_rec.bib_record.simple_record.title %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 6 +-
.../sql/Pg/upgrade/0965.data.fix_atevdef_typo.sql | 158 ++++++++++++++++++++
3 files changed, 162 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0965.data.fix_atevdef_typo.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list