This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / FS / FS / part_export / http.pm

diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
index 0be2a0f..e5e5a5c 100644 (file)
--- a/FS/FS/part_export/http.pm
+++ b/FS/FS/part_export/http.pm
@@ -1,12 +1,10 @@
 package FS::part_export::http;
 
-use vars qw(@ISA %info);
+use base qw( FS::part_export );
+use vars qw( %options %info );
 use Tie::IxHash;
-use FS::part_export;
 
-@ISA = qw(FS::part_export);
-
-tie my %options, 'Tie::IxHash',
+tie %options, 'Tie::IxHash',
   'method' => { label   =>'Method',
                 type    =>'select',
                 #options =>[qw(POST GET)],
@@ -18,7 +16,7 @@ tie my %options, 'Tie::IxHash',
     type    => 'textarea',
     default => join("\n",
       'DomainName $svc_x->domain',
-      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
+      'Email ( grep { $_ !~ /^(POST|FAX)$/ } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
       'test 1',
       'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
     ),
@@ -66,6 +64,10 @@ sub _export_command {
 
   return unless $self->option("${action}_data");
 
+  my $cust_main = $svc_x->table eq 'cust_main'
+                    ? $svc_x
+                    : $svc_x->cust_svc->cust_pkg->cust_main;
+
   $self->http_queue( $svc_x->svcnum,
     $self->option('method'),
     $self->option('url'),
@@ -85,12 +87,18 @@ sub _export_replace {
 
   return unless $self->option('replace_data');
 
-  $self->http_queue( $svc_x->svcnum,
+  my $new_cust_main = $new->table eq 'cust_main'
+                        ? $new
+                        : $new->cust_svc->cust_pkg->cust_main;
+  my $cust_main = $new_cust_main; #so folks can use $new_cust_main or $cust_main
+
+  $self->http_queue( $new->svcnum,
     $self->option('method'),
     $self->option('url'),
     map {
       /^\s*(\S+)\s+(.*)$/ or /()()/;
       my( $field, $value_expression ) = ( $1, $2 );
+      my $value = eval $value_expression;
       die $@ if $@;
       ( $field, $value );
     } split(/\n/, $self->option('replace_data') )
@@ -100,10 +108,8 @@ sub _export_replace {
 
 sub http_queue {
   my($self, $svcnum) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::http::http",
-  };
+  my $queue = new FS::queue { 'job' => "FS::part_export::http::http" };
+  $queue->svcnum($svcnum) if $svcnum;
   $queue->insert( @_ );
 }