first last company daytime night fax mobile
);
# locale
-# payby payinfo payname paystart_month paystart_year payissue payip
-# ss paytype paystate stateid stateid_state
+# ss stateid stateid_state
@location_editable_fields = qw(
address1 address2 city county state zip country
);
#same for refnum like signup_server-default_refnum?
my $cust_main = new FS::cust_main ( { # $class->new( {
- 'payby' => 'BILL',
'tagnum' => [ FS::part_tag->default_tags ],
map { $_ => $opt{$_} } qw(
agentnum salesnum refnum agent_custid referral_custnum
last first company
daytime night fax mobile
- payby payinfo paydate paycvv payname
),
} );
my $conf = new FS::Conf;
-
my $custnum = $opt{'custnum'}
or return { 'error' => "no customer record" };
agentnum salesnum refnum agent_custid referral_custnum
last first company
daytime night fax mobile
- payby payinfo paydate paycvv payname
),
- my @invoicing_list = $opt{'invoicing_list'}
- ? split( /\s*\,\s*/, $opt{'invoicing_list'} )
- : $cust_main->invoicing_list;
- push @invoicing_list, 'POST' if $opt{'postal_invoicing'};
-
+ my @invoicing_list;
+ if ( exists $opt{'invoicing_list'} || exists $opt{'postal_invoicing'} ) {
+ @invoicing_list = split( /\s*\,\s*/, $opt{'invoicing_list'} );
+ push @invoicing_list, 'POST' if $opt{'postal_invoicing'};
+ } else {
+ @invoicing_list = $cust_main->invoicing_list;
+ }
+
if ( exists( $opt{'address1'} ) ) {
my $bill_location = FS::cust_location->new({
map { $_ => $opt{$_} } @location_editable_fields
$new->set('bill_location' => $bill_location);
}
- if ( exists($opt{'ship_address1'}) ) {
+ if ( exists($opt{'ship_address1'}) && length($opt{"ship_address1"}) > 0 ) {
my $ship_location = FS::cust_location->new({
map { $_ => $opt{"ship_$_"} } @location_editable_fields
});
my $error = $ship_location->find_or_insert;
die $error if $error;
- }
-
- if ( !grep { length($opt{"ship_$_"}) } @location_editable_fields ) {
- # Selfservice unfortunately tries to indicate "same as billing
- # address" by sending all fields empty. Did this ever work?
-
- my $ship_location = $cust_main->bill_location;
- $new->set('ship_location' => $ship_location);
+ $new->set('ship_location' => $ship_location);
+ } elsif (exists($opt{'ship_address1'} ) && !grep { length($opt{"ship_$_"}) } @location_editable_fields ) {
+ my $ship_location = $new->bill_location;
+ $new->set('ship_location' => $ship_location);
}
+
my $error = $new->replace( $cust_main, \@invoicing_list );
return { 'error' => $error } if $error;