X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=6a1fd550b46f02bfd14750af05fc2b4dfd460465;hb=959a59186f30a33d167b12e67d3c9cc4ce58a0f5;hp=ada925c55b10ec4cc0f679227b8dc35aa5fb8ec1;hpb=357b4e26965895666685590d59f72de331fecb08;p=freeside.git diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index ada925c55..6a1fd550b 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,97 +1,67 @@ -<% 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 - -
- <% $money_char %> - -% if ( $fee ) { - - - <% $fee_op %> - <% $money_char . $fee %> - - <% $fee_pkg->pkg |h %> - = - - <% length($amount) ? $money_char. sprintf('%.2f', ($fee_display eq 'add') ? $amount + $fee : $amount - $fee ) : '' %> <% $fee_display eq 'add' ? 'TOTAL' : 'AVAILABLE' %> - -% } -
- - - -% if ( $fee ) { - - + <& /elements/tr-amount_fee.html, + 'amount' => $amount, + 'process-pkgpart' => + scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)), + 'process-display' => scalar($conf->config('manual_process-display')), + 'process-skip_first' => $conf->exists('manual_process-skip_first'), + 'num_payments' => scalar($cust_main->cust_pay), + 'surcharge_percentage' => + ( $payby eq 'CARD' + ? scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum)) + : 0 + ), + 'surcharge_flatfee' => + ( $payby eq 'CARD' + ? scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum)) + : 0 + ), + 'processing_fee' => scalar($conf->config('processing-fee', $cust_main->agentnum)), + &> + +% if ( $conf->exists('part_pkg-term_discounts') ) { + <& /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'); % if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) { % $payinfo = $cust_main->paymask; -% $paycvv = $cust_main->paycvv; +% ( $paycvv = $cust_main->paycvv ) =~ s/./*/g; % ( $month, $year ) = $cust_main->paydate_monthyear; % $payname = $cust_main->payname if $cust_main->payname; +% } elsif ($disable_payauto_default) { +% $auto = 0; % } - Card number + <% mt('Card number') |h %> - + > + - + - + - <% include( '/elements/location.html', - 'object' => $cust_main, #XXX errors??? + <& /elements/location.html, + 'object' => $cust_main->bill_location, 'no_asterisks' => 1, - 'address1_label' => 'Card billing address', - ) - %> + 'address1_label' => emt('Card billing address'), + &> % } elsif ( $payby eq 'CHEK' ) { % -% my( $payinfo1, $payinfo2, $payname, $ss, $paytype, $paystate, +% my( $account, $aba, $branch, $payname, $ss, $paytype, $paystate, % $stateid, $stateid_state ) -% = ( '', '', '', '', '', '', '', '' ); +% = ( '', '', '', '', '', '', '', '', '' ); % if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) { -% $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i +% $cust_main->paymask =~ /^([\dx]+)\@([\d\.x]*)$/i % or die "unparsable payinfo ". $cust_main->payinfo; -% ($payinfo1, $payinfo2) = ($1, $2); +% ($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'); +% } elsif ($disable_payauto_default) { +% $auto = 0; % } +% +% #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; - - - + + + - + +% if ( $conf->config('echeck-country') eq 'CA' ) { + + + + +% } - + % if ( $conf->exists('show_bankstate') ) { - - + % } else { @@ -185,8 +171,8 @@ % if ( $conf->exists('show_ss') ) { @@ -197,19 +183,18 @@ % if ( $conf->exists('show_stateid') ) { - - + % } else { @@ -223,15 +208,17 @@ +% my $disallow_no_auto_apply = 0; % if ( $conf->exists("batch-enable") % || grep $payby eq $_, $conf->config('batch-enable_payby') % ) { % % if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) { +% $disallow_no_auto_apply = 1; @@ -239,8 +226,8 @@ @@ -249,18 +236,59 @@ +% unless ($disallow_no_auto_apply) { +% # false laziness with edit/cust_pay.cgi + + + + + +% # this can go away if no_auto_apply handling gets added to batch payment processing + + +% } + +% if ($auto && $disable_payauto_default) { + +% } +
- Exp.<% mt('Exp.') |h %> @@ -100,8 +70,7 @@ @@ -111,71 +80,88 @@
CVV2<% mt('CVV2') |h %> - (help) + (<% mt('help') |h %>)
Exact name on card<% mt('Exact name on card') |h %>
Account numberType<% mt('Account number') |h %>><% mt('Type') |h %>
ABA/Routing number<% mt($routing_label) |h %> - - (help) + > + (<% mt('help') |h %>)
<% mt('Branch number') |h %> + > +
Bank name<% mt('Bank name') |h %>
Bank state<% include('/elements/select-state.html', + <% mt('Bank state') |h %><& /elements/select-state.html, 'disable_empty' => 0, - 'empty_label' => '(choose)', + 'empty_label' => emt('(choose)'), 'state' => $paystate, 'country' => $cust_main->country, 'prefix' => 'pay', - ) - %> + &>
- Account holder
- Social security or tax ID # + <% mt('Account holder') |h %>
+ <% mt('Social security or tax ID #') |h %>
- Account holder
- Driver’s license or state ID # + <% mt('Account holder') |h %>
+ <% mt("Driver's license or state ID #") |h %> 		State<% include('/elements/select-state.html', + <% mt('State') |h %><& /elements/select-state.html, 'disable_empty' => 0, - 'empty_label' => '(choose)', + 'empty_label' => emt('(choose)'), 'state' => $stateid_state, 'country' => $cust_main->country, 'prefix' => 'stateid_', - ) - %> + &>
- Remember this information + <% mt('Remember this information') |h %>
- - Add to current batch + + <% mt('Add to current batch') |h %>
- 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 + NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }"> + <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %>
+ <% mt('Auto-apply to invoices') |h %> + +

- +
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" @@ -281,13 +309,19 @@ my $custnum = $1; my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } ); die "unknown custnum $custnum" unless $cust_main; +my $location = $cust_main->bill_location; +# no proper error handling on this anyway, but when we have it, +# remember to repopulate fields in $location + my $balance = $cust_main->balance; my $payinfo = ''; my $conf = new FS::Conf; -my $money_char = $conf->config('money_char') || '$'; +my $auto = ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? 1 : 0; +my $disable_payauto_default = $conf->exists('disable_payauto_default'); +my $possibly_uncheck_auto = ' ONCHANGE="possibly_uncheck_auto()"'; #false laziness w/selfservice make_payment.html shortcut for one-country my %states = map { $_->state => 1 } @@ -296,33 +330,13 @@ my %states = map { $_->state => 1 } } ); my @states = sort { $a cmp $b } keys %states; -my $fee = ''; -my $fee_pkg = ''; -my $fee_display = ''; -my $fee_op = ''; -if ( $conf->config('manual_process-pkgpart') ) { - - last if $conf->exists('manual_process-skip_first') && ! $cust_main->cust_pay; - - $fee_display = $conf->config('manual_process-display') || 'add'; - $fee_op = $fee_display eq 'add' ? '+' : '-'; - - $fee_pkg = - qsearchs('part_pkg', { pkgpart=>$conf->config('manual_process-pkgpart') } ); - - #well ->unit_setup or ->calc_setup both call for a $cust_pkg - # (though ->unit_setup doesn't use it...) - $fee = $fee_pkg->option('setup_fee') - if $fee_pkg; #in case.. better than dying with a perl traceback - -} - my $amount = ''; if ( $balance > 0 ) { - $amount = $balance; - $amount += $fee - if $fee && $fee_display eq 'subtract'; - $amount = sprintf("%.2f", $amount); + # when configured to do so, amount will only auto-fill with balance + # if balance represents a single invoice + $amount = $balance + unless $conf->exists('manual_process-single_invoice_amount') + && ($cust_main->open_cust_bill != 1); } my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;