projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add prorate options to recur_Common packages, #10630
[freeside.git]
/
FS
/
FS
/
part_pkg
/
cdr_termination.pm
diff --git
a/FS/FS/part_pkg/cdr_termination.pm
b/FS/FS/part_pkg/cdr_termination.pm
index
cfd6b4e
..
37fa47e
100644
(file)
--- a/
FS/FS/part_pkg/cdr_termination.pm
+++ b/
FS/FS/part_pkg/cdr_termination.pm
@@
-16,15
+16,8
@@
tie my %temporalities, 'Tie::IxHash',
%info = (
'name' => 'VoIP rating of CDR records for termination partners.',
'shortname' => 'VoIP/telco CDR termination',
%info = (
'name' => 'VoIP rating of CDR records for termination partners.',
'shortname' => 'VoIP/telco CDR termination',
+ 'inherit_fields' => [ 'prorate_Mixin', 'global_Mixin' ],
'fields' => {
'fields' => {
-
- 'setup_fee' => { 'name' => 'Setup fee for this package',
- 'default' => 0,
- },
- 'recur_fee' => { 'name' => 'Base recurring fee for this package',
- 'default' => 0,
- },
-
#'cdr_column' => { 'name' => 'Column from CDR records',
# 'type' => 'select',
# 'select_enum' => [qw(
#'cdr_column' => { 'name' => 'Column from CDR records',
# 'type' => 'select',
# 'select_enum' => [qw(
@@
-49,16
+42,10
@@
tie my %temporalities, 'Tie::IxHash',
'select_options' => \%temporalities,
},
'select_options' => \%temporalities,
},
- 'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
- ' of service at cancellation',
- 'type' => 'checkbox',
- },
-
'cutoff_day' => { 'name' => 'Billing Day (1 - 28) for prorating or '.
'subscription',
'default' => '1',
},
'cutoff_day' => { 'name' => 'Billing Day (1 - 28) for prorating or '.
'subscription',
'default' => '1',
},
-
'recur_method' => { 'name' => 'Recurring fee method',
#'type' => 'radio',
#'options' => \%recur_method,
'recur_method' => { 'name' => 'Recurring fee method',
#'type' => 'radio',
#'options' => \%recur_method,
@@
-87,9
+74,9
@@
tie my %temporalities, 'Tie::IxHash',
},
#cdr_column
},
#cdr_column
- 'fieldorder' => [qw(
- setup_fee recur_fee
- recur_temporality unused_credit recur_method cutoff_day
+ 'fieldorder' => [qw(
recur_temporality recur_method cutoff_day ),
+ FS::part_pkg::prorate_Mixin::fieldorder,
+ qw(
output_format usage_section summarize_usage usage_mandate
)
],
output_format usage_section summarize_usage usage_mandate
)
],
@@
-98,11
+85,6
@@
tie my %temporalities, 'Tie::IxHash',
);
);
-sub calc_setup {
- my($self, $cust_pkg ) = @_;
- $self->option('setup_fee');
-}
-
sub calc_recur {
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
sub calc_recur {
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
@@
-111,7
+93,7
@@
sub calc_recur {
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
- if $self->
option('recur_temporality', 1)
eq 'preceding'
+ if $self->
recur_temporality
eq 'preceding'
&& ( $last_bill eq '' || $last_bill == 0 );
# termination calculations
&& ( $last_bill eq '' || $last_bill == 0 );
# termination calculations