[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 36f85ba5d876838e08f38101019f1bbbe45195d4

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  36f85ba5d876838e08f38101019f1bbbe45195d4 (commit)
      from  002aab09df1c7c0dbe0095c8715ccb4458dd76e7 (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 36f85ba5d876838e08f38101019f1bbbe45195d4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 19 13:54:11 2013 -0700

    add "Only count paid bills" option to "Run only once for each time the package has been billed" condition, for commissions, RT#21040

diff --git a/FS/FS/part_event/Condition/once_perinv.pm b/FS/FS/part_event/Condition/once_perinv.pm
index f85a056..1ee53b8 100644
--- a/FS/FS/part_event/Condition/once_perinv.pm
+++ b/FS/FS/part_event/Condition/once_perinv.pm
@@ -12,6 +12,15 @@ sub description { "Run only once for each time the package has been billed"; }
 # Run the event, at most, a number of times equal to the number of 
 # distinct invoices that contain line items from this package.
 
+sub option_fields {
+  (
+    'paid' => { 'label' => 'Only count paid bills',
+                'type'  => 'checkbox',
+                'value' => 'Y',
+              },
+  )
+}
+
 sub eventtable_hashref {
     { 'cust_main' => 0,
       'cust_bill' => 0,
@@ -22,9 +31,15 @@ sub eventtable_hashref {
 sub condition {
   my($self, $cust_pkg, %opt) = @_;
 
-  my %invnum;
-  $invnum{$_->invnum} = 1 
-    foreach ( qsearch('cust_bill_pkg', { 'pkgnum' => $cust_pkg->pkgnum }) );
+  my @cust_bill_pkg = qsearch('cust_bill_pkg', { pkgnum=>$cust_pkg->pkgnum });
+
+  @cust_bill_pkg = grep { ($_->owed_setup + $_->owed_recur) == 0 }
+                     @cust_bill_pkg
+    if $self->option('paid');
+
+  my %invnum = ();
+  $invnum{$_->invnum} = 1 foreach @cust_bill_pkg;
+
   my @events = qsearch( {
       'table'     => 'cust_event', 
       'hashref'   => { 'eventpart' => $self->eventpart,
@@ -40,6 +55,9 @@ sub condition {
 sub condition_sql {
   my( $self, $table ) = @_;
 
+  #paid flag not yet implemented here, but that's okay, a partial optimization
+  # is better than none
+
   "( 
     ( SELECT COUNT(distinct(invnum)) 
       FROM cust_bill_pkg

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

Summary of changes:
 FS/FS/part_event/Condition/once_perinv.pm |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)