projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43301b9
)
add upcoming/preceding option, RT#3851
author
ivan
<ivan>
Wed, 10 Sep 2008 07:30:45 +0000
(07:30 +0000)
committer
ivan
<ivan>
Wed, 10 Sep 2008 07:30:45 +0000
(07:30 +0000)
FS/FS/part_pkg/voip_cdr.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
bbba7c7
..
0634cdc
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-27,6
+27,11
@@
tie my %rating_method, 'Tie::IxHash',
# 'Asterisk (or other?) CDR table',
#;
# 'Asterisk (or other?) CDR table',
#;
+tie my %temporalities, 'Tie::IxHash',
+ 'upcoming' => "Upcoming (future)",
+ 'preceding' => "Preceding (past)",
+;
+
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
'shortname' => 'VoIP/telco CDR rating (standard)',
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
'shortname' => 'VoIP/telco CDR rating (standard)',
@@
-37,6
+42,13
@@
tie my %rating_method, 'Tie::IxHash',
'recur_fee' => { 'name' => 'Base recurring fee for this package',
'default' => 0,
},
'recur_fee' => { 'name' => 'Base recurring fee for this package',
'default' => 0,
},
+
+ #probably useful for other usage-charging price plans
+ 'recur_temporality' => { 'name' => 'Charge recurring fee for period',
+ 'type' => 'select',
+ 'select_options' => \%temporalities,
+ },
+
'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',
@@
-130,7
+142,7
@@
tie my %rating_method, 'Tie::IxHash',
},
'fieldorder' => [qw(
},
'fieldorder' => [qw(
- setup_fee recur_fee unused_credit
+ setup_fee recur_fee
recur_temporality
unused_credit
rating_method ratenum
default_prefix
disable_src
rating_method ratenum
default_prefix
disable_src
@@
-153,7
+165,11
@@
sub calc_setup {
sub calc_recur {
my($self, $cust_pkg, $sdate, $details, $param ) = @_;
sub calc_recur {
my($self, $cust_pkg, $sdate, $details, $param ) = @_;
- my $last_bill = $cust_pkg->last_bill;
+ #my $last_bill = $cust_pkg->last_bill;
+ my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
+
+ return 0
+ if $self->option('recur_temporality') eq 'preceding' && $last_bill == 0;
my $ratenum = $cust_pkg->part_pkg->option('ratenum');
my $ratenum = $cust_pkg->part_pkg->option('ratenum');