[freeside-commits] freeside/FS/FS Conf.pm, 1.424, 1.425 cust_bill.pm, 1.305, 1.306

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv20947/FS/FS

Modified Files:
	Conf.pm cust_bill.pm 
Log Message:
add (unfinished) credit card surcharge, part 1

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -w -d -r1.424 -r1.425
--- Conf.pm	20 Jan 2011 09:55:13 -0000	1.424
+++ Conf.pm	21 Jan 2011 22:17:29 -0000	1.425
@@ -655,6 +655,13 @@
   },
   
   {
+    'key'         => 'credit-card-surcharge-percentage',
+    'section'     => 'billing',
+    'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total. WARNING: this is usually prohibited by merchant account / other agreements and/or law, but is currently lawful in AU and UK.',
+    'type'        => 'text',
+  },
+
+  {
     'key'         => 'discount-show-always',
     'section'     => 'billing',
     'description' => 'Generate a line item on an invoice even when a package is discounted 100%',

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -w -d -r1.305 -r1.306
--- cust_bill.pm	19 Jan 2011 19:12:24 -0000	1.305
+++ cust_bill.pm	21 Jan 2011 22:17:30 -0000	1.306
@@ -1958,7 +1958,8 @@
 }
 
 sub realtime_bop {
-  my( $self, $method ) = @_;
+  my( $self, $method ) = (shift,shift);
+  my %opt = @_;
 
   my $cust_main = $self->cust_main;
   my $balance = $cust_main->balance;
@@ -1987,6 +1988,7 @@
 #this didn't do what we want, it just calls apply_payments_and_credits
 #    'apply'       => 1,
     'apply_to_invoice' => 1,
+    %opt,
  #what we want:
  #this changes application behavior: auto payments
                         #triggered against a specific invoice are now applied