Changeset 877

Timestamp:

07/10/08 09:02:44 (2 months ago)

Author:

rach

Message:

add minimum cost for the rate...
Correct the billing when you using grace

Files:

• trunk/admin/Public/form_data/FG_var_def_ratecard.inc (modified) (3 diffs)
• trunk/common/lib/Class.RateEngine.php (modified) (9 diffs)
• trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql (modified) (1 diff)
• trunk/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.4.0-pgsql.sql (modified) (1 diff)

trunk/admin/Public/form_data/FG_var_def_ratecard.inc

@@ -5 +5 @@
-'stepchargea', 'chargea', 'timechargea', 'billingblocka', 'stepchargeb', 'chargeb', 'timechargeb',
-'billingblockb', 'stepchargec', 'chargec', 'timechargec', 'billingblockc', 'startdate', 'stopdate',
-
+,'minimal_cost'
-
-// put all the destination name to lowercase
@@ -254 +254 @@
-   gettext("Insert the disconnect charge"),
-   "" , "", "", "", "", "", "NO", gettext("Apply a disconnection charge" ));
-
+
+
+
+
+
+
+
+
+
+
-if (ADVANCED_MODE){
-        $HD_Form -> AddEditElement(gettext("STEPCHARGE A"),
@@ -506 +515 @@
-if (ADVANCED_MODE) {
-        // This Variable store the argument for the SQL query
-
+minimal_cost, 
-}else{
-        // This Variable store the argument for the SQL query
-
+minimal_cost, 
-}
-

trunk/common/lib/Class.RateEngine.php

@@ -176 +176 @@
-        id_cc_package_offer,tp_trunk.status, rt_trunk.status, tp_trunk.inuse, rt_trunk.inuse, 
-        tp_trunk.maxuse,  rt_trunk.maxuse,tp_trunk.if_max_use, rt_trunk.if_max_use,cc_ratecard.rounding_calltime AS rounding_calltime,
-
+, cc_ratecard.minimal_cost AS minimal_cost
-
-                FROM cc_tariffgroup
@@ -721 +721 @@
-                $additional_block_charge                = $this->ratecard_obj[$K][56];
-                $additional_block_charge_time   = $this->ratecard_obj[$K][57];
-
+
+
-
-                if (!is_numeric($rounding_calltime))                    $rounding_calltime = 0;
@@ -737 +738 @@
-
-                $this -> real_answeredtime = $callduration;
-
-
-
+
-                
-                /*
@@ -764 +763 @@
-
-                // ####         CALCUL BUYRATE COST   #####
-
+ + $additional_grace_time
-
-                $buyratecost =0;
@@ -881 +880 @@
-                if ($this -> debug_st)  echo "FINAL COST: $cost\n\n";
-                $A2B -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[CC_RATE_ENGINE_CALCULCOST: K=$K - BUYCOST: $buyratecost - SELLING COST: $cost]");
-
+
+
+
+
+
+
-                $this -> lastbuycost = $buyratecost;
+                
-        }
-
@@ -925 +930 @@
-                //$freetimetocall = $this -> ratecard_obj[$K][46];
-                $id_cc_package_group= $this -> ratecard_obj[$K][45];
-
+
-                if ($A2B -> CC_TESTING){
-                        $sessiontime = 120;
@@ -962 +967 @@
-                                // rate_engine_calculcost could have change the duration of the call
-                                $sessiontime = $this -> answeredtime;
+                                //add grace time
+                                if($sessiontime>0 && $additional_grace_time>0){
+                                        $sessiontime = $sessiontime + $additional_grace_time;
+                                }
-
-                                $QUERY_FIELS = 'id_cc_card, id_cc_package_offer, used_secondes';
@@ -970 +979 @@
-
-                                $this -> rate_engine_calculcost ($A2B, $sessiontime, 0);
-
+
-                                // rate_engine_calculcost could have change the duration of the call
-                                $sessiontime = $this -> answeredtime;
+                                if($sessiontime>0 && $additional_grace_time>0){
+                                        $sessiontime = $sessiontime + $additional_grace_time;
+                                }
-                        }
-
@@ -1302 +1314 @@
-                                        $answeredtime = $agi->get_variable("ANSWEREDTIME");
-                                        $this -> real_answeredtime = $this -> answeredtime = $answeredtime['data'];
+                                        
-                                        $dialstatus = $agi -> get_variable("DIALSTATUS");
-                                        $this -> dialstatus = $dialstatus['data'];

trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql

@@ -1005 +1005 @@
-
-ALTER TABLE cc_ratecard ADD additional_grace INT NOT NULL DEFAULT '0';
+
+ALTER TABLE cc_ratecard ADD minimal_cost FLOAT NOT NULL DEFAULT '0';

trunk/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.4.0-pgsql.sql

@@ -997 +997 @@
- ( 'Max Time For Free Calls', 'maxtime_tofree_calls', '5400', 'For free calls, limit the duration: amount in seconds .', '0', '11', NULL);
-
- 
+;
--- add additionnal grace to the ratecard
-
-ALTER TABLE cc_ratecard ADD additional_grace integer NOT NULL DEFAULT 0;
-
+ALTER TABLE cc_ratecard ADD minimal_cost real NOT NULL DEFAULT 0;