X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_event%2FAction%2Fcust_bill_send_agent.pm;fp=FS%2FFS%2Fpart_event%2FAction%2Fcust_bill_send_agent.pm;h=bbb757b596bef7c74aa3b5da0c2b96a2317b1695;hb=eb3bd392a89b8b666dc512951e78913c05b98810;hp=670a32c5b7ff63a87535ad1ad4c994d7ea563c56;hpb=e3012c0751dad6710ea35b6d074b551bffdad09b;p=freeside.git

diff --git a/FS/FS/part_event/Action/cust_bill_send_agent.pm b/FS/FS/part_event/Action/cust_bill_send_agent.pm
index 670a32c5b..bbb757b59 100644
--- a/FS/FS/part_event/Action/cust_bill_send_agent.pm
+++ b/FS/FS/part_event/Action/cust_bill_send_agent.pm
@@ -7,6 +7,9 @@ sub description {
   'Send invoice (email/print/fax) with alternate template, for specific agents';
 }
 
+# this event is just cust_bill_send_alternate + an implicit (and inefficient)
+# 'agent' condition
+
 sub eventtable_hashref {
   { 'cust_bill' => 1 };
 }
@@ -17,6 +20,9 @@ sub option_fields {
                               type     => 'select-agent',
                               multiple => 1
                             },
+    'modenum' => {  label => 'Invoice mode',
+                    type  => 'select-invoice_mode',
+                 },
     'agent_templatename' => { label    => 'Template',
                               type     => 'select-invoice_template',
                             },
@@ -32,10 +38,15 @@ sub do_action {
   #my $cust_main = $self->cust_main($cust_bill);
   my $cust_main = $cust_bill->cust_main;
 
+  my %agentnums = map { $_=>1 } split(/\s*,\s*/, $self->option('agentnum'));
+  if (keys(%agentnums) and !exists($agentnums{$cust_main->agentnum})) {
+    return;
+  }
+
+  $cust_bill->set('mode' => $self->option('modenum'));
   $cust_bill->send(
-    $self->option('agent_templatename'),
-    [ split(/\s*,\s*/, $self->option('agentnum') ) ],
-    $self->option('agent_invoice_from'),
+    'template'      => $self->option('agent_templatename'),
+    'invoice_from'  => $self->option('agent_invoice_from'),
   );
 }