added support for cherry-picking transactions to pay

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

diff --git a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
index cbb1f85..bb53323 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
+++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
@@ -17,6 +17,7 @@
     'ITEM_NOT_CATALOGED' : 'Item ${0} was not found in the system.  Try re-scanning the item.',
     'WORKSTATION_REQUIRED' : 'A workstation is required to log in to selfcheck.  You can set the  workstation name with URL param "ws".  \n\nWould you like to register a new workstation for this self-check interface?',
     'WORKSTATION_EXISTS' : 'This workstation has already been registered.  Would you like to use it for this self-check station?',
-    'CC_PAYABLE_BALANCE' : 'You have \$${0} in fines payable by credit card.'
+    'CC_PAYABLE_BALANCE' : 'Total amount to pay: \$${0}',
+    'TOTAL_FINES_SELECTED' : 'Selected total: \$${0}'
 }
 

diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index d07c613..43d77b1 100644 (file)
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -668,15 +668,25 @@ SelfCheckManager.prototype.drawHolds = function(holds) {
 SelfCheckManager.prototype.drawPayFinesPage = function() {
     this.goToTab('payment');
 
+    // find the total selected amount
+    var total = 0;
+    dojo.forEach(
+        dojo.query('[name=selector]', this.finesTbody),
+        function(input) {
+            if(input.checked)
+                total += Number(input.getAttribute('balance_owed'));
+        }
+    );
+    total = total.toFixed(2);
+
     dojo.byId('oils-selfck-cc-payment-summary').innerHTML = 
         dojo.string.substitute(
             localeStrings.CC_PAYABLE_BALANCE,
-            [this.creditPayableBalance]
+            [total]
         );
 
     oilsSelfckCCNumber.attr('value', '');
     oilsSelfckCCMonth.attr('value', '01');
-    oilsSelfckCCAmount.attr('value', this.creditPayableBalance);
     oilsSelfckCCYear.attr('value', new Date().getFullYear());
     oilsSelfckCCFName.attr('value', this.patron.first_given_name());
     oilsSelfckCCLName.attr('value', this.patron.family_name());
@@ -741,23 +751,20 @@ SelfCheckManager.prototype.sendCCPayment = function() {
         }
     }
 
-    var funds = oilsSelfckCCAmount.attr('value');
 
-    xacts = this.finesData.sort(
-        function(a, b) {
-            if(a.transaction.xact_start() < b.transaction.xact_start()) 
-                return -1;
-            return 1;
+    // find the selected transactions
+    dojo.forEach(
+        dojo.query('[name=selector]', this.finesTbody),
+        function(input) {
+            if(input.checked) {
+                args.payments.push([
+                    input.getAttribute('xact'),
+                    Number(input.getAttribute('balance_owed')).toFixed(2)
+                ]);
+            }
         }
     );
 
-    for(var i in xacts) {
-        var xact = xacts[i].transaction;
-        var paying = Math.min(funds, xact.balance_owed());
-        args.payments.push([xact.id(), paying]);
-        funds -= paying;
-        if(funds <= 0) break;
-    }
 
     var resp = fieldmapper.standardRequest(
         ['open-ils.circ', 'open-ils.circ.money.payment'],
@@ -794,28 +801,72 @@ SelfCheckManager.prototype.drawFinesPage = function() {
     while(this.finesTbody.childNodes[0])
         this.finesTbody.removeChild(this.finesTbody.childNodes[0]);
 
+    // when user clicks on a selector checkbox, update the total owed
+    var updateSelected = function() {
+        var total = 0;
+        dojo.forEach(
+            dojo.query('[name=selector]', this.finesTbody),
+            function(input) {
+                if(input.checked)
+                    total += Number(input.getAttribute('balance_owed'));
+            }
+        );
+
+        total = total.toFixed(2);
+        dojo.byId('oils-selfck-selected-total').innerHTML = 
+            dojo.string.substitute(localeStrings.TOTAL_FINES_SELECTED, [total]);
+    }
+
+    // wire up the batch on/off selector
+    var sel = dojo.byId('oils-selfck-fines-selector');
+    sel.onchange = function() {
+        dojo.forEach(
+            dojo.query('[name=selector]', this.finesTbody),
+            function(input) {
+                input.checked = sel.checked;
+            }
+        );
+    };
+
     var self = this;
     var handler = function(dataList) {
+
         self.finesCount = dataList.length;
         self.finesData = dataList;
+
         for(var i in dataList) {
+
             var data = dataList[i];
             var row = self.finesTemplate.cloneNode(true);
             var type = data.transaction.xact_type();
+
             if(type == 'circulation') {
                 self.byName(row, 'type').innerHTML = type;
                 self.byName(row, 'details').innerHTML = data.record.title();
+
             } else if(type == 'grocery') {
                 self.byName(row, 'type').innerHTML = 'Miscellaneous'; // Go ahead and head off any confusion around "grocery".  TODO i18n
                 self.byName(row, 'details').innerHTML = data.transaction.last_billing_type();
             }
+
             self.byName(row, 'total_owed').innerHTML = data.transaction.total_owed();
             self.byName(row, 'total_paid').innerHTML = data.transaction.total_paid();
             self.byName(row, 'balance').innerHTML = data.transaction.balance_owed();
+
+            // row selector
+            var selector = self.byName(row, 'selector')
+            selector.onchange = updateSelected;
+            selector.setAttribute('xact', data.transaction.id());
+            selector.setAttribute('balance_owed', data.transaction.balance_owed());
+            selector.checked = true;
+
             self.finesTbody.appendChild(row);
         }
+
+        updateSelected();
     }
 
+
     fieldmapper.standardRequest( 
         ['open-ils.actor', 'open-ils.actor.user.transactions.have_balance.fleshed'],
         {   async : true,

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
index 36de24f..0c27047 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
@@ -1,7 +1,10 @@
+<span id='oils-selfck-selected-total'></span>
+<span style='padding-left:5px;'><a class='hidden' href='javascript:void(0);' id='oils-selfck-pay-fines-link'>Pay Fines</a></span>
 <div id='oils-selfck-fines-table-div'>
     <table id='oils-selfck-fines-table' class='oils-selfck-item-table'>
         <thead>
             <tr>
+                <td><input type='checkbox' checked='checked' id='oils-selfck-fines-selector'/></td>
                 <td>Type</td>
                 <td>Details</td>
                 <td>Total Billed</td>
@@ -11,6 +14,7 @@
         </thead>
         <tbody id='oils-selfck-fines-tbody'>
             <tr id='oils-selfck-fines-row'>
+                <td><input type='checkbox' name='selector' checked='checked'/></td>
                 <td name='type'></td>
                 <td name='details'></td>
                 <td name='total_owed'></td>

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
index 1549a4f..23574ab 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
@@ -10,7 +10,6 @@
 <div id='oils-selfck-bottom-div'>
     <div id='oils-selfck-content-div'>
         <div id='oils-selfck-content-header'>
-            <span><a class='hidden' href='javascript:void(0);' id='oils-selfck-pay-fines-link'>Pay Fines</a></span>
             <span><a id='oils-selfck-print-list-link' href='javascript:void(0);'>Print List</a></span>
         </div>
         <div id='oils-selfck-circ-page' class='hidden'>

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/payment.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/payment.tt2
index fef4e02..e34958c 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/payment.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/payment.tt2
@@ -2,10 +2,6 @@
 <table id='oils-selfck-cc-payment-table'>
     <tbody>
         <tr>
-            <td>Amount</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCAmount' required='true'/></td>
-        </tr>
-        <tr>
             <td>Credit Card #</td>
             <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCNumber' required='true'/></td>
         </tr>