Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / cust_pkg / Import.pm

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index e113d17..6c8703c 100644 (file)
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -2,9 +2,7 @@ package FS::cust_pkg::Import;
 
 use strict;
 use vars qw( $DEBUG ); #$conf );
-use Storable qw(thaw);
 use Data::Dumper;
-use MIME::Base64;
 use FS::Misc::DateTime qw( parse_datetime );
 use FS::Record qw( qsearchs );
 use FS::cust_pkg;
@@ -60,8 +58,7 @@ Load a batch import as a queued JSRPC job
 
 sub process_batch_import {
   my $job = shift;
-
-  my $param = thaw(decode_base64(shift));
+  my $param = shift;
   warn Dumper($param) if $DEBUG;
   
   my $files = $param->{'uploaded_files'}
@@ -106,6 +103,7 @@ my %formatfields = (
   'svc_acct'     => [qw( username _password domsvc )],
   'svc_phone'    => [qw( countrycode phonenum sip_password pin )],
   'svc_external' => [qw( id title )],
+  'location'     => [qw( address1 address2 city state zip country )],
 );
 
 sub _formatfields {
@@ -115,11 +113,31 @@ sub _formatfields {
 my %import_options = (
   'table'         => 'cust_pkg',
 
+  'preinsert_callback'  => sub {
+    my($record, $param) = @_;
+    my @location_params = grep /^location\./, keys %$param;
+    if (@location_params) {
+      my $cust_location = FS::cust_location->new({
+          'custnum' => $record->custnum,
+      });
+      foreach my $p (@location_params) {
+        $p =~ /^location.(\w+)$/;
+        $cust_location->set($1, $param->{$p});
+      }
+
+warn Dumper $cust_location; # XXX
+      my $error = $cust_location->find_or_insert; # this avoids duplicates
+      return "error creating location: $error" if $error;
+      $record->set('locationnum', $cust_location->locationnum);
+    }
+    '';
+  },
+
   'postinsert_callback' => sub {
     my( $record, $param ) = @_;
 
     my $formatfields = _formatfields;
-    foreach my $svc_x ( grep { $_ ne 'default' } keys %$formatfields ) {
+    foreach my $svc_x ( grep /^svc/, keys %$formatfields ) {
 
       my $ff = $formatfields->{$svc_x};
 
@@ -138,14 +156,14 @@ my %import_options = (
                                                  'domain'  => $domain, };
           unless ( $svc_domain->svcnum ) {
             my $error = $svc_domain->insert;
-            return $error if $error;
+            return "error auto-inserting domain: $error" if $error;
           }
           $svc->username($username);
           $svc->domsvc($svc_domain->svcnum);
         }
 
         my $error = $svc->insert;
-        return $error if $error;
+        return "error inserting service: $error" if $error;
       }
 
     }
@@ -170,8 +188,9 @@ sub batch_import {
   my $format = delete $opt->{'format'};
   my @fields = ();
 
-  if ( $format =~ /^(.*)-agent_custid$/ ) {
+  if ( $format =~ /^(.*)-agent_custid(-agent_pkgid)?$/ ) {
     $format = $1;
+    my $agent_pkgid = $2;
     @fields = (
       sub {
         my( $self, $value ) = @_; # $conf, $param
@@ -182,6 +201,7 @@ sub batch_import {
         $self->custnum($cust_main->custnum) if $cust_main;
       },
     );
+    push @fields, 'agent_pkgid' if $agent_pkgid;
   } else {
     @fields = ( 'custnum' );
   }