projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import torrus 1.0.9
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat_delayed.pm
diff --git
a/FS/FS/part_pkg/flat_delayed.pm
b/FS/FS/part_pkg/flat_delayed.pm
index
33f9dd8
..
b4be72b
100644
(file)
--- a/
FS/FS/part_pkg/flat_delayed.pm
+++ b/
FS/FS/part_pkg/flat_delayed.pm
@@
-11,28
+11,18
@@
use FS::part_pkg::flat;
'name' => 'Free (or setup fee) for X days, then flat rate'.
' (anniversary billing)',
'shortname' => 'Anniversary, with intro period',
'name' => 'Free (or setup fee) for X days, then flat rate'.
' (anniversary billing)',
'shortname' => 'Anniversary, with intro period',
+ 'inherit_fields' => [ 'global_Mixin' ],
'fields' => {
'fields' => {
- 'setup_fee' => { 'name' => 'Setup fee for this package',
- 'default' => 0,
- },
'free_days' => { 'name' => 'Initial free days',
'default' => 0,
},
'free_days' => { 'name' => 'Initial free days',
'default' => 0,
},
- 'recur_fee' => { 'name' => 'Recurring fee for this package',
- 'default' => 0,
- },
'recur_notify' => { 'name' => 'Number of days before recurring billing'.
' commences to notify customer. (0 means'.
' no warning)',
'default' => 0,
},
'recur_notify' => { 'name' => 'Number of days before recurring billing'.
' commences to notify customer. (0 means'.
' no warning)',
'default' => 0,
},
- 'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
- ' of service at cancellation',
- 'type' => 'checkbox',
- },
- },
- 'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'recur_notify',
- 'unused_credit'
+ },
+ 'fieldorder' => [ 'free_days', 'recur_notify',
],
#'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
#'recur' => 'what.recur_fee.value',
],
#'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
#'recur' => 'what.recur_fee.value',
@@
-58,11
+48,6
@@
sub calc_remain {
return 0 if $last_bill + (86400 * $free_days) == $next_bill
&& $last_bill == $cust_pkg->setup;
return 0 if $last_bill + (86400 * $free_days) == $next_bill
&& $last_bill == $cust_pkg->setup;
- return 0 if ! $self->base_recur($cust_pkg)
- || ! $self->option('unused_credit', 1)
- || ! $last_bill
- || ! $next_bill;
-
return $self->SUPER::calc_remain($cust_pkg, %options);
}
return $self->SUPER::calc_remain($cust_pkg, %options);
}