projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarify interface difference between calc_setup and calc_recur: calc_setup takes...
[freeside.git]
/
FS
/
FS
/
part_pkg
/
agent_cdr.pm
diff --git
a/FS/FS/part_pkg/agent_cdr.pm
b/FS/FS/part_pkg/agent_cdr.pm
index
be0f987
..
a638b5b
100644
(file)
--- a/
FS/FS/part_pkg/agent_cdr.pm
+++ b/
FS/FS/part_pkg/agent_cdr.pm
@@
-23,7
+23,7
@@
tie my %temporalities, 'Tie::IxHash',
%info = (
'name' => 'Wholesale CDR cost billing, for master customers of an agent.',
%info = (
'name' => 'Wholesale CDR cost billing, for master customers of an agent.',
- 'shortname' => 'Wh
ilesale CDR cost billing for agent.
',
+ 'shortname' => 'Wh
olesale CDR cost billing for agent
',
'inherit_fields' => [ 'prorate_Mixin', 'global_Mixin' ],
'fields' => { #false laziness w/cdr_termination
'inherit_fields' => [ 'prorate_Mixin', 'global_Mixin' ],
'fields' => { #false laziness w/cdr_termination
@@
-177,7
+177,11
@@
sub calc_recur {
my $classnum = ''; #usage class?
#option to turn off? or just use squelch_cdr for the customer probably
my $classnum = ''; #usage class?
#option to turn off? or just use squelch_cdr for the customer probably
- push @$details, [ 'C', $call_details, $cost, $classnum ];
+ # XXX use detail_format for this at some point
+ push @$details, { 'format' => 'C',
+ 'detail' => $call_details,
+ 'amount' => $cost,
+ 'classnum' => $classnum };
#eofalse laziness w/cdr_termination
#eofalse laziness w/cdr_termination
@@
-189,7
+193,8
@@
sub calc_recur {
#eo CDR calculations
#eo CDR calculations
- $charges += ($cust_pkg->quantity || 1) * $self->calc_recur_Common(@_);
+ $charges += ($cust_pkg->quantity || 1)
+ * $self->calc_recur_Common($cust_pkg, $sdate, $details, $param);
$charges;
}
$charges;
}