X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=6a1fd550b46f02bfd14750af05fc2b4dfd460465;hb=959a59186f30a33d167b12e67d3c9cc4ce58a0f5;hp=093494a0675459328caa5d88d26cb412191ece6a;hpb=fa33561ed20c57b0f63221d6a0f9c0cf5ebbef14;p=freeside.git diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 093494a06..6a1fd550b 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -9,77 +9,45 @@ <& /elements/init_overlib.html &> <% ntable('#cccccc') %> - - <% mt('Payment amount') |h %> - -
- <% $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', + &> % } -<& /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; % } @@ -88,13 +56,12 @@ + > <& /elements/location.html, - 'object' => $cust_main, #XXX errors??? + 'object' => $cust_main->bill_location, 'no_asterisks' => 1, 'address1_label' => emt('Card billing address'), &> @@ -147,6 +113,8 @@ % $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 @@ -160,14 +128,14 @@ - + @@ -175,7 +143,7 @@ % } @@ -244,11 +212,13 @@ +% 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; @@ -256,7 +226,7 @@ @@ -266,11 +236,52 @@ +% 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) { + +% } +
- <% mt('Exp.') |h %> @@ -103,8 +70,7 @@ @@ -125,7 +91,7 @@
<% mt('Account number') |h %>> <% mt('Type') |h %>
<% mt($routing_label) |h %> - + > (<% mt('help') |h %>)
<% mt('Branch number') |h %> - + >
- + <% 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; }"> + 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 %> + +

@@ -298,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 } @@ -313,42 +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 = ''; -my $num_payments = scalar($cust_main->cust_pay); -#handle old cust_main.pm (remove...) -$num_payments = scalar( @{ [ $cust_main->cust_pay ] } ) - unless defined $num_payments; -if ( $conf->config('manual_process-pkgpart') - and ! $conf->exists('manual_process-skip_first') || $num_payments - ) -{ - - $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'; - - my $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage'); - $amount += $amount * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0; - - $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;