[freeside-commits] freeside/httemplate/misc/process batch-cust_pay.cgi, 1.5, 1.6 payment.cgi, 1.21, 1.22

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc/process
In directory wavetail.420.am:/tmp/cvs-serv19099/httemplate/misc/process

Modified Files:
	batch-cust_pay.cgi payment.cgi 
Log Message:
prepayment discounts rt#5318

Index: payment.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/process/payment.cgi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -d -r1.21 -r1.22
--- payment.cgi	17 Jun 2010 01:17:09 -0000	1.21
+++ payment.cgi	22 Sep 2010 19:16:20 -0000	1.22
@@ -119,11 +119,18 @@
   die "unknown payby $payby";
 }
 
+$cgi->param('discount_term') =~ /^\d*$/
+  or errorpage("illegal discount_term");
+my $discount_term = $1;
+
 my $error = '';
 my $paynum = '';
 if ( $cgi->param('batch') ) {
 
-  $error = $cust_main->batch_card(
+  $error = 'Prepayment discounts not supported with batched payments' 
+    if $discount_term;
+
+  $error ||= $cust_main->batch_card(
                                    'payby'    => $payby,
                                    'amount'   => $amount,
                                    'payinfo'  => $payinfo,
@@ -146,6 +153,7 @@
     'payunique'  => $payunique,
     'paycvv'     => $paycvv,
     'paynum_ref' => \$paynum,
+    'discount_term' => $discount_term,
     map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
   );
   errorpage($error) if $error;

Index: batch-cust_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/process/batch-cust_pay.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- batch-cust_pay.cgi	15 Aug 2010 06:21:06 -0000	1.5
+++ batch-cust_pay.cgi	22 Sep 2010 19:16:20 -0000	1.6
@@ -15,6 +15,7 @@
 %                                       'paid'     => $param->{"paid$row"},
 %                                       'payby'    => 'BILL',
 %                                       'payinfo'  => $param->{"payinfo$row"},
+%                      'discount_term'  => $param->{"discount_term$row"},
 %                                       'paybatch' => $paybatch,
 %                                     }
 %      if    $param->{"custnum$row"}