[Astpp-commit] SF.net SVN: astpp: [2129] trunk/astpp-common.pl
Brought to you by:
darrenkw
|
From: <dar...@us...> - 2007-09-22 05:15:37
|
Revision: 2129
http://astpp.svn.sourceforge.net/astpp/?rev=2129&view=rev
Author: darrenkw
Date: 2007-09-21 22:15:34 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Resolve Bug: [ 1800039 ] Call rating issue
The "post_cdr" subroutine was being called incorrectly.
Modified Paths:
--------------
trunk/astpp-common.pl
Modified: trunk/astpp-common.pl
===================================================================
--- trunk/astpp-common.pl 2007-09-19 01:57:11 UTC (rev 2128)
+++ trunk/astpp-common.pl 2007-09-22 05:15:34 UTC (rev 2129)
@@ -1077,21 +1077,21 @@
$didinfo = &get_did_reseller($astpp_db,$did,$accountdata->{reseller});
if ($didinfo->{disconnectionfee} != 0) {
$dest = gettext("DID:") . $did . gettext(" disconnection fee");
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
}
$accountdata = &get_account($astpp_db, $accountdata->{reseller});
}
$didinfo = &get_did($astpp_db,$did,$account);
if ($didinfo->{disconnectionfee} != 0) {
$dest = gettext("DID:") . $did . gettext(" disconnection fee");
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
}
$accountdata = &get_account($astpp_db,$account);
} else {
$didinfo = &get_did($astpp_db,$did,$account);
if ($didinfo->{disconnectionfee} != 0) {
$dest = gettext("DID:") . $did . gettext(" disconnection fee");
- &post_cdr($astpp_db,,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$didinfo->{disconnectionfee},$callstart,$accountdata->{postexternal},'',$notes);
}
}
# If we got this far the cdrs have been posted and we're ready to cancel the DID.
@@ -1196,11 +1196,11 @@
if ($didinfo->{chargeonallocation} == 1) {
my $dest = gettext("DID:") . $did . gettext(" from ")
. $start_date . gettext(" to ") . $end_date;
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$cost,$callstart,$accountinfo->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$cost,$callstart,$accountinfo->{postexternal},'',$notes);
}
if ($didinfo->{setup} != 0) {
my $dest = gettext("DID:") . $did . gettext(" setup fee");
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountinfo->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountinfo->{postexternal},'',$notes);
}
$accountdata = &get_account($astpp_db,$accountdata->{reseller});
}
@@ -1215,11 +1215,11 @@
if ($didinfo->{chargeonallocation} == 1) {
my $dest = gettext("DID:") . $did . gettext(" from ")
. $start_date . gettext(" to ") . $end_date;
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$cost,$callstart,$accountdata->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$cost,$callstart,$accountdata->{postexternal},'',$notes);
}
if ($didinfo->{setup} != 0) {
$dest = gettext("DID:") . $did . gettext(" setup fee");
- &post_cdr($astpp_db,'',$accountdata->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountdata->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountdata->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountdata->{postexternal},'',$notes);
}
} else {
my $did_min_available = $didinfo->{monthlycost} + $didinfo->{setup} + $didinfo->{disconnectionfee};
@@ -1235,11 +1235,11 @@
if ($didinfo->{chargeonallocation} == 1) {
my $dest = gettext("DID:") . $did . gettext(" from ")
. $start_date . gettext(" to ") . $end_date;
- &post_cdr($astpp_db,'',$accountinfo->{number},'',$dest,'','',$cost,$callstart,$accountinfo->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountinfo->{number},'',$dest,'','',$cost,$callstart,$accountinfo->{postexternal},'',$notes);
}
if ($didinfo->{setup} != 0) {
$dest = gettext("DID:") . $did . gettext(" setup fee");
- &post_cdr($astpp_db,'',$accountinfo->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountinfo->{postexternal},'',$notes);
+ &post_cdr($astpp_db,$config,'',$accountinfo->{number},'',$dest,'','',$didinfo->{setup},$callstart,$accountinfo->{postexternal},'',$notes);
}
}
}
@@ -2166,7 +2166,7 @@
# Write ASTPP cdr. I think this one is mostly deprecated but should probably be completely removed.
sub post_cdr() {
my (
- $astpp_db, $uniqueid, $account, $clid,
+ $astpp_db, $config, $uniqueid, $account, $clid,
$dest, $disp, $seconds, $cost, $callstart,
$postexternal, $trunk, $notes
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|