[freeside-commits] freeside/FS/FS/cust_main Billing.pm,1.23,1.24

[Mark Wells]

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

Modified Files:
	Billing.pm 
Log Message:
deferred prorate billing, RT#10630

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -d -r1.23 -r1.24
--- Billing.pm	14 Jan 2011 02:51:41 -0000	1.23
+++ Billing.pm	19 Jan 2011 00:41:00 -0000	1.24
@@ -897,6 +897,7 @@
                   'discounts'           => \@discounts,
                   'real_pkgpart'        => $real_pkgpart,
                   'freq_override'	=> $options{freq_override} || '',
+                  'setup_fee'           => 0,
                 );
 
     my $method = $options{cancel} ? 'calc_cancel' : 'calc_recur';
@@ -926,6 +927,14 @@
 
     }
 
+    if ( $param{'setup_fee'} ) {
+      # Add an additional setup fee at the billing stage.
+      # Used for prorate_defer_bill.
+      $setup += $param{'setup_fee'};
+      $unitsetup += $param{'setup_fee'};
+      $lineitems++;
+    }
+
   }
 
   warn "\$setup is undefined" unless defined($setup);