[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 7ac26f9cdf376f2c7034e56851d160690a8bd3ec

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  7ac26f9cdf376f2c7034e56851d160690a8bd3ec (commit)
      from  93c91ea752f539198554da5535c2eda02680eb9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ac26f9cdf376f2c7034e56851d160690a8bd3ec
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 4 05:02:43 2012 -0700

    retry cards when change for batching, too< RT#17858

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index cc53971..e9cac8d 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1512,17 +1512,23 @@ sub retry_realtime {
     cust_bill_batch
   );
 
-  my $is_realtime_event = ' ( '. join(' OR ', map "part_event.action = '$_'",
-                                                  @realtime_events
-                                     ).
-                          ' ) ';
+  my $is_realtime_event =
+    ' part_event.action IN ( '.
+        join(',', map "'$_'", @realtime_events ).
+    ' ) ';
+
+  my $batch_or_statustext =
+    "( part_event.action = 'cust_bill_batch'
+       OR ( statustext IS NOT NULL AND statustext != '' )
+     )";
+
 
   my @cust_event = qsearch({
     'table'     => 'cust_event',
     'select'    => 'cust_event.*',
     'addl_from' => "LEFT JOIN part_event USING ( eventpart ) $join",
     'hashref'   => { 'status' => 'done' },
-    'extra_sql' => " AND statustext IS NOT NULL AND statustext != '' ".
+    'extra_sql' => " AND $batch_or_statustext ".
                    " AND $mine AND $is_realtime_event AND $agent_virt $order" # LIMIT 1"
   });
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Billing.pm |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)