Changeset 652

Timestamp:

04/23/08 14:30:36 (7 months ago)

Author:

areski

Message:

Big bug if we have more that one Call Plan with LCR : the processing of LCR will not be exact !

Files:

• branches/1.3/A2BCustomer_UI/lib/Class.RateEngine.php (modified) (5 diffs)
• branches/1.3/A2Billing_AGI/libs_a2billing/Class.RateEngine.php (modified) (2 diffs)
• branches/1.3/A2Billing_UI/lib/Class.RateEngine.php (modified) (4 diffs)

branches/1.3/A2BCustomer_UI/lib/Class.RateEngine.php

@@ -166 +166 @@
-                
-                FROM cc_tariffgroup 
-.id=$tariffgroup
+_plan.idtariffgroup=cc_tariffgroup.
-                INNER JOIN cc_tariffplan ON (cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan )
-                LEFT JOIN cc_ratecard ON cc_ratecard.idtariffplan=cc_tariffplan.id
@@ -173 +173 @@
-                LEFT JOIN cc_package_offer ON cc_package_offer.id=cc_tariffgroup.id_cc_package_offer
-                
-
+cc_tariffgroup.id=$tariffgroupid AND 
-                AND startingdate<= CURRENT_TIMESTAMP AND (expirationdate > CURRENT_TIMESTAMP OR expirationdate IS NULL OR LENGTH(expirationdate)<5)
-                AND startdate<= CURRENT_TIMESTAMP AND (stopdate > CURRENT_TIMESTAMP OR stopdate IS NULL OR LENGTH(stopdate)<5)
@@ -255 +255 @@
-                {
-                        $fee=$A2B->agiconfig['extracharge_fee'][array_search($A2B->dnid, $A2B->agiconfig['extracharge_did'])];
-
+
+
-                        for ($i=0; $i<count($this->ratecard_obj); $i++)
-                        {
-
+buy
-                                $this->ratecard_obj[$i][12]+=$fee;
-                        }
@@ -969 +970 @@
-                                
-                        if ($typecall==1) $timeout = $A2B -> config["callback"]['predictivedialer_maxtime_tocall']; 
-               
+
-                        $dialparams = str_replace("%timeout%", min($timeout * 1000, $max_long), $A2B->agiconfig['dialcommand_param']);
-                        //$dialparams = "|30|HS($timeout)"; // L(".$timeout*1000.":61000:30000)
@@ -1089 +1090 @@
-                                                $destination= substr($destination, strlen($removeprefix));
-                                        }
-                                       
+
-                                        $dialparams = str_replace("%timeout%", min($timeout * 1000, $max_long), $A2B->agiconfig['dialcommand_param']);
-                                        

branches/1.3/A2Billing_AGI/libs_a2billing/Class.RateEngine.php

@@ -166 +166 @@
-                
-                FROM cc_tariffgroup 
-.id=$tariffgroup
+_plan.idtariffgroup=cc_tariffgroup.
-                INNER JOIN cc_tariffplan ON (cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan )
-                LEFT JOIN cc_ratecard ON cc_ratecard.idtariffplan=cc_tariffplan.id
@@ -173 +173 @@
-                LEFT JOIN cc_package_offer ON cc_package_offer.id=cc_tariffgroup.id_cc_package_offer
-                
-
+cc_tariffgroup.id=$tariffgroupid AND 
-                AND startingdate<= CURRENT_TIMESTAMP AND (expirationdate > CURRENT_TIMESTAMP OR expirationdate IS NULL OR LENGTH(expirationdate)<5)
-                AND startdate<= CURRENT_TIMESTAMP AND (stopdate > CURRENT_TIMESTAMP OR stopdate IS NULL OR LENGTH(stopdate)<5)

branches/1.3/A2Billing_UI/lib/Class.RateEngine.php

@@ -166 +166 @@
-                
-                FROM cc_tariffgroup 
-.id=$tariffgroup
+_plan.idtariffgroup=cc_tariffgroup.
-                INNER JOIN cc_tariffplan ON (cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan )
-                LEFT JOIN cc_ratecard ON cc_ratecard.idtariffplan=cc_tariffplan.id
@@ -173 +173 @@
-                LEFT JOIN cc_package_offer ON cc_package_offer.id=cc_tariffgroup.id_cc_package_offer
-                
-
+cc_tariffgroup.id=$tariffgroupid AND 
-                AND startingdate<= CURRENT_TIMESTAMP AND (expirationdate > CURRENT_TIMESTAMP OR expirationdate IS NULL OR LENGTH(expirationdate)<5)
-                AND startdate<= CURRENT_TIMESTAMP AND (stopdate > CURRENT_TIMESTAMP OR stopdate IS NULL OR LENGTH(stopdate)<5)
@@ -255 +255 @@
-                {
-                        $fee=$A2B->agiconfig['extracharge_fee'][array_search($A2B->dnid, $A2B->agiconfig['extracharge_did'])];
-
+
+
-                        for ($i=0; $i<count($this->ratecard_obj); $i++)
-                        {
-
+buy
-                                $this->ratecard_obj[$i][12]+=$fee;
-                        }
@@ -969 +970 @@
-                                
-                        if ($typecall==1) $timeout = $A2B -> config["callback"]['predictivedialer_maxtime_tocall']; 
-               
+
-                        $dialparams = str_replace("%timeout%", min($timeout * 1000, $max_long), $A2B->agiconfig['dialcommand_param']);
-                        //$dialparams = "|30|HS($timeout)"; // L(".$timeout*1000.":61000:30000)