projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix one-time charge quantities &
[freeside.git]
/
FS
/
FS
/
part_pkg
/
base_rate.pm
diff --git
a/FS/FS/part_pkg/base_rate.pm
b/FS/FS/part_pkg/base_rate.pm
index
9e64184
..
64636d9
100644
(file)
--- a/
FS/FS/part_pkg/base_rate.pm
+++ b/
FS/FS/part_pkg/base_rate.pm
@@
-9,6
+9,9
@@
use FS::part_pkg;
%info = (
'name' => 'Base rate (anniversary billing, Times units ordered)',
%info = (
'name' => 'Base rate (anniversary billing, Times units ordered)',
+ # XXX it multiplies recurring fee by cust_pkg option "units", how to
+ # express that
+ 'shortname' => 'Bulk (manual from "units" option)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@
-26,7
+29,7
@@
use FS::part_pkg;
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit',
'externalid' ],
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit',
'externalid' ],
- 'weight' =>
10
,
+ 'weight' =>
52
,
);
sub calc_setup {
);
sub calc_setup {
@@
-43,7
+46,6
@@
sub calc_setup {
sub calc_recur {
my($self, $cust_pkg) = @_;
sub calc_recur {
my($self, $cust_pkg) = @_;
- $self->reset_usage($cust_pkg);
$self->base_recur($cust_pkg);
}
$self->base_recur($cust_pkg);
}
@@
-91,12
+93,4
@@
sub is_prepaid {
0; #no, we're postpaid
}
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;
1;