X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate.pm;h=4cdc3f123275b5f4809bbbe1d7fb85c7ee40faae;hb=54eead497d6a8acea3ad8575d194fe027672dbf1;hp=a5f9ef6b6e83fa23fe25c9b00a9dbc755ccbe5a1;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index a5f9ef6b6..4cdc3f123 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -1,12 +1,10 @@
 package FS::part_pkg::prorate;
+use base qw( FS::part_pkg::flat );
 
 use strict;
-use vars qw(@ISA %info);
+use vars qw(%info);
 use Time::Local qw(timelocal);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
 
 %info = (
   'name' => 'First partial month pro-rated, then flat-rate (selectable billing day)',
@@ -24,9 +22,9 @@ use FS::part_pkg::flat;
                           'type' => 'checkbox',
                         },
     'prorate_round_day'=> {
-                          'name' => 'Round the prorated period to the nearest '.
-                                    'full day',
-                          'type' => 'checkbox',
+                          'name' => 'Round the prorated period',
+                          'type' => 'select',
+                          'select_options' => \%FS::part_pkg::prorate_Mixin::prorate_round_day_opts,
                         },
     'prorate_defer_bill'=> {
                         'name' => 'Defer the first bill until the billing day',
@@ -44,9 +42,14 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my $self = shift;
+  #my($cust_pkg, $sdate, $details, $param ) = @_;
   my $cust_pkg = $_[0];
 
   my $charge = $self->calc_prorate(@_, $self->cutoff_day($cust_pkg));
+
+  $charge += $self->usageprice_recur(@_);
+  $cust_pkg->apply_usageprice(); #$sdate for prorating?
+
   my $discount = $self->calc_discount(@_);
 
   sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );