payment receipt config bits

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

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
index 911c7d5..71cd5b3 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
@@ -14,6 +14,7 @@
     <select class="form-control" ng-model="print.template_name" ng-change="template_changed()">
       <option value="bills_current">[% l('Bills, Current') %]</option>
       <option value="bills_historical">[% l('Bills, Historical') %]</option>
+      <option value="bill_payment">[% l('Bills, Payment') %]</option>
     </select>
   </div>
   <div class="col-md-7">

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 766c9c6..fe6851a 100644 (file)
--- 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
@@ -55,8 +55,9 @@ A receipt of your  transaction:<hr/>
           <td>[% l('Received: [_1]', '{{payment.amount | currency}}') %]</td>
         </tr>
         <tr>
-          <td colspan="2">{{payment.xact.copy_barcode}}</td>
-          <td colspan="3">{{payment.xact.title}}</td>
+          <td colspan="5">
+            {{payment.xact.copy_barcode}} {{payment.xact.title}}
+          </td>
         </tr>
       </table>
       <br/>

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 645d780..cba0e12 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -335,8 +335,25 @@ function($scope , $q , egCore) {
                     balance_owed : 2.00
                 }
             }
-        ]
+        ],
+
+        previous_balance : 8.45,
+        payment_total : 2.00,
+        payment_applied : 2.00,
+        new_balance : 6.45,
+        amount_voided : 0,
+        change_given : 0,
+        payment_type : 'cash_payment',
+        payment_note : 'Here is a payment note',
     }
+    $scope.preview_scope.payments = [
+        {amount : 1.00, xact : $scope.preview_scope.transactions[0]}, 
+        {amount : 1.00, xact : $scope.preview_scope.transactions[1]}
+    ]
+    $scope.preview_scope.payments[0].xact.title = 'Hali Bote Azikaban de tao fan';
+    $scope.preview_scope.payments[0].xact.copy_barcode = '334343434';
+    $scope.preview_scope.payments[1].xact.title = 'Traveling Pants!!';
+    $scope.preview_scope.payments[1].xact.copy_barcode = '334343467';
 
     $scope.template_changed = function() {
         egCore.hatch.getPrintTemplate($scope.print.template_name)

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 5b4cf14..5f2a445 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -407,6 +407,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
 
         // page data not yet refreshed, capture data from current scope
         var print_data = {
+            payment_note : note,
             previous_balance : $scope.summary.balance_owed,
             payment_total : $scope.payment_amount,
             payment_applied : $scope.pending_payment(),