more transit slip work

Signed-off-by: Bill Erickson <berick@esilibrary.com>

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
new file mode 100644 (file)
index 0000000..6b36c25
--- /dev/null
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
@@ -0,0 +1,34 @@
+<div>
+  <div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
+  <div>{{dest_location.name}}</div>
+  <div>{{dest_address.street1}}
+  <div>{{dest_address.street2}}</div>
+  <div>{{dest_address.city}},
+       {{dest_address.state}}
+       {{dest_address.post_code}}</div>
+  <br/>
+
+  [% l('Barcode: [_1]', '{{copy.barcode}}') %]</div>
+  [% l('Title: [_1]', '{{title}}') %]</div>
+  [% l('Author: [_1]', '{{author}}') %]</div>
+
+  <br/>
+
+  <div>[% l('Hold for patron [_1], [_2] [_3]',
+    '{{patron.family_given_name}}',
+    '{{patron.first_given_name}}',
+    '{{patron.second_given_name}}') %]</div>
+  <div>[% l('Barcode: [_1]', '{{patron.card.barcode}}') %]</div>
+  <div ng-if="hold.phone_notify">[% l('Notify by phone: [_1]', '{{hold.phone_notify}}') %]</div>
+  <div ng-if="hold.sms_notify">[% l('Notify by text: [_1]', '{{hold.sms_notify}}') %]</div>
+  <div ng-if="hold.email_notify == 't'">[% l('Notify by email: [_1]', '{{patron.email}}') %]</div>
+
+  <br/>
+
+  <div>[% l('Request Date: [_1]', 
+    '{{hold.request_time | date:"short"}}') %]</div>
+  <div>[% l('Slip Date: [_1]', '{{today | date:"short"}}') %]</div>
+  <div>[% l('Printed by [_1] at [_2]', 
+    '{{staff.first_given_name}}', '{{current_location.shortname}}') %]</div>
+
+</div>

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 20d0095..324ad5e 100644 (file)
--- 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
@@ -1,15 +1,21 @@
 <div>
-  <div>[% l('This item needs to be routed to [_1]', '<b>{{transit.dest.shortname}}</b>') %]</div>
-  {{transit.dest.name}}<br/>
-  {{transit.dest.holds_address.street1}}
-  {{transit.dest.holds_address.street2}}<br/>
-  {{transit.dest.holds_address.city}},
-  {{transit.dest.holds_address.state}}
-  {{transit.dest.holds_address.post_code}}<br/><br/>
-  [% l('Barcode: [_1]', '{{transit.target_copy.barcode}}') %]<br/>
-  [% l('Title: [_1]', '{{title}}') %]<br/>
-  [% l('Author: [_1]', '{{author}}') %]<br/>
-  [% l('Slip Date: [_1]', '{{today | date:"short"}}') %]<br/>
-  [% l('Printed by [_1] at [_2]', 
-    '{{staff.first_given_name}}', '{{current_location.shortname}}') %]<br/>
+  <div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
+  <div>{{dest_location.name}}</div>
+  <div>{{dest_address.street1}}
+  <div>{{dest_address.street2}}</div>
+  <div>{{dest_address.city}},
+       {{dest_address.state}}
+       {{dest_address.post_code}}</div>
+  <br/>
+
+  [% l('Barcode: [_1]', '{{copy.barcode}}') %]</div>
+  [% l('Title: [_1]', '{{title}}') %]</div>
+  [% l('Author: [_1]', '{{author}}') %]</div>
+
+  <br/>
+
+  <div>[% l('Slip Date: [_1]', '{{today | date:"short"}}') %]</div>
+  <div>[% l('Printed by [_1] at [_2]', 
+    '{{staff.first_given_name}}', '{{current_location.shortname}}') %]</div>
+
 </div>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index bab34b6..23376f1 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -357,21 +357,28 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
                     var transit = evt.payload.transit;
 
-                    // flesh data into the transit to match the print template
-                    transit.target_copy(evt.payload.copy);
-                    transit.dest(egCore.org.get(transit.dest()));
-                    transit.dest().holds_address(destAddr);
-
-                    egCore.hatch.printFromTemplate('default', 'transit_slip', 
-                        {   transit : egCore.idl.toHash(transit),
-                            title : evt.payload.record.title(),
-                            author : evt.payload.record.author(),
-                            staff : egCore.idl.toHash(egCore.auth.user()),
-                            current_location : egCore.idl.toHash(
-                                egCore.org.get(egCore.auth.user().ws_ou()))
-                        }
-                    );
+                    var print_context = {
+                        transit : egCore.idl.toHash(transit),
+                        title : evt.payload.record.title(),
+                        author : evt.payload.record.author(),
+                        staff : egCore.idl.toHash(egCore.auth.user()),
+                        copy : egCore.idl.toHash(evt.payload.copy),
+                        dest_location :
+                            egCore.idl.toHash(egCore.org.get(transit.dest())),
+                        dest_address : egCore.idl.toHash(destAddr),
+                        current_location : egCore.idl.toHash(
+                            egCore.org.get(egCore.auth.user().ws_ou()))
+                    }
+
+                    var template = 'transit_slip';
+                    if (holdUser) {
+                        template = 'hold_transit_slip';
+                        print_context.hold = egCore.idl.toHash(evt.payload.hold),
+                        print_context.patron = egCore.idl.toHash(holdUser);
+                    }
 
+                    egCore.hatch.printFromTemplate(
+                        'default', template, print_context);
                 }
             }],
             resolve : {