X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fcust_payby.html;h=6404bcb33d975635e4dc7c9e639db4d791c0ea44;hb=2ca291caff85cdd292370a944be1e4bacd4583a7;hp=6e2610bbed6d07bf1ede1a23bf07869b16116d6a;hpb=42bbc8151e118aabb80b8a1e1253a81dc82cd7ef;p=freeside.git
diff --git a/httemplate/elements/cust_payby.html b/httemplate/elements/cust_payby.html
index 6e2610bbe..6404bcb33 100644
--- a/httemplate/elements/cust_payby.html
+++ b/httemplate/elements/cust_payby.html
@@ -11,7 +11,8 @@
|
>
@@ -179,11 +188,11 @@
<& /elements/select-state.html,
'prefix' => $name. '_pay',
'empty' => emt('(choose)'),
- 'state' => $cgi->param($name.'_paystate')
- || $cust_payby->paystate,
+ 'state' => ( scalar($cgi->param($name.'_paystate'))
+ || $cust_payby->paystate ),
#was cust_main->country in 3.x, but this will do until/unlesss
# someone needs to track foreign bank states
- 'country' => scalar($conf->config('countrydefault')) || 'US',
+ 'country' => ( scalar($conf->config('countrydefault')) || 'US' ),
&>
<% mt('Bank state') |h %>
|
@@ -215,52 +224,59 @@
% }
-% unless ( $opt{'html_only'} ) {
+% unless ( $opt{'html_only'} || $payby_changed_init ) {
+% $payby_changed_init = 1;
% }
+<%once>
+my $payby_changed_init = 0;
+%once>
<%init>
my( %opt ) = @_;
@@ -290,8 +306,17 @@ if ( $curr_value ) {
$cust_payby = new FS::cust_payby {};
}
my $sel_payby = $cgi->param($name.'_payby') || $cust_payby->payby;
-$sel_payby = 'CARD' if $sel_payby eq 'DCRD' || $sel_payby eq '';
-$sel_payby = 'CHEK' if $sel_payby eq 'DCHK';
+# convert DCRD to CARD + no weight, and the same for DCHK/CHEK
+if ($sel_payby eq 'DCRD') {
+ $sel_payby = 'CARD';
+ $cust_payby->weight('');
+} elsif ($sel_payby eq 'DCHK') {
+ $sel_payby = 'CHEK';
+ $cust_payby->weight('');
+} elsif (!$sel_payby) {
+ # default
+ $sel_payby = 'CARD';
+}
my @payby = FS::payby->cust_payby;
my %conf_payby = map { $_=>1 } $conf->config('payby');