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

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index f4031ec79..c0fbb5a7f 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -28,27 +28,43 @@ use FS::part_pkg;
                        },
     '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', 
@@ -62,7 +78,8 @@ use FS::part_pkg;
 sub calc_setup {
   my($self, $cust_pkg, $sdate, $details ) = @_;
 
-  my ( $i, $count ) = ( 0, $self->option( 'additional_count' ) );
+  my $i = 0;
+  my $count = $self->option( 'additional_count', 'quiet' ) || 0;
   while ($i < $count) {
     push @$details, $self->option( 'additional_info' . $i++ );
   }
@@ -119,7 +136,7 @@ sub is_prepaid {
 sub reset_usage {
   my($self, $cust_pkg) = @_;
   my %values = map { $_, $self->option($_) } 
-    grep { $self->option($_) } 
+    grep { $self->option($_, 'hush') } 
     qw(seconds upbytes downbytes totalbytes);
   $cust_pkg->set_usage(\%values);
 }