projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix use statements for FS::UI::Web. not "use"ing modules in the actual modules you...
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat.pm
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
f4031ec
..
f2b51c7
100644
(file)
--- 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 strict;
use vars qw(@ISA %info);
#use FS::Record qw(qsearch);
+use FS::UI::Web;
use FS::part_pkg;
@ISA = qw(FS::part_pkg);
use FS::part_pkg;
@ISA = qw(FS::part_pkg);
@@
-28,27
+29,43
@@
use FS::part_pkg;
},
'upbytes' => { 'name' => 'Upload 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' => '',
},
'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' => '',
},
'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' => '',
},
'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' => '',
},
'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' => '',
},
'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' => '',
},
'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' => '',
},
'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',
},
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit',
@@
-62,7
+79,8
@@
use FS::part_pkg;
sub calc_setup {
my($self, $cust_pkg, $sdate, $details ) = @_;
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++ );
}
while ($i < $count) {
push @$details, $self->option( 'additional_info' . $i++ );
}
@@
-119,7
+137,7
@@
sub is_prepaid {
sub reset_usage {
my($self, $cust_pkg) = @_;
my %values = map { $_, $self->option($_) }
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);
}
qw(seconds upbytes downbytes totalbytes);
$cust_pkg->set_usage(\%values);
}