X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fimport-optigold.pl;h=d32a2a129b12d7164b53c08a4dcb32a1fc68ba54;hp=96d81b4fa1d10d0d8dc515c2c52b3cae05831c9b;hb=949a80c148a8bbeeeec54c5a0be5d73b292423a5;hpb=781e704eb702673bfcad0690cc94032e4279d7e6

diff --git a/bin/import-optigold.pl b/bin/import-optigold.pl
index 96d81b4fa..d32a2a129 100755
--- a/bin/import-optigold.pl
+++ b/bin/import-optigold.pl
@@ -262,6 +262,17 @@ sub pkg_freq {
 #   int(eval "$href->{'month_credit'} + 0");
 }
 
+sub account_id {
+  my $href = shift;
+  if ($href->{'slave_account_id'} =~ /^\s*(\S[\S ]*?)\s*$/) {
+    "slave:$1";
+  }else{
+    my $l = $href->{cbilling_cycle_login};
+    $l =~ /^\s*(\S[\S ]*?)\s*$/ && ($l = $1);
+    $l;
+  }
+}
+
 sub b_or {
   my ( $field, $hash ) = ( shift, shift );
   $field = 'billing_'. $field
@@ -382,7 +393,7 @@ part_pkg => { 'stable'  => 'product',
                                     },
                   'comment'  => 'product_id',
                   'freq'     => sub { pkg_freq(shift) },
-                  'recur'    => sub { my $href = shift;
+                  'recur_fee'=> sub { my $href = shift;
                                       my $price = ( pkg_freq($href)
                                         ? $href->{'unit_price'}
                                         : 0
@@ -437,7 +448,7 @@ part_pkg => { 'stable'  => 'product',
                                              $part_pkg->$_('');
                                              ($_ => $v);
                                            }
-                                       qw (setup recur)
+                                       qw (setup_fee recur_fee)
                                      };
                                    my $error =
                                      $part_pkg->insert(options=>$options);
@@ -559,6 +570,20 @@ cust_main => { 'stable'  => 'cust',
                                   $row->{'login'} =~ /^\s*(\S[\S ]*?)\s*$/
                                     && ($login = $1);
 
+                                  my ($first, $last, $company) =
+                                    ('', '', '');
+                                  $cust_main->first =~ /^\s*(\S[\S ]*?)\s*$/
+                                    && ($first = $1);
+                                  $cust_main->last =~ /^\s*(\S[\S ]*?)\s*$/
+                                    && ($last = $1);
+                                  $cust_main->company =~ /^\s*(\S[\S ]*?)\s*$/
+                                    && ($company = $1);
+
+                                  unless ($first || $last || $company) {
+                                    warn "bogus entry: ". $row->{'login'};
+                                    return 1;
+                                  }
+
                                   my $id = $master_account
                                            ? 'slave:'. $customer_id
                                            : $login;
@@ -567,6 +592,7 @@ cust_main => { 'stable'  => 'cust',
 
                                   my $cancelled = 0;
                                   if ( $status ne 'Current'
+                                    && $status ne 'current'
                                     && $status ne 'On Hold' )
                                   {
                                     $cancelled = 1;
@@ -738,7 +764,7 @@ cust_pkg  => { 'stable'  => 'billcycle',
 
                                             if ($pkg && ($pkg->freq + 0)) {
                                               my $recur = 0;
-                                              $pkg->recur =~ /\s*(\S[\S ]*?)\s*$/ && ($recur = $1);
+                                              $pkg->recur_fee =~ /\s*(\S[\S ]*?)\s*$/ && ($recur = $1);
                                               $recur = eval "$recur + 0";
                                               $pkg = ''
                                                 unless $recur == $price;
@@ -766,13 +792,13 @@ cust_pkg  => { 'stable'  => 'billcycle',
                                             my $recur = sprintf("%.2f", ($month ? $price : 0));
                                             for (@pkgs) {
                                               my %options = $_->options;
-                                              if ($options{recur} eq $recur) {
+                                              if ($options{recur_fee} eq $recur) {
                                                 $pkg = $_;
                                                 last;
                                               }
                                             }
 
-                                            $pkghref->{recur} = $recur
+                                            $pkghref->{recur_fee} = $recur
                                               unless $pkg;
 
                                             my $pkg_svc = {};
@@ -795,7 +821,7 @@ cust_pkg  => { 'stable'  => 'billcycle',
                                                         $pkg->$_('');
                                                         ($_ => $v);
                                                       }
-                                                  qw (setup recur)
+                                                  qw (setup_fee recur_fee)
                                                 };
                                               my $error =
                                                 $pkg->insert(options=>$options);
@@ -810,32 +836,16 @@ cust_pkg  => { 'stable'  => 'billcycle',
                                           $pkg ? $pkg->pkgpart : '';
                                         },
                    'setup'       => sub { str2time(shift->{creation_date}) },
-                   'bill'        => sub { my $href = shift;
-                                          my $id = $href->{'slave_account_id'}
-                                            ? 'slave:'. $href->{'slave_account_id'}
-                                            : $href->{'cbilling_cycle_login'};
-                                          $bill{$id};
+                   'bill'        => sub { $bill{account_id(shift)}
                                           #$bill{$href->{cbilling_cycle_login}};
                                         },
-                   'susp'        => sub { my $href = shift;
-                                          my $id = $href->{'slave_account_id'}
-                                            ? 'slave:'. $href->{'slave_account_id'}
-                                            : $href->{'cbilling_cycle_login'};
-                                          $susp{$id};
+                   'susp'        => sub { $susp{account_id(shift)}
                                           #$susp{$href->{cbilling_cycle_login}};
                                         },
-                   'adjo'        => sub { my $href = shift;
-                                          my $id = $href->{'slave_account_id'}
-                                            ? 'slave:'. $href->{'slave_account_id'}
-                                            : $href->{'cbilling_cycle_login'};
-                                          $adjo{$id};
+                   'adjo'        => sub { $adjo{account_id(shift)}
                                           #$adjo{$href->{cbilling_cycle_login}};
                                         },
-                   'cancel'      => sub { my $href = shift;
-                                          my $id = $href->{'slave_account_id'}
-                                            ? 'slave:'. $href->{'slave_account_id'}
-                                            : $href->{'cbilling_cycle_login'};
-                                          $cancel{$id};
+                   'cancel'      => sub { $cancel{account_id(shift)}
                                           #$cancel{$href->{cbilling_cycle_login}};
                                         },
                  },
@@ -857,13 +867,7 @@ cust_pkg  => { 'stable'  => 'billcycle',
                                  my $id = $href->{'billing_cycle_item_id'};
                                  $id =~ /^\s*(\S[\S ]*?)\s*$/ && ($id = $1);
                                  $cust_pkg_map{$id} = $object->pkgnum;
-                                 if ($href->{'slave_account_id'} =~ /^\s*(\S[\S ]*?)\s*$/) {
-                                   "slave:$1";
-                                 }else{
-                                   my $l = $href->{cbilling_cycle_login};
-                                   $l =~ /^\s*(\S[\S ]*?)\s*$/ && ($l = $1);
-                                   $l;
-                                 }
+                                 account_id($href);
                                },
                'wrapup'   => sub { for my $id (keys %{$object_map{'cust_pkg'}}){
                                      my $cust_svc =