X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat.pm;h=471f216bade72709a3bc3cbbfac60af90be2a249;hb=64852c30f3025d1aafa3c9d5c81f6b20dddd1a36;hp=c0fbb5a7fdf26ee6bb138157cb4380f4a2f57928;hpb=0dd05e9ff98263d2d42b419b1e278a5a3bc594b2;p=freeside.git

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index c0fbb5a7f..471f216ba 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -3,6 +3,7 @@ package FS::part_pkg::flat;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch);
+use FS::UI::bytecount;
 use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg);
@@ -28,50 +29,50 @@ use FS::part_pkg;
                        },
     'upbytes'       => { 'name' => 'Upload limit for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'downbytes'     => { 'name' => 'Download limit for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'totalbytes'    => { 'name' => 'Transfer limit for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_amount'       => { 'name' => 'Cost of recharge for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
                        },
     'recharge_seconds'      => { 'name' => 'Recharge time for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
                        },
     'recharge_upbytes'      => { 'name' => 'Recharge upload for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_downbytes'    => { 'name' => 'Recharge download for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_totalbytes'   => { 'name' => 'Recharge transfer for this package',
                          'default' => '',
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
+    'usage_rollover' => { 'name' => 'Allow usage from previous period to roll '.
+                                    ' over into current period',
+                          'type' => 'checkbox',
+                        },
   },
   'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 
                     'seconds', 'upbytes', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
-                    'externalid' ],
+                    'usage_rollover', 'externalid' ],
   'weight' => 10,
 );
 
@@ -89,18 +90,24 @@ sub calc_setup {
 
 sub calc_recur {
   my($self, $cust_pkg) = @_;
-  $self->reset_usage($cust_pkg);
   $self->base_recur($cust_pkg);
 }
 
 sub base_recur {
   my($self, $cust_pkg) = @_;
-  $self->option('recur_fee');
+  $self->option('recur_fee', 1) || 0;
 }
 
 sub calc_remain {
-  my ($self, $cust_pkg) = @_;
-  my $time = time;  #should be able to pass this in for credit calculation
+  my ($self, $cust_pkg, %options) = @_;
+
+  my $time;
+  if ($options{'time'}) {
+    $time = $options{'time'};
+  } else {
+    $time = time;
+  }
+
   my $next_bill = $cust_pkg->getfield('bill') || 0;
   my $last_bill = $cust_pkg->last_bill || 0;
   return 0 if    ! $self->base_recur
@@ -138,7 +145,11 @@ sub reset_usage {
   my %values = map { $_, $self->option($_) } 
     grep { $self->option($_, 'hush') } 
     qw(seconds upbytes downbytes totalbytes);
-  $cust_pkg->set_usage(\%values);
+  if ($self->option('usage_rollover', 1)) {
+    $cust_pkg->recharge(\%values);
+  }else{
+    $cust_pkg->set_usage(\%values);
+  }
 }
 
 1;