projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
option to charge the next full period when prorating, RT#9874
[freeside.git]
/
FS
/
FS
/
part_pkg
/
sesmon_minute.pm
diff --git
a/FS/FS/part_pkg/sesmon_minute.pm
b/FS/FS/part_pkg/sesmon_minute.pm
index
f941e00
..
654fdf5
100644
(file)
--- a/
FS/FS/part_pkg/sesmon_minute.pm
+++ b/
FS/FS/part_pkg/sesmon_minute.pm
@@
-14,9
+14,9
@@
use FS::part_pkg::flat;
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
},
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
},
- 'recur_f
lat
' => { 'name' => 'Base recurring fee for this package',
-
'default' => 0,
-
},
+ 'recur_f
ee
' => { 'name' => 'Base recurring fee for this package',
+ 'default' => 0,
+ },
'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
' of service at cancellation',
'type' => 'checkbox',
'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
' of service at cancellation',
'type' => 'checkbox',
@@
-28,9
+28,9
@@
use FS::part_pkg::flat;
'default' => 0,
},
},
'default' => 0,
},
},
- 'fieldorder' => [ 'setup_fee', 'recur_f
lat
', 'unused_credit', 'recur_included_min', 'recur_minly_charge' ],
+ 'fieldorder' => [ 'setup_fee', 'recur_f
ee
', 'unused_credit', 'recur_included_min', 'recur_minly_charge' ],
#'setup' => 'what.setup_fee.value',
#'setup' => 'what.setup_fee.value',
- #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_f
lat
.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+ #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_f
ee
.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
'weight' => 80,
);
'weight' => 80,
);
@@
-41,16
+41,18
@@
sub calc_recur {
$min -= $self->option('recur_included_min');
$min = 0 if $min < 0;
$min -= $self->option('recur_included_min');
$min = 0 if $min < 0;
- $self->option('recur_f
lat
') + $min * $self->option('recur_minly_charge');
+ $self->option('recur_f
ee
') + $min * $self->option('recur_minly_charge');
}
}
+sub can_discount { 0; }
+
sub is_free_options {
qw( setup_fee recur_fee recur_minly_charge );
}
sub base_recur {
my($self, $cust_pkg) = @_;
sub is_free_options {
qw( setup_fee recur_fee recur_minly_charge );
}
sub base_recur {
my($self, $cust_pkg) = @_;
- $self->option('recur_f
lat
');
+ $self->option('recur_f
ee
');
}
1;
}
1;