X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg%2FImport.pm;h=2b183232942d9ca294fc3829411c8aa07ccf0b75;hp=694d8147f0864a6c56cbdc2ac0e7de5b770e064a;hb=7c4c3bd3e3e2d6a820c77bec346f9d378e2761dc;hpb=a172aa2d549f2c62978fa1f6b6851a68ae0f2a4e

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index 694d8147f..2b1832329 100644
--- 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'}
@@ -103,10 +100,13 @@ sub process_batch_import {
 
 my %formatfields = (
   'default'      => [],
+  'all_dates'    => [],
   'svc_acct'     => [qw( username _password domsvc )],
+  'svc_broadband' => [qw( ip_addr description routernum blocknum sectornum speed_up speed_down )],
   'svc_phone'    => [qw( countrycode phonenum sip_password pin )],
   'svc_external' => [qw( id title )],
   'location'     => [qw( address1 address2 city state zip country )],
+  'quan_price'   => [qw( quantity setup_fee recur_fee invoice_details )],
 );
 
 sub _formatfields {
@@ -118,7 +118,9 @@ my %import_options = (
 
   'preinsert_callback'  => sub {
     my($record, $param) = @_;
-    my @location_params = grep /^location\./, keys %$param;
+
+    my @location_params = grep { /^location\./ && length($param->{$_}) }
+                            keys %$param;
     if (@location_params) {
       my $cust_location = FS::cust_location->new({
           'custnum' => $record->custnum,
@@ -128,23 +130,77 @@ my %import_options = (
         $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);
     }
+
+    $record->quantity( $param->{'quan_price.quantity'} )
+      if $param->{'quan_price.quantity'} > 0;
+    
+    my $s = $param->{'quan_price.setup_fee'};
+    my $r = $param->{'quan_price.recur_fee'};
+    my $part_pkg = $record->part_pkg;
+    if (    ( length($s) && $s != $part_pkg->option('setup_fee') )
+         or ( length($r) && $r != $part_pkg->option('recur_fee') )
+       )
+    {
+
+      local($FS::part_pkg::skip_pkg_svc_hack) = 1;
+
+      my $custom_part_pkg = $part_pkg->clone;
+      $custom_part_pkg->disabled('Y');
+      my %options = $part_pkg->options;
+      $options{'setup_fee'} = $s if length($s);
+      $options{'recur_fee'} = $r if length($r);
+      my $error = $custom_part_pkg->insert( options=>\%options );
+      return "error customizing package: $error" if $error;
+
+      #not ->pkg_svc, we want to ignore links and clone the actual package def
+      foreach my $pkg_svc ( $part_pkg->_pkg_svc ) {
+        my $c_pkg_svc = new FS::pkg_svc { $pkg_svc->hash };
+        $c_pkg_svc->pkgsvcnum('');
+        $c_pkg_svc->pkgpart( $custom_part_pkg->pkgpart );
+        my $error = $c_pkg_svc->insert;
+        return "error customizing package: $error" if $error;
+      }
+
+      $record->pkgpart( $custom_part_pkg->pkgpart );
+    }
+
+
     '';
   },
 
   'postinsert_callback' => sub {
     my( $record, $param ) = @_;
 
+    if ( $param->{'quan_price.invoice_details'} ) {
+
+      my $weight = 0;
+      foreach my $detail (split(/\|/, $param->{'quan_price.invoice_details'})) {
+
+        my $cust_pkg_detail = new FS::cust_pkg_detail {
+          'pkgnum'     => $record->pkgnum,
+          'detail'     => $detail,
+          'detailtype' => 'I',
+          'weight'     => $weight++,
+        };
+
+        my $error = $cust_pkg_detail->insert;
+        return "error inserting invoice detail: $error" if $error;
+
+      }
+
+    }
+
     my $formatfields = _formatfields;
     foreach my $svc_x ( grep /^svc/, keys %$formatfields ) {
 
       my $ff = $formatfields->{$svc_x};
 
       if ( grep $param->{"$svc_x.$_"}, @$ff ) {
+
         my $svc = "FS::$svc_x"->new( {
           'pkgnum'  => $record->pkgnum,
           'svcpart' => $record->part_pkg->svcpart($svc_x),
@@ -209,192 +265,102 @@ sub batch_import {
     @fields = ( 'custnum' );
   }
 
-  push @fields, ( 'pkgpart', 'discountnum' );
-
-  foreach my $field ( 
-    qw( start_date setup bill last_bill susp adjourn cancel expire )
-  ) {
-    push @fields, sub {
-      my( $self, $value ) = @_; # $conf, $param
-      #->$field has undesirable effects
-      $self->set($field, parse_datetime($value) ); #$field closure
-    };
-  }
-
-  my $formatfields = _formatfields();
-
-  die "unknown format $format" unless $formatfields->{$format};
-
-  foreach my $field ( @{ $formatfields->{$format} } ) {
-
-    push @fields, sub {
-      my( $self, $value, $conf, $param ) = @_;
-      $param->{"$format.$field"} = $value;
-    };
-
+  if ( $format =~ /^(.*)-locationnum$/ ) {
+    $format = $1;
+    push @fields, 'locationnum';
   }
 
-  $opt->{'fields'} = \@fields;
-
-  FS::Record::batch_import( $opt );
-
-}
-
-=for comment
-
-    my $billtime = time;
-    my %cust_pkg = ( pkgpart => $pkgpart );
-    my %svc_x = ();
-    foreach my $field ( @fields ) {
+  if ( $format =~ /^bulk_(.*)$/ ) {
 
-      if ( $field =~ /^cust_pkg\.(pkgpart|setup|bill|susp|adjourn|expire|cancel)$/ ) {
-
-        #$cust_pkg{$1} = parse_datetime( shift @$columns );
-        if ( $1 eq 'pkgpart' ) {
-          $cust_pkg{$1} = shift @columns;
-        } elsif ( $1 eq 'setup' ) {
-          $billtime = parse_datetime(shift @columns);
-        } else {
-          $cust_pkg{$1} = parse_datetime( shift @columns );
-        } 
+    $format = $1;
 
-      } elsif ( $field =~ /^svc_acct\.(username|_password)$/ ) {
+    $opt->{'postinsert_callback'} = sub {
+      my( $record, $param ) = @_;
 
-        $svc_x{$1} = shift @columns;
+      my $formatfields = _formatfields;
+      foreach my $svc_x ( grep /^svc/, keys %$formatfields ) {
 
-      } elsif ( $field =~ /^svc_external\.(id|title)$/ ) {
+        my $ff = $formatfields->{$svc_x};
 
-        $svc_x{$1} = shift @columns;
+        if ( grep $param->{"$svc_x.$_"}, @$ff ) {
 
-      } elsif ( $field =~ /^svc_phone\.(countrycode|phonenum|sip_password|pin)$/ ) {
-        $svc_x{$1} = shift @columns;
-       
-      } else {
+          $param->{'svc_phone.phonenum'} =~ /^\s*(\d+)\s*\-\s*(\d+)\s*$/
+            or return 'Enter a phone number range, with dash as the separator';
+          my($start, $end) = ($1, $2);
+          if ( length($end) < length($start) ) {
+            $end = substr($start, 0, length($start) - length($end) ). $end;
+          }
 
-        #refnum interception
-        if ( $field eq 'refnum' && $columns[0] !~ /^\s*(\d+)\s*$/ ) {
+          foreach my $phonenum ( "$start" .. "$end" ) {
 
-          my $referral = $columns[0];
-          my %hash = ( 'referral' => $referral,
-                       'agentnum' => $agentnum,
-                       'disabled' => '',
-                     );
+            my $svc = "FS::$svc_x"->new( {
+              'pkgnum'  => $record->pkgnum,
+              'svcpart' => $record->part_pkg->svcpart($svc_x),
+              map { $_ => $param->{"$svc_x.$_"} } @$ff
+            } );
 
-          my $part_referral = qsearchs('part_referral', \%hash )
-                              || new FS::part_referral \%hash;
+            $svc->phonenum($phonenum);
+            #$svc->set_default_and_fixed;
+            my $error = $svc->insert;
+            return "error inserting service: $error" if $error;
 
-          unless ( $part_referral->refnum ) {
-            my $error = $part_referral->insert;
-            if ( $error ) {
-              $dbh->rollback if $oldAutoCommit;
-              return "can't auto-insert advertising source: $referral: $error";
-            }
           }
 
-          $columns[0] = $part_referral->refnum;
         }
 
-        my $value = shift @columns;
-        $cust_main{$field} = $value if length($value);
-      }
-    }
-
-    $cust_main{'payby'} = 'CARD'
-      if defined $cust_main{'payinfo'}
-      && length  $cust_main{'payinfo'};
-
-    my $invoicing_list = $cust_main{'invoicing_list'}
-                           ? [ delete $cust_main{'invoicing_list'} ]
-                           : [];
-
-    my $cust_main = new FS::cust_main ( \%cust_main );
-
-    use Tie::RefHash;
-    tie my %hash, 'Tie::RefHash'; #this part is important
-
-    if ( $cust_pkg{'pkgpart'} ) {
-      my $cust_pkg = new FS::cust_pkg ( \%cust_pkg );
-
-      my @svc_x = ();
-      my $svcdb = '';
-      if ( $svc_x{'username'} ) {
-        $svcdb = 'svc_acct';
-      } elsif ( $svc_x{'id'} || $svc_x{'title'} ) {
-        $svcdb = 'svc_external';
       }
 
-      my $svc_phone = '';
-      if ( $svc_x{'countrycode'} || $svc_x{'phonenum'} ) {
-        $svc_phone = FS::svc_phone->new( {
-          map { $_ => delete($svc_x{$_}) }
-              qw( countrycode phonenum sip_password pin)
-        } );
-      }
+      return ''; #no error
 
-      if ( $svcdb || $svc_phone ) {
-        my $part_pkg = $cust_pkg->part_pkg;
-	unless ( $part_pkg ) {
-	  $dbh->rollback if $oldAutoCommit;
-	  return "unknown pkgpart: ". $cust_pkg{'pkgpart'};
-	} 
-        if ( $svcdb ) {
-          $svc_x{svcpart} = $part_pkg->svcpart_unique_svcdb( $svcdb );
-          my $class = "FS::$svcdb";
-          push @svc_x, $class->new( \%svc_x );
-        }
-        if ( $svc_phone ) {
-          $svc_phone->svcpart( $part_pkg->svcpart_unique_svcdb('svc_phone') );
-          push @svc_x, $svc_phone;
-        }
-      }
+    };
 
-      $hash{$cust_pkg} = \@svc_x;
-    }
+  }
 
-    my $error = $cust_main->insert( \%hash, $invoicing_list );
+  push @fields, ( 'pkgpart', 'discountnum' );
 
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "can't insert customer". ( $line ? " for $line" : '' ). ": $error";
-    }
+  my @date_fields = ();
+  if ( $format =~ /all_dates/ ) {
+    @date_fields = qw(
+      order_date
+      start_date setup bill last_bill susp adjourn
+      resume
+      cancel expire
+      contract_end dundate
+    );
+  } else {
+    @date_fields = qw(
+      start_date setup bill last_bill susp adjourn
+      cancel expire
+    );
+  }
 
-    if ( $format eq 'simple' ) {
+  foreach my $field (@date_fields) { 
+    push @fields, sub {
+      my( $self, $value ) = @_; # $conf, $param
+      #->$field has undesirable effects
+      $self->set($field, parse_datetime($value) ); #$field closure
+    };
+  }
 
-      #false laziness w/bill.cgi
-      $error = $cust_main->bill( 'time' => $billtime );
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "can't bill customer for $line: $error";
-      }
-  
-      $error = $cust_main->apply_payments_and_credits;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "can't bill customer for $line: $error";
-      }
+  my @formats = split /-/, $format;
+  foreach my $f (@formats){
 
-      $error = $cust_main->collect();
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "can't collect customer for $line: $error";
-      }
+    my $formatfields = _formatfields();
+    die "unknown format $format" unless $formatfields->{$f};
 
-    }
+    foreach my $field ( @{ $formatfields->{$f} } ) {
 
-    $row++;
+      push @fields, sub {
+        my( $self, $value, $conf, $param ) = @_;
+        $param->{"$f.$field"} = $value;
+      };
 
-    if ( $job && time - $min_sec > $last ) { #progress bar
-      $job->update_statustext( int(100 * $row / $count) );
-      $last = time;
     }
-
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;;
-
-  return "Empty file!" unless $row;
+  $opt->{'fields'} = \@fields;
 
-  ''; #no error
+  FS::Record::batch_import( $opt );
 
 }