X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=1ae15b930143da6e79829cdba299e67beddbb7c7;hb=26004f55ce70242d07fc8de51e24439e783e9e49;hp=093494a0675459328caa5d88d26cb412191ece6a;hpb=37eaedf1acb77298a1c5b6ca0eecf372633dc4cc;p=freeside.git
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 093494a06..1ae15b930 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -9,67 +9,20 @@
<& /elements/init_overlib.html &>
<% ntable('#cccccc') %>
-
- <% mt('Payment amount') |h %> |
-
-
- |
-
-
-% if ( $fee ) {
-
-
-% }
+ <& /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',
-&>
+ <& /elements/tr-select-discount_term.html,
+ 'custnum' => $custnum,
+ 'amount_id' => 'amount',
+ &>
% if ( $payby eq 'CARD' ) {
%
@@ -304,8 +257,6 @@ my $payinfo = '';
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', {
@@ -313,43 +264,23 @@ 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 $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');
- $amount += $amount * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0;
+ $$amountref += $$amountref * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0;
- $amount = sprintf("%.2f", $amount);
-}
+ $$amountref = sprintf("%.2f", $$amountref);
+};
my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;