[freeside-commits] branch FREESIDE_4_BRANCH updated. a50fae1fa75899724aaa4258405ad3133fbb047b

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  a50fae1fa75899724aaa4258405ad3133fbb047b (commit)
       via  de6b4dea438d18333ee812aa3266461328505a95 (commit)
      from  915c1adc738b5dcd8d8d28d3df6ae22ecf4fd5dc (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 a50fae1fa75899724aaa4258405ad3133fbb047b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jan 4 16:13:05 2019 -0500

    RT# 37817 - Added more invoice sending actions

diff --git a/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm b/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
index f80508a9a..4868f6636 100644
--- a/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
+++ b/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
@@ -22,7 +22,14 @@ sub condition {
   my($self, $cust_bill, %opt) = @_;
 
   ## search actions for invoice send events.
-  my $extra_sql = " AND (action LIKE 'cust_bill_send%' OR action LIKE 'cust_bill_email%')";
+  my @send_actions = (
+    "action LIKE 'cust_bill_send%'",
+    "action LIKE 'cust_bill_email%'",
+    "action LIKE 'cust_bill_print%'",
+    "action LIKE 'cust_bill_fsinc_print%'",
+  );
+  my $actions = join ' OR ', @send_actions;
+  my $extra_sql = " AND ($actions)";
 
   my $event = qsearchs( {
     'table'     => 'cust_event',

commit de6b4dea438d18333ee812aa3266461328505a95
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jan 4 11:41:34 2019 -0500

    RT# 37817 - Updated to set condition to check for invoice sending action

diff --git a/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm b/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
index 882762dfe..f80508a9a 100644
--- a/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
+++ b/FS/FS/part_event/Condition/invoice_has_not_been_sent.pm
@@ -21,15 +21,19 @@ sub eventtable_hashref {
 sub condition {
   my($self, $cust_bill, %opt) = @_;
 
+  ## search actions for invoice send events.
+  my $extra_sql = " AND (action LIKE 'cust_bill_send%' OR action LIKE 'cust_bill_email%')";
+
   my $event = qsearchs( {
     'table'     => 'cust_event',
     'addl_from' => 'LEFT JOIN part_event USING ( eventpart )',
     'hashref'   => {
-    		'tablenum'  => $cust_bill->{Hash}->{invnum},
-    		'eventtable'  => 'cust_bill',
-		'status'    => 'done',
-    	},
+      'tablenum'   => $cust_bill->{Hash}->{invnum},
+      'eventtable' => 'cust_bill',
+      'status'     => 'done',
+    },
     'order_by'  => " LIMIT 1",
+    'extra_sql' => $extra_sql,
   } );
 
   return 0 if $event;

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

Summary of changes:
 .../part_event/Condition/invoice_has_not_been_sent.pm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)