X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=1ae15b930143da6e79829cdba299e67beddbb7c7;hp=9aaa4590469eea1f6a7106c68afcbbd1af286fa7;hb=26004f55ce70242d07fc8de51e24439e783e9e49;hpb=626dbc1a49b6b1dfba94584670a0a0b11ac52148 diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 9aaa45904..1ae15b930 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,189 +1,199 @@ -<% include( '/elements/header.html', "Process $type{$payby} payment" ) %> -<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(2) . "view/cust_main.cgi" ) %> +<& /elements/header.html, mt("Process [_1] payment",$type{$payby}) &> +<& /elements/small_custview.html, $cust_main, '', '', popurl(2) . "view/cust_main.cgi" &>
-<% include('/elements/init_overlib.html') %> - -% #include( '/elements/table.html', '#cccccc' ) +<& /elements/init_overlib.html &> <% ntable('#cccccc') %> - - Payment amount - -
- $"> -
- - + + <& /elements/tr-amount_fee.html, + 'amount' => $amount, + 'process-pkgpart' => scalar($conf->config('manual_process-pkgpart')), + 'process-display' => scalar($conf->config('manual_process-display')), + 'process-skip-first' => $conf->exists('manual_process-skip_first'), + 'num_payments' => scalar($cust_main->cust_pay), + 'post_fee_callback' => $post_fee_callback, + &> + + <& /elements/tr-select-discount_term.html, + 'custnum' => $custnum, + 'amount_id' => 'amount', + &> + % if ( $payby eq 'CARD' ) { -% my( $payinfo, $paycvv, $month, $year ) = ( '', '', '', '' ); -% my $payname = $cust_main->first. ' '. $cust_main->getfield('last'); -% my $address1 = $cust_main->address1; -% my $address2 = $cust_main->address2; -% my $city = $cust_main->city; -% my $state = $cust_main->state; -% my $zip = $cust_main->zip; -% if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) { -% $payinfo = $cust_main->paymask; -% $paycvv = $cust_main->paycvv; -% ( $month, $year ) = $cust_main->paydate_monthyear; -% $payname = $cust_main->payname if $cust_main->payname; -% } % - - - Card number - - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + <& /elements/location.html, + 'object' => $cust_main, #XXX errors??? + 'no_asterisks' => 1, + 'address1_label' => emt('Card billing address'), + &> - - - - - -
- Exp. -
<% mt('Card number') |h %> + + + + + - - + + - -
+ <% mt('Exp.') |h %> + - / - + / + -
-
CVV2 - (help) -
Exact name on card
Card billing address - -
Address line 2 - -
City - - - - - + +
- - State - +
+
<% mt('CVV2') |h %> + (<% mt('help') |h %>) +
<% mt('Exact name on card') |h %>
Zip - -
- - % } elsif ( $payby eq 'CHEK' ) { -% my( $payinfo1, $payinfo2, $payname, $ss, $paytype, $paystate, -% $stateid, $stateid_state ) -% = ( '', '', '', '', '', '', '', '' ); -% if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) { -% $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i -% or die "unparsable payinfo ". $cust_main->payinfo; -% ($payinfo1, $payinfo2) = ($1, $2); -% $payname = $cust_main->payname; -% $ss = $cust_main->ss; -% $paytype = $cust_main->getfield('paytype'); -% $paystate = $cust_main->getfield('paystate'); -% $stateid = $cust_main->getfield('stateid'); -% $stateid_state = $cust_main->getfield('stateid_state'); -% } % - - - - - Account number - - Type - - - - ABA/Routing number - - - (help) - - - - Bank name - - - - Bank state - <% include('../edit/cust_main/select-state.html', #meh - 'empty' => '(choose)', - 'state' => $paystate, - 'country' => $cust_main->country, - 'prefix' => 'pay', - ) %> - - - - Account holder
- Social security or tax ID # - - - - - - Account holder
- Driver’s license or state ID # - - - State - <% include('../edit/cust_main/select-state.html', #meh - 'empty' => '(choose)', - 'state' => $stateid_state, - 'country' => $cust_main->country, - 'prefix' => 'stateid_', - ) %> - -% } +% my( $account, $aba, $branch, $payname, $ss, $paytype, $paystate, +% $stateid, $stateid_state ) +% = ( '', '', '', '', '', '', '', '', '' ); +% if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) { +% $cust_main->paymask =~ /^([\dx]+)\@([\d\.x]*)$/i +% or die "unparsable payinfo ". $cust_main->payinfo; +% ($account, $aba) = ($1, $2); +% ($branch,$aba) = split('\.',$aba) +% if $conf->config('echeck-country') eq 'CA'; +% $payname = $cust_main->payname; +% $ss = $cust_main->ss; +% $paytype = $cust_main->getfield('paytype'); +% $paystate = $cust_main->getfield('paystate'); +% $stateid = $cust_main->getfield('stateid'); +% $stateid_state = $cust_main->getfield('stateid_state'); +% } +% +% #false laziness w/{edit,view}/cust_main/billing.html +% my $routing_label = $conf->config('echeck-country') eq 'US' +% ? 'ABA/Routing number' +% : 'Routing number'; +% my $routing_size = $conf->config('echeck-country') eq 'CA' ? 4 : 10; +% my $routing_maxlength = $conf->config('echeck-country') eq 'CA' ? 3 : 9; + + + + + <% mt('Account number') |h %> + + <% mt('Type') |h %> + + + + <% mt($routing_label) |h %> + + + (<% mt('help') |h %>) + + +% if ( $conf->config('echeck-country') eq 'CA' ) { + + <% mt('Branch number') |h %> + + + + +% } + + <% mt('Bank name') |h %> + + + +% if ( $conf->exists('show_bankstate') ) { + + <% mt('Bank state') |h %> + <& /elements/select-state.html, + 'disable_empty' => 0, + 'empty_label' => emt('(choose)'), + 'state' => $paystate, + 'country' => $cust_main->country, + 'prefix' => 'pay', + &> + + +% } else { + +% } + +% if ( $conf->exists('show_ss') ) { + + + <% mt('Account holder') |h %>
+ <% mt('Social security or tax ID #') |h %> + + + +% } else { + +% } + +% if ( $conf->exists('show_stateid') ) { + + + <% mt('Account holder') |h %>
+ <% mt("Driver's license or state ID #") |h %> + + + <% mt('State') |h %> + <& /elements/select-state.html, + 'disable_empty' => 0, + 'empty_label' => emt('(choose)'), + 'state' => $stateid_state, + 'country' => $cust_main->country, + 'prefix' => 'stateid_', + &> + + +% } else { + + +% } + +% } #end CARD/CHEK-specific section - Remember this information + <% mt('Remember this information') |h %> @@ -200,7 +210,7 @@ - Add to current batch + <% mt('Add to current batch') |h %> @@ -210,17 +220,17 @@ payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }"> - Charge future payments to this <% $type{$payby} %> automatically + <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %>
- +
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" @@ -245,16 +255,33 @@ my $balance = $cust_main->balance; my $payinfo = ''; -#false laziness w/selfservice make_payment.html shortcut for one-country my $conf = new FS::Conf; + +#false laziness w/selfservice make_payment.html shortcut for one-country my %states = map { $_->state => 1 } qsearch('cust_main_county', { 'country' => $conf->config('countrydefault') || 'US' } ); my @states = sort { $a cmp $b } keys %states; -my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32; +my $amount = ''; +if ( $balance > 0 ) { + $amount = $balance; +} - +my $post_fee_callback = sub { + my( $amountref ) = @_; + return unless $$amountref > 0; + my $conf = new FS::Conf; + + my $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage'); + $$amountref += $$amountref * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0; + + $$amountref = sprintf("%.2f", $$amountref); +}; + +my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32; + +