Changeset 874

Timestamp:

07/09/08 14:46:33 (2 months ago)

Author:

rach

Message:

Developpement to add grace in cost of the calls

Files:

• trunk/admin/Public/form_data/FG_var_def_ratecard.inc (modified) (7 diffs)
• trunk/common/lib/Class.RateEngine.php (modified) (4 diffs)

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',
-freetimetocall_package_offer', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 'rounding_threshold', 'additional_block_charge', 'additional_block_charge_tim
+musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 'rounding_threshold', 'additional_block_charge', 'additional_block_charge_time', 'additional_grac
-
-// put all the destination name to lowercase
@@ -52 +52 @@
-                
-                /*      Query for LCR 
-cc_ratecard.freetimetocall_package_offer,
+
-
-                        FROM cc_tariffgroup RIGHT JOIN cc_tariffgroup_plan ON cc_tariffgroup.id= '7' INNER JOIN cc_tariffplan ON (cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan ) LEFT JOIN cc_ratecard ON cc_ratecard.idtariffplan=cc_tariffplan.id
@@ -94 +94 @@
-if (!$popup_select) $HD_Form -> AddViewElement("<acronym title=\"CONNECT CHARGE\">".gettext("CC")."</acronym>", "connectcharge", "4%", "center", "sort");
-if (!$popup_select) $HD_Form -> AddViewElement(gettext("TRUNK"), "id_trunk", "12%", "center", "sort", "15", "lie", "cc_trunk", "trunkcode", "id_trunk='%id'", "%1");
-if (!$popup_select) $HD_Form -> AddViewElement(gettext("<acronym title=\"FREE TIME TO CALL\">".gettext("FTC")."</acronym>"), "freetimetocall_package_offer", "3%", "center", "sort", "", "list", $yesno);
-//$HD_Form -> AddViewElement(gettext("CIDGroup"), "id_outbound_cidgroup", "12%", "center", "sort", "15", "lie", "cc_outbound_cid_group", "group_name", "id='%id'", "%1");
-
-
-if (!$popup_select) {
-, cc_ratecard.freetimetocall_package_offer
+
-} else {
-        $HD_Form -> FieldViewElement ('cc_ratecard.id, cc_ratecard.destination, cc_ratecard.dialprefix, cc_ratecard.buyrate, cc_ratecard.rateinitial');
@@ -118 +117 @@
-                $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');";
-} else {
-cc_ratecard.freetimetocall_package_offer,
+
-        $HD_Form -> FieldExportElement ('DISTINCT cc_ratecard.destination, cc_ratecard.dialprefix, cc_ratecard.rateinitial');
-        $HD_Form -> FG_EXPORT_CSV = true;
@@ -455 +454 @@
-   gettext("Insert the additional block charge time"),
-   "", "", "", "", "", "", "", gettext("Set the initial block charge time"));
+   
+$HD_Form -> AddEditElement(gettext("ADDITIONAL GRACE TIME"),
+   "additional_grace",
+   '$value',
+   "INPUT",
+   "size=40 maxlength=40",
+   "",
+   gettext("Insert the additional grace time in sec"),
+   "", "", "", "", "", "", "", gettext("Set the additional grace time in sec"));
-
-$HD_Form -> AddEditElement(gettext("TRUNK"),
@@ -466 +474 @@
-        "", "", "%1", "", gettext("Set the trunk to use for this destination, or NOT DEFINED to use the rate card trunk."), '', '<OPTION  value="-1" selected>NOT DEFINED</OPTION>');
-
-$HD_Form -> AddEditElement (gettext("USE FREE TIME TO CALL PACKAGE"),
-   "freetimetocall_package_offer",
-   '0',
-   "RADIOBUTTON",
-   "", "", gettext("Choose to use this destination with the freetimetocall package offer."),
-   "" , 
-   "", 
-   "" , 
-   "No:0, - Yes :1",    "", "", "", gettext("Set to use this destination with the freetimetocall package offer."));
-        
-$HD_Form -> AddEditElement(gettext("CIDGroup"),
-   "id_outbound_cidgroup",
@@ -508 +506 @@
-if (ADVANCED_MODE) {
-        // This Variable store the argument for the SQL query
- id_trunk, freetimetocall_package_offer,
+additional_grace, id_trunk, 
-}else{
-        // This Variable store the argument for the SQL query
- id_trunk, freetimetocall_package_offer,
+additional_grace, id_trunk, 
-}
-

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.additional_grace AS additional_grace
-
-                FROM cc_tariffgroup
@@ -721 +721 @@
-                $additional_block_charge                = $this->ratecard_obj[$K][56];
-                $additional_block_charge_time   = $this->ratecard_obj[$K][57];
+                $additional_grace                               = $this->ratecard_obj[$K][58];
-
-                if (!is_numeric($rounding_calltime))                    $rounding_calltime = 0;
@@ -736 +737 @@
-
-                $this -> real_answeredtime = $callduration;
-
+
+
+
+
-                /*
-                 * In following condition callduration will be updated
@@ -785 +789 @@
-                        $this -> freetimetocall_used = $callduration;
-                }
+                
-
-                $callduration = $callduration - $this->freetimetocall_used;