[open-ils-commits] r16860 - trunk/Open-ILS/xul/staff_client/server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-07-06 16:28:59 -0400 (Tue, 06 Jul 2010)
New Revision: 16860

Modified:
   trunk/Open-ILS/xul/staff_client/server/patron/bill2.js
   trunk/Open-ILS/xul/staff_client/server/patron/bills.js
Log:
adjust code for an API change.  Assume success if no ils_event

Modified: trunk/Open-ILS/xul/staff_client/server/patron/bill2.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/bill2.js	2010-07-06 19:30:04 UTC (rev 16859)
+++ trunk/Open-ILS/xul/staff_client/server/patron/bill2.js	2010-07-06 20:28:59 UTC (rev 16860)
@@ -837,7 +837,6 @@
             note : payment_blob.note
         }
         var robj = g.network.simple_request( 'BILL_PAY', [ ses(), payment_blob ]);
-        if (robj == 1) { return true; } 
         if (typeof robj.ilsevent != 'undefined') {
             switch(Number(robj.ilsevent)) {
                 case 0 /* SUCCESS */ : return true; break;
@@ -845,6 +844,7 @@
                 default: throw(robj); break;
             }
         }
+        return true;
     } catch(E) {
         g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.pay.payment_failed'),E);
         return false;

Modified: trunk/Open-ILS/xul/staff_client/server/patron/bills.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/bills.js	2010-07-06 19:30:04 UTC (rev 16859)
+++ trunk/Open-ILS/xul/staff_client/server/patron/bills.js	2010-07-06 20:28:59 UTC (rev 16860)
@@ -574,7 +574,6 @@
                 api.BILL_PAY.method,
                 [ ses(), payment_blob ]
             );
-            if (robj == 1) { return true; } 
             if (typeof robj.ilsevent != 'undefined') {
                 switch(Number(robj.ilsevent)) {
                     case 0 /* SUCCESS */ : return true; break;
@@ -582,6 +581,7 @@
                     default: throw(robj); break;
                 }
             }
+            return true;
         } catch(E) {
             obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.pay.payment_failed'),E);
             return false;