$extra_sql .= ' AND cdrtypenum IN ('. join(',', @cdrtypenums ). ')';
}
-our %svcnum = (); # phonenum => svcnum
-our %pkgnum = (); # phonenum => pkgnum
-our %cust_pkg = (); # pkgnum => cust_pkg (NOT phonenum => cust_pkg!)
-our %pkgpart = (); # phonenum => pkgpart
-our %part_pkg = (); # pkgpart => part_pkg
+#our %svcnum = (); # phonenum => svcnum
+our %svc_phone = (); # phonenum => svc_phone
+our %pkgnum = (); # phonenum => pkgnum
+our %cust_pkg = (); # pkgnum => cust_pkg (NOT phonenum => cust_pkg!)
+our %pkgpart = (); # phonenum => pkgpart
+our %part_pkg = (); # pkgpart => part_pkg
#some false laziness w/freeside-cdrrewrited
if $prefix eq substr($number, 0, length($prefix));
}
- unless ( $svcnum{$number} ) {
+ unless ( $svc_phone{$number} ) {
#only phone number matching supported right now
my $svc_phone = qsearchs('svc_phone', { 'phonenum' => $number } );
unless ( $svc_phone ) {
next;
}
- $svcnum{$number} = $svc_phone->svcnum;
+ $svc_phone{$number} = $svc_phone;
- my $cust_pkg = $svc_phone->cust_svc->cust_pkg;
+ }
+
+ unless ( $pkgnum{$number} ) {
+
+ my $cust_pkg = $svc_phone{$number}->cust_svc->cust_pkg;
unless ( $cust_pkg ) {
#XXX unlinked svc_phone?
# warn and also set freesideratestatus or somesuch?
$pkgnum{$number} = $cust_pkg->pkgnum;
$cust_pkg{$cust_pkg->pkgnum} ||= $cust_pkg;
+ }
+
+ unless ( $pkgpart{$number} ) {
+
#get the package, search through the part_pkg and linked for a voip_cdr def w/matching cdrtypenum (or no use_cdrtypenum)
my @part_pkg =
grep { $_->plan eq 'voip_cdr'
)
}
- $cust_pkg->part_pkg->self_and_bill_linked;
+ $cust_pkg{ $pkgnum{$number} }->part_pkg->self_and_bill_linked;
if ( ! @part_pkg ) {
#XXX no package for this CDR
my $error = $cdr->rate(
'part_pkg' => $part_pkg{ $pkgpart{$number} },
'cust_pkg' => $cust_pkg{ $pkgnum{$number} },
- 'svcnum' => $svcnum{$number},
+ 'svcnum' => $svc_phone{$number}->svcnum,
);
if ( $error ) {
- #XXX ???
- warn $error;
- sleep 30;
+ warn "Can't prerate CDR ". $cdr->acctid. ' to '. $cdr->dst. ": $error";
+ #could be an included minutes CDR, so don't sleep 30;
} else {
#this could get expensive on a per-call basis