LP1759343: Bills Annotation Persistance

[evergreen-equinox.git] / Open-ILS / src / templates / staff / circ / patron / t_bills.tt2

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
index bbf6595..69d0439 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -15,7 +15,7 @@
       <div class="col-md-2">{{patron().credit_forward_balance() | currency}}</div>
     </div>
     <div class="row">
-      <div class="col-md-4">[% l('Total Paid:') %]</div>
+      <div class="col-md-4">[% l('Total Paid/Credited:') %]</div>
       <div class="col-md-2">{{summary.total_paid() | currency}}</div>
       <div class="col-md-4">[% l('Session Voided:') %]</div>
       <div class="col-md-2">{{session_voided | currency}}</div>
@@ -34,7 +34,7 @@
       <div class="col-md-2 strong-text">{{pending_change() | currency}}</div>
     </div>
     <div class="row">
-      <div class="col-md-4">[% l('Paid for Selected:') %]</div>
+      <div class="col-md-4">[% l('Paid/Credited for Selected:') %]</div>
       <div class="col-md-2">{{paid_selected() | currency}}</div>
     </div>
   </div><!-- col -->
@@ -81,13 +81,13 @@
         <div class="form-group">
           <label for="annotate-payment" class="control-label col-md-5">[% l('Annotate') %]</label>
           <div class="col-md-1">
-            <input id="annotate-payment" type="checkbox" ng-model="annotate_payment"/>
+            <input id="annotate-payment" type="checkbox" ng-model="annotate_payment" ng-change="onAnnotatePaymentChanged()"/>
           </div>
           <div class="col-md-6">
             <button
                 type="submit"
                 class="btn btn-default"
-                ng-disabled="invalid_check_number() || !gridControls.selectedItems().length"
+                ng-disabled="!payment_amount || invalid_check_number() || !gridControls.selectedItems().length || applyingPayment"
             >[% l('Apply Payment') %]</button>
           </div>
         </div>
@@ -103,17 +103,25 @@
 <!-- pull-right is causing the content to flow several pixels 
 off to the right.  flex-row is honoring the boundaries better. 
 not sure what's up, there. -->
-<div class="flex-row" ng-if="!disable_auto_print">
+<div class="flex-row" ng-show="!disable_auto_print">
   <div class="flex-cell"></div>
+  <div ng-hide="disablePatronCredit" class="pad-right">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" ng-model="convert_to_credit.isChecked">
+        [% l('Convert Change to Patron Credit') %]
+      </label>
+    </div>
+  </div>
   <form class="form-inline" role="form">
    <div class="checkbox">
       <label>
-        <input id="receipt_on_pay" type="checkbox" ng-model="receipt_on_pay.isChecked"/>
+        <input id="receipt_on_pay" type="checkbox" ng-model="receipt_on_pay.isChecked" ng-change="onReceiptOnPayChanged()"/>
         [% l('Receipt On Payment') %]
       </label>
     </div>
     <div class="form-group" style="margin-left:10px">
-      <label for="bill-receipt-copies">[% l('# Copies') %]</label>
+      <label for="bill-receipt-copies">[% l('# Items') %]</label>
       <input type="number" min="1" style="width:5em"
         ng-model="receipt_count"
         class="form-control" id="bill-receipt-copies"/>