id => 'discount_term',
options => [ '', @discount_term ],
labels => { '' => mt('1 month'),
- map { $_ => mt('[_1] months', $_) } @discount_term },
+ map { $_ => mt('[_1] months', sprintf('%.0f', $_)) }
+ @discount_term
+ },
curr_value => '',
onchange => $amount_id ? 'change_discount_term(this)' : '',
&>
} else {
push @confirm, '';
}
- } elsif ( $cust_pkg->get('setup') ) {
+ } elsif ( $hash{'setup'} and !$cust_pkg->get('setup') ) {
my $text = 'Add a setup date of [_1]';
$text .= ' to this and all its supplemental packages' if @supp_pkgs;
$text .= '.';
# Bill date change
if ( $hash{'bill'} != $cust_pkg->get('bill') ) {
my $bill = time2str($date_format, $hash{'bill'});
- $bill = 'the current day' if !$hash{'bill'}; # or 'the end of today'?...
+ $bill = 'today' if !$hash{'bill'}; # or 'the end of today'?...
my $name = 'next bill date';
$name = 'end of the prepaid period' if $part_pkg->is_prepaid;
push @changes, mt('Set the [_1] to [_2].', $name, $bill);
push @confirm,
mt('The customer will be charged for the interval from [_1] until now.',
$bill);
+ } elsif ( !$hash{'bill'} and ($hash{'last_bill'} or $hash{'setup'}) ) {
+ my $last_bill =
+ time2str($date_format, $hash{'last_bill'} || $hash{'setup'});
+ push @confirm,
+ mt('The customer will be charged for the interval from [_1] until now.',
+ $last_bill);
} else {
push @confirm, '';
}
$new->set( 'paycvv' => '');
}
- $new->set( $_ => $cgi->param($_) ) foreach @{$payby2fields{$payby}};
+ if ( $payby eq 'CARD' ) {
+ my $bill_location = FS::cust_location->new;
+ $bill_location->set( $_ => $cgi->param($_) )
+ foreach @{$payby2fields{$payby}};
+ $new->set('bill_location' => $bill_location);
+ # will do nothing if the fields are all unchanged
+ } else {
+ $new->set( $_ => $cgi->param($_) ) foreach @{$payby2fields{$payby}};
+ }
my $error = $new->replace($cust_main);
errorpage("payment processed successfully, but error saving info: $error")