# 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
},
'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
$part_pkg->$_('');
($_ => $v);
}
- qw (setup recur)
+ qw (setup_fee recur_fee)
};
my $error =
$part_pkg->insert(options=>$options);
$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;
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;
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 = {};
$pkg->$_('');
($_ => $v);
}
- qw (setup recur)
+ qw (setup_fee recur_fee)
};
my $error =
$pkg->insert(options=>$options);
$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}};
},
},
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 =