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

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index bed86cc8d..c0fbb5a7f 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -23,19 +23,74 @@ use FS::part_pkg;
     'externalid' => { 'name'   => 'Optional External ID',
                       'default' => '',
                     },
+    'seconds'       => { 'name' => 'Time limit for this package',
+                         'default' => '',
+                       },
+    'upbytes'       => { 'name' => 'Upload limit for this package',
+                         'default' => '',
+                         'format' => \&FS::UI::Web::display_bytecount,
+                         'parse' => \&FS::UI::Web::parse_bytecount,
+                       },
+    'downbytes'     => { 'name' => 'Download limit for this package',
+                         'default' => '',
+                         'format' => \&FS::UI::Web::display_bytecount,
+                         'parse' => \&FS::UI::Web::parse_bytecount,
+                       },
+    'totalbytes'    => { 'name' => 'Transfer limit for this package',
+                         'default' => '',
+                         'format' => \&FS::UI::Web::display_bytecount,
+                         'parse' => \&FS::UI::Web::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,
+                       },
+    'recharge_downbytes'    => { 'name' => 'Recharge download for this package',
+                         'default' => '',
+                         'format' => \&FS::UI::Web::display_bytecount,
+                         'parse' => \&FS::UI::Web::parse_bytecount,
+                       },
+    'recharge_totalbytes'   => { 'name' => 'Recharge transfer for this package',
+                         'default' => '',
+                         'format' => \&FS::UI::Web::display_bytecount,
+                         'parse' => \&FS::UI::Web::parse_bytecount,
+                       },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'externalid' ],
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 
+                    'seconds', 'upbytes', 'downbytes', 'totalbytes',
+                    'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
+                    'recharge_downbytes', 'recharge_totalbytes',
+                    'externalid' ],
   'weight' => 10,
 );
 
 sub calc_setup {
-  my($self, $cust_pkg ) = @_;
+  my($self, $cust_pkg, $sdate, $details ) = @_;
+
+  my $i = 0;
+  my $count = $self->option( 'additional_count', 'quiet' ) || 0;
+  while ($i < $count) {
+    push @$details, $self->option( 'additional_info' . $i++ );
+  }
+
   $self->option('setup_fee');
 }
 
 sub calc_recur {
-  my $self = shift;
-  $self->base_recur(@_);
+  my($self, $cust_pkg) = @_;
+  $self->reset_usage($cust_pkg);
+  $self->base_recur($cust_pkg);
 }
 
 sub base_recur {
@@ -78,4 +133,12 @@ sub is_prepaid {
   0; #no, we're postpaid
 }
 
+sub reset_usage {
+  my($self, $cust_pkg) = @_;
+  my %values = map { $_, $self->option($_) } 
+    grep { $self->option($_, 'hush') } 
+    qw(seconds upbytes downbytes totalbytes);
+  $cust_pkg->set_usage(\%values);
+}
+
 1;