From ec36d13703265b4624cf211255efdf3c32944620 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Thu, 2 Nov 2017 06:56:47 -0400 Subject: [PATCH] PINES Receipt Template Customizations for Web Client Corrected branch error Signed-off-by: McCanna --- .../staff/share/print_templates/t_bill_payment.tt2 | 39 ++++++++-------- .../share/print_templates/t_bills_current.tt2 | 54 ++++++++++++++-------- .../share/print_templates/t_bills_historical.tt2 | 36 +++++++-------- .../staff/share/print_templates/t_checkout.tt2 | 1 + .../share/print_templates/t_hold_pull_list.tt2 | 12 ++--- .../share/print_templates/t_hold_shelf_list.tt2 | 17 ++++--- .../share/print_templates/t_hold_shelf_slip.tt2 | 19 +++++--- .../share/print_templates/t_hold_transit_slip.tt2 | 7 ++- .../share/print_templates/t_holds_for_bib.tt2 | 14 +++--- .../share/print_templates/t_offline_checkin.tt2 | 22 ++------- .../share/print_templates/t_offline_checkout.tt2 | 22 ++------- .../print_templates/t_offline_in_house_use.tt2 | 19 ++------ .../share/print_templates/t_offline_renew.tt2 | 21 ++------- .../staff/share/print_templates/t_transit_list.tt2 | 6 +-- .../staff/share/print_templates/t_transit_slip.tt2 | 6 +-- 15 files changed, 135 insertions(+), 160 deletions(-) diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 index 0557e820ce..2c7c4a718f 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 @@ -5,12 +5,12 @@ - - + + - - + - - + + - - + + - - + +
Original Balance:{{previous_balance | currency}}Original Balance:{{previous_balance | currency}}
Payment Method: + Payment Method:
Cash
Check
@@ -23,16 +23,16 @@
Amount Paid:{{payment_applied | currency}}Amount Paid:{{payment_applied | currency}}
Billings Voided:{{amount_voided | currency}}Billings Voided:{{amount_voided | currency}}
New Balance:{{new_balance | currency}}New Balance:{{new_balance | currency}}

Note: {{payment_note}}
@@ -44,24 +44,25 @@
- - + + - - + - + + - - + + - - + +
Bill #:{{payment.xact.id}}Bill #:{{payment.xact.id}}
Type:   {{payment.xact.summary.last_billing_type}} + Type:   {{payment.xact.summary.last_billing_type}} {{payment.xact.summary.xact_type}}
Received:  {{payment.amount | currency}}Received:  {{payment.amount | currency}}
Title:{{payment.xact.title}}Title:{{payment.xact.title}}
Barcode:{{payment.xact.copy_barcode}}Barcode:{{payment.xact.copy_barcode}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 index f1c6a0aa61..0834bb5f56 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 @@ -1,21 +1,39 @@ - - Bill ID: - {{xact.id}} - - - Bill Start Date:   - {{xact.xact_start| date:'M/d/yyyy'}} - - - Type: - {{xact.summary.last_billing_type}} +

+www.gapines.org
+{{current_location.name}}
+

Current Bills

+
+
+ + + + + + + + + + + + - - - - - + + + + + + + + + + + + +
Bill ID:{{xact.id}}
Bill Start Date:   {{xact.xact_start | date:'M/d/yyyy'}}
Type:{{xact.summary.last_billing_type}} {{xact.summary.xact_type}}
Balance:  {{xact.summary.balance_owed | currency}}
Total Billed:{{xact.summary.total_owed | currency}}
Total Paid:{{xact.summary.total_paid | currency}}
Balance:{{xact.summary.balance_owed | currency}}
-
+ +
+{{current_location.shortname}} {{today | date:'short'}}
-{{current_location.shortname}}   {{today | date:'short'}}
+ + diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 index 5106f13289..4d602c2d8f 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 @@ -5,30 +5,30 @@

- - - + + + - - - + + + - - - + + - - - + + + - - - + + + - - - + + +
Bill ID:{{xact.id}}
Bill ID:{{xact.id}}
Bill Start Date:   {{xact.xact_start | date:'M/d/yyyy'}}
Bill Start Date:   {{xact.xact_start | date:'M/d/yyyy'}}
Type:{{xact.summary.last_billing_type}} +
Type:{{xact.summary.last_billing_type}} {{xact.summary.xact_type}}
Total Billed:{{xact.summary.total_owed | currency}}
Total Billed:{{xact.summary.total_owed | currency}}
Total Paid:{{xact.summary.total_paid | currency}}
Total Paid:{{xact.summary.total_paid | currency}}
Balance:{{xact.summary.balance_owed | currency}}
Balance:{{xact.summary.balance_owed | currency}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 index 99fcb0b96a..2a91759737 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 @@ -12,5 +12,6 @@ +
Total Amount Owed: {{patron_money.balance_owed | currency}}
{{current_location.shortname}} {{today | date:'short'}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 index c4dec31d32..e9bc9ff59c 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 @@ -21,12 +21,12 @@ - {{hold_data.copy.location.name}} - {{hold_data.volume.label}} - {{hold_data.title}} - {{hold_data.author}} - {{hold_data.copy.barcode}} {{hold_data.part.label}} - {{hold_data.hold.hold_type}} + {{hold_data.copy.location.name}} + {{hold_data.volume.label}} + {{hold_data.title}} + {{hold_data.author}} + {{hold_data.copy.barcode}} {{hold_data.part.label}} + {{hold_data.hold.hold_type}} \ No newline at end of file diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 index 2519cfeca3..cc1bd50c8a 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 @@ -17,19 +17,24 @@ Author Call Number Barcode/Part + Status + Shelf Expire Date - {{hold_data.patron_alias}} + {{hold_data.patron_alias}} {{hold_data.patron_last}}, {{hold_data.patron_first}}
- {{hold_data.title}} - {{hold_data.author}} - {{hold_data.volume.label}} - {{hold_data.copy.barcode}} {{hold_data.part.label}} + {{hold_data.title}} + {{hold_data.author}} + {{hold_data.volume.label}} + {{hold_data.copy.barcode}} {{hold_data.part.label}} + {{hold_data.status_string}} + {{hold_data.hold.shelf_expire_time | date:'short'}} - \ No newline at end of file + + diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 index fadd09cf93..95ae098de4 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 @@ -11,21 +11,26 @@
- - - + + + - - - + +
Title:{{title}}
Barcode:{{copy.barcode}}
Request Date:  {{hold.request_time | date:"M/d/yyyy"}}
Title:{{title}}
Barcode:{{copy.barcode}}
Request Date:  {{hold.request_time | date:"M/d/yyyy"}}
 
Patron:{{patron.family_name}}, {{patron.first_given_name}} {{patron.second_given_name}}
Barcode:{{patron.card.barcode}}
+
Patron:{{patron.family_name}}, {{patron.first_given_name}} {{patron.second_given_name}}
Barcode:{{patron.card.barcode}}
Notify by phone:  
Notify by text:
Notify by email:  
- 		+
{{hold.phone_notify}}
{{hold.sms_notify}}
{{patron.email}}
+
    +
  1. +{{note.title}}
    +{{note.body}}
    2. +
{{current_location.shortname}} {{today | date:'short'}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 index e8370bc8c5..47e2ea47c9 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 @@ -6,10 +6,9 @@ {{dest_location.name}}
- - - - + + +
Title:{{title}}
Author:{{author}}
Barcode:  {{copy.barcode}}
Request Date:  {{hold.request_time | date:"M/d/yyyy"}}
Title:{{title}}
Author:{{author}}
Barcode:  {{copy.barcode}}
{{current_location.shortname}} {{today | date:'short'}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 index e3c8c6895e..9c79254eb1 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 @@ -27,16 +27,14 @@ bib record. Fields include: - {{hold.hold.request_time | date:$root.egDateAndTimeFormat}} - {{hold.patron_barcode}} - {{hold.patron_last}} - {{hold.patron_alias}} - {{hold.copy.barcode}} + {{hold.hold.request_time | date:$root.egDateAndTimeFormat}} + {{hold.patron_barcode}} + {{hold.patron_last}} + {{hold.patron_alias}} + {{hold.copy.barcode}}
-
{{current_location.shortname}} {{today | date:$root.egDateAndTimeFormat}}
-
[% l('Printed by [_1]', '{{staff.first_given_name}}') %]
-
+
{{current_location.shortname}} {{today | date:'short'}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2 index 7c0acddfe5..a2df19de9c 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2 @@ -1,25 +1,11 @@ - -
-
[% l('You checked in the following [_1] items:', '{{transactions.length}}') %]
+

PINES

+
You checked in the following {{transactions.length}} items:
  1. -
    [% l('Barcode: [_1] Checkin date: [_2]', - '{{checkin.barcode}}', - '{{checkin.backdate | date:"short"}}') %]
    +
    Barcode: {{checkin.barcode}}
    + Checkin date: {{checkin.backdate | date:"short"}}
{{today | date:'short'}}
-
- diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2 index 292e7b4131..7aeecaf0e0 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2 @@ -1,26 +1,12 @@ - -
-
[% l('Patron [_1]', '{{transactions[0].patron_barcode}}') %]
-
[% l('You checked out the following [_1] items:', '{{transactions.length}}') %]
+

PINES

+
You checked out the following {{transactions.length}} items:
  1. -
    [% l('Barcode: [_1] Due: [_2]', - '{{checkout.barcode}}', - '{{checkout.due_date | date:"short"}}') %]
    +
    Barcode: {{checkout.barcode}}
    + Due: {{checkout.due_date | date:"short"}}
{{today | date:'short'}}
-
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2 index 1f177ceeab..efb11a0388 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2 @@ -1,24 +1,11 @@ - -
-
[% l('You recorded use for the following [_1] items:', '{{transactions.length}}') %]
+
You recorded in-house use for the following {{transactions.length}} items:
  1. -
    [% l('Barcode [_1] used [_2] times', - '{{checkout.barcode}}', - '{{checkout.count}}') %]
    +
    Barcode {{checkout.barcode}} used {{checkout.count}} times
{{today | date:'short'}}
-
- diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2 index 7bd82421e7..a7134fb52d 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2 @@ -1,24 +1,13 @@ - -
-
[% l('You renewed the following [_1] items:', '{{transactions.length}}') %]
+

PINES

+
You renewed the following {{transactions.length}} items:
  1. -
    [% l('Barcode: [_1] Due: [_2]', - '{{checkout.barcode}}', - '{{checkout.due_date | date:"short"}}') %]
    +
    Barcode: {{checkout.barcode}}
    + Due: {{checkout.due_date | date:"short"}}
{{today | date:'short'}}
-
+ diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2 index 3f233d1857..646233ce0e 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2 @@ -13,13 +13,13 @@ transits - list; each entry contains: * target_copy.call_number.record.simple_record.title -->
-
Transits:
+

Transit List:

  1. -
    From: {{transit.source.shortname}} To: {{transit.dest.shortname}}
    When: {{transit.source_send_time | date:'short'}}
    Barcode: {{transit.target_copy.barcode}} Title: {{transit.target_copy.call_number.record.simple_record.title}}
    +
    From: {{transit.source.shortname}}
    To: {{transit.dest.shortname}}
    When: {{transit.source_send_time | date:'short'}}
    Barcode: {{transit.target_copy.barcode}}
    Title: {{transit.target_copy.call_number.record.simple_record.title}}
-
{{current_location.shortname}} {{today | date:$root.egDateAndTimeFormat}}
+
{{current_location.shortname}} {{today | date:'short'}}

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 index a16662a1e4..47e2ea47c9 100644 --- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 +++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 @@ -6,9 +6,9 @@ {{dest_location.name}}

- - - + + +
Title:{{title}}
Author:{{author}}
Barcode:  {{copy.barcode}}
Title:{{title}}
Author:{{author}}
Barcode:  {{copy.barcode}}
{{current_location.shortname}} {{today | date:'short'}}
-- 2.11.0