displaying title/author and extracted due date. falling back to billing addr if...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10305 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/templates/overdue_7day.example b/Open-ILS/examples/templates/overdue_7day.example
index 6112f8c..a79e19b 100644 (file)
--- a/Open-ILS/examples/templates/overdue_7day.example
+++ b/Open-ILS/examples/templates/overdue_7day.example
@@ -10,8 +10,12 @@ Dear [% user.first_given_name %] [% user.family_name %]
 Our records indicate these items are 7 days overdue:
 
 [% FOREACH circ = circ_list %]
-Due Date: [% circ.due_date %]
-Barcode: [% circ.target_copy.barcode %]
+    [% get_bib_attr(circ, 'title') %], by [% get_bib_attr(circ, 'author') %] 
+    Call Number: [% circ.target_copy.call_number.label %]
+    [%- SET date = parse_due_date(circ) %]
+    Due Date: [% date.year %]-[% date.month %]-[% date.day -%]
+    [%- IF date.hour -%] [% date.hour %]:[% date.minute %] [%- END %]
+    Barcode: [% circ.target_copy.barcode %]
 [% END %]
 
 
@@ -21,8 +25,9 @@ respond to this email.
 Contact your library for more information:
 
 [% lib.name %]
-[% lib.mailing_address.street1 %]
-[% lib.mailing_address.street2 %]
+[%- SET addr = lib.mailing_address -%]
+[%- IF !addr -%] [%- SET addr = lib.billing_address -%] [%- END %]
+[% lib.mailing_address.street1 %] [% lib.mailing_address.street2 %]
 [% lib.mailing_address.city %], [% lib.mailing_address.state %]
 [% lib.mailing_address.post_code %]
 [% lib.phone %]

diff --git a/Open-ILS/examples/templates/predue_1day.example b/Open-ILS/examples/templates/predue_1day.example
index 1cd063c..30709cf 100644 (file)
--- a/Open-ILS/examples/templates/predue_1day.example
+++ b/Open-ILS/examples/templates/predue_1day.example
@@ -10,8 +10,12 @@ Dear [% user.first_given_name %] [% user.family_name %]
 Our records indicate these items are due tomorrow:
 
 [% FOREACH circ = circ_list %]
-Due Date: [% circ.due_date %]
-Barcode: [% circ.target_copy.barcode %]
+    [% get_bib_attr(circ, 'title') %], by [% get_bib_attr(circ, 'author') %] 
+    Call Number: [% circ.target_copy.call_number.label %]
+    [%- SET date = parse_due_date(circ) %]
+    Due Date: [% date.year %]-[% date.month %]-[% date.day -%]
+    [%- IF date.hour -%] [% date.hour %]:[% date.minute %] [%- END %]
+    Barcode: [% circ.target_copy.barcode %]
 [% END %]
 
 
@@ -21,8 +25,9 @@ respond to this email.
 Contact your library for more information:
 
 [% lib.name %]
-[% lib.mailing_address.street1 %]
-[% lib.mailing_address.street2 %]
+[%- SET addr = lib.mailing_address -%]
+[%- IF !addr -%] [%- SET addr = lib.billing_address -%] [%- END %]
+[% lib.mailing_address.street1 %] [% lib.mailing_address.street2 %]
 [% lib.mailing_address.city %], [% lib.mailing_address.state %]
 [% lib.mailing_address.post_code %]
 [% lib.phone %]