X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=447cfa3c1311f31188c5f0088e14c523e77b833c;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=45aeacad48c308f22497f79103781065050ecff2;hpb=26119738eaf2b519d91c855c23986f873303887f;p=freeside.git diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 45aeacad4..447cfa3c1 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,25 +1,75 @@ -<% 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 - + <% 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-select-discount_term.html, + 'custnum' => $custnum, + 'cgi' => $cgi +&> + % if ( $payby eq 'CARD' ) { % % my( $payinfo, $paycvv, $month, $year ) = ( '', '', '', '' ); @@ -32,13 +82,13 @@ % } - Card number + <% mt('Card number') |h %> - + - + - + - <% include( '/elements/location.html', + <& /elements/location.html, 'object' => $cust_main, #XXX errors??? 'no_asterisks' => 1, - 'address1_label' => 'Card billing address', - ) - %> + 'address1_label' => emt('Card billing address'), + &> % } elsif ( $payby eq 'CHEK' ) { % @@ -86,7 +135,7 @@ % $stateid, $stateid_state ) % = ( '', '', '', '', '', '', '', '' ); % if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) { -% $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i +% $cust_main->paymask =~ /^([\dx]+)\@([\dx]*)$/i % or die "unparsable payinfo ". $cust_main->payinfo; % ($payinfo1, $payinfo2) = ($1, $2); % $payname = $cust_main->payname; @@ -100,34 +149,37 @@ - + - + +% if ( $conf->exists('echeck-no_routing') ) { + +% } else { + + + + +% } - - - - - + % if ( $conf->exists('show_bankstate') ) { - - + % } else { @@ -137,8 +189,8 @@ % if ( $conf->exists('show_ss') ) { @@ -149,19 +201,18 @@ % if ( $conf->exists('show_stateid') ) { - - + % } else { @@ -175,7 +226,7 @@ @@ -192,7 +243,7 @@ @@ -202,17 +253,17 @@
Exp.<% mt('Exp.') |h %>
CVV2<% mt('CVV2') |h %> - (help) + (<% mt('help') |h %>)
Exact name on card<% mt('Exact name on card') |h %>
Account number<% mt('Account number') |h %> Type<% mt('Type') |h %>
<% mt('ABA/Routing number') |h %> + + (<% mt('help') |h %>) +
ABA/Routing number - - (help) -
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 + <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %>

- +
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" @@ -237,16 +288,55 @@ my $balance = $cust_main->balance; my $payinfo = ''; -#false laziness w/selfservice make_payment.html shortcut for one-country my $conf = new FS::Conf; + +my $money_char = $conf->config('money_char') || '$'; + +#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 $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); +} + +my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32; + +