Changeset 860

Timestamp:

07/06/08 11:44:17 (2 months ago)

Author:

rach

Message:

new free packages system

Files:

• trunk/admin/Public/A2B_entity_card_group.php (modified) (1 diff)
• trunk/admin/Public/A2B_entity_package_group.php (added)
• trunk/admin/Public/form_data/FG_var_package_group.inc (added)
• trunk/admin/Public/form_data/FG_var_package.inc (modified) (4 diffs)
• trunk/admin/Public/form_data/FG_var_tariffgroup.inc (modified) (2 diffs)
• trunk/admin/Public/templates/default/main.tpl (modified) (1 diff)
• trunk/common/lib/Class.A2Billing.php (modified) (3 diffs)
• trunk/common/lib/Class.RateEngine.php (modified) (12 diffs)
• trunk/common/lib/interface/constants.php (modified) (1 diff)
• trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql (modified) (1 diff)

trunk/admin/Public/A2B_entity_card_group.php

@@ -37 +37 @@
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-if ($popup_select)
-{
-?>
-        <SCRIPT LANGUAGE="javascript">
-        <!-- Begin
-        function sendValue(selvalue) {
-                window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
-                window.close();
-        }
-        // End -->
-        </script>
-<?php
-}
-
-
-// #### HELP SECTION
-if (!$popup_select) echo $CC_help_provid
+echo $CC_help_list_custom
-
-
-echo $CALL_LABS;
-
-

trunk/admin/Public/form_data/FG_var_package.inc

@@ -12 +12 @@
-$billingtype_list = Constants::getBillingPeriodsList();
-
+// If packagetype == NUMBER OF FREE CALL -> concat unit with "times"
+// Else concat with "sec"
+$filter_unit ='CASE packagetype WHEN 1 THEN CONCAT( freetimetocall, " times" ) WHEN 0 THEN "ALL" ELSE CONCAT( freetimetocall, " sec" ) END ';
-
-$HD_Form -> AddViewElement(gettext("LABEL"), "label", "18%", "center", "sort");
@@ -18 +21 @@
-$HD_Form -> AddViewElement(gettext("BILLINGTYPE"), "billingtype", "15%", "center", "sort","","list",$billingtype_list);
-$HD_Form -> AddViewElement(gettext("STARTDAY"), "startday", "7%", "center", "sort");
- CALL"), "freetimetocall", "7%", "center", "sort", "30", "", "", "", "", "", "display_minute
+"), "freetimetocall", "17%", "center", "sort", "30", "", "", "", "", "", "
-
-freetimetocall'
+'.$filter_unit
-
-$HD_Form -> FG_ACTION_SIZE_COLUMN='15%';
@@ -74 +77 @@
-
-
-TIME TO CALL
+UNITS
-   "freetimetocall",    
-   '$value',    
@@ -81 +84 @@
-   "4", 
-   gettext("Insert the amount of free time to call (seconds)"),
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$HD_Form -> FieldEditElement ('label, packagetype, billingtype, startday, freetimetocall');

trunk/admin/Public/form_data/FG_var_tariffgroup.inc

@@ -33 +33 @@
-if (!$popup_select) $HD_Form -> AddViewElement(gettext("CREATIONDATE"), "creationdate", "20%", "center", "sort", "19", "", "", "", "", "", "display_dateformat");
-$HD_Form -> AddViewElement(gettext("LC TYPE"), "lcrtype", "15%", "center", "sort", "", "list", $lcrtype_list_short);
-offer", "label
+group", "name
-$HD_Form -> AddViewElement(gettext("INTER PREFIX"), "removeinterprefix", "15%", "center", "sort", "", "list", $inter_prefix_list_short);
-
@@ -95 +95 @@
-        "", "", "",
-        "sql",
-offer
-label
-
+group
+name
+Group 
-
-$HD_Form -> AddEditElement (gettext("REMOVE INTER PREFIX"),

trunk/admin/Public/templates/default/main.tpl

@@ -156 +156 @@
-                <ul>
-                        <li><ul>
+                                <li><a href="A2B_entity_package_group.php?atmenu=prefixe&stitle=Prefix&section=3_3">{php} echo gettext("List Group Packages");{/php}</a></li>
+                                <li><a href="A2B_entity_package_group.php?form_action=ask-add&atmenu=prefixe&stitle=Prefix&section=3_3">{php} echo gettext("Add Group Packages");{/php}</a></li>
-                                <li><a href="A2B_entity_package.php?atmenu=prefixe&stitle=Prefix&section=3_3">{php} echo gettext("List Offer Package");{/php}</a></li>
-                                <li><a href="A2B_entity_package.php?form_action=ask-add&atmenu=prefixe&stitle=Prefix&section=3_3">{php} echo gettext("Add Offer Package");{/php}</a></li>

trunk/common/lib/Class.A2Billing.php

@@ -773 +773 @@
-                                $id_cc_package_offer = $result[0][5];
-                                $freetimetocall_used = $this->FT2C_used_seconds($this->DBHandle, $this->id_card, $id_cc_package_offer, $billingtype, $startday);
+                                
+                                //TO MANAGE BY PACKAGE TYPE IT -> only for freetime
-                                if (($packagetype == 0) || ($packagetype == 1)) {
-                                        $minutes=intval(($freetime-$freetimetocall_used)/60);
@@ -792 +794 @@
-                                                $agi-> stream_file('prepaid-minute', '#');
-                                        }else{
+                                                
-                                                if((strtolower($this->agiconfig['force_language'])=='ru')&& ( ( $minutes%10==2) || ($minutes%10==3 )|| ($minutes%10==4)) ){
-                                                        // test for the specific grammatical rules in RUssian
@@ -1570 +1573 @@
-                 return $pwd;
-        }
+
+        /** Function to retrieve the number of used package Free call for a customer
+         * according to billingtype (Monthly ; Weekly) & Startday
+         *
+         *  @param object $DBHandle
+         *  @param integer $id_cc_card
+         *  @param integer $id_cc_package_offer
+         *  @param integer $billingtype
+         *  @param integer $startday
+         *  @return integer number of seconds used of FT2C package so far in this period
+         **/
+
+   function number_free_calls_used($DBHandle, $id_cc_card, $id_cc_package_offer, $billingtype, $startday){
+        
+                if ($billingtype == 0){
+                        // PROCESSING FOR MONTHLY
+                        // if > last day of the month
+                        if ($startday > date("t")) $startday = date("t");
+                        if ($startday <= 0 ) $startday = 1;
+
+                        // Check if the startday is upper that the current day
+                        if ($startday > date("j")) $year_month = date('Y-m', strtotime('-1 month'));
+                        else $year_month = date('Y-m');
+
+                        $yearmonth = sprintf("%s-%02d",$year_month,$startday);
+                        if ($this->config["database"]['dbtype'] == "postgres"){
+                                $UNIX_TIMESTAMP = "";
+                        }else{
+                                $UNIX_TIMESTAMP = "UNIX_TIMESTAMP";
+                        }
+                        $CLAUSE_DATE=" $UNIX_TIMESTAMP(date_consumption) >= $UNIX_TIMESTAMP('$yearmonth')";
+                }else{
+                        // PROCESSING FOR WEEKLY
+                        $startday = $startday % 7;
+                        $dayofweek = date("w"); // Numeric representation of the day of the week 0 (for Sunday) through 6 (for Saturday)
+                        if ($dayofweek==0) $dayofweek=7;
+                        if ($dayofweek < $startday) $dayofweek = $dayofweek + 7;
+                        $diffday = $dayofweek - $startday;
+                        if ($this->config["database"]['dbtype'] == "postgres"){
+                                $CLAUSE_DATE = "date_consumption >= (CURRENT_DATE - interval '$diffday day') ";
+                        }else{
+                                $CLAUSE_DATE = "date_consumption >= DATE_SUB(CURRENT_DATE, INTERVAL $diffday DAY) ";
+                        }
+                }
+                $QUERY = "SELECT  COUNT(*) AS number_calls FROM cc_card_package_offer ".
+                                 "WHERE $CLAUSE_DATE AND id_cc_card = '$id_cc_card' AND id_cc_package_offer = '$id_cc_package_offer' ";
+                $pack_result = $DBHandle -> Execute($QUERY);
+                if ($pack_result && ($pack_result -> RecordCount() > 0)) {
+                        $result = $pack_result -> fetchRow();
+                        $number_calls_used = $result[0];
+                } else {
+                        $number_calls_used = 0;
+                }
+                return $number_calls_used;
+        
+   }
-
-

trunk/common/lib/Class.RateEngine.php

@@ -25 +25 @@
-
-        var $freetimetocall_left = array();
+        var $freecall = array();
+        var $package_to_apply= array();
-
-        var $number_trunk               = 0;
@@ -161 +163 @@
-                        $prefixclause .= "'X', '[0-9]', 'g'), 'Z', '[1-9]', 'g'), 'N', '[2-9]', 'g'), E'\\\\.', '+', 'g'), '_', '', 'g'))";
-                }
-
+
-                $QUERY = "SELECT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-                FROM cc_tariffgroup
@@ -187 +184 @@
-                LEFT JOIN cc_trunk AS rt_trunk ON cc_ratecard.id_trunk=rt_trunk.id_trunk
-                LEFT JOIN cc_trunk AS tp_trunk ON cc_tariffplan.id_trunk=tp_trunk.id_trunk
-                LEFT JOIN cc_package_offer ON cc_package_offer.id=cc_tariffgroup.id_cc_package_offer
-
-                WHERE cc_tariffgroup.id=$tariffgroupid AND ($prefixclause)
@@ -264 +260 @@
-
-                        if ($result[$i][34] == -1) {
-51
+46
-                                $mylistoftrunk_next[]= $mycurrenttrunk = $result[$i][29];
-                        } else {
-52
+47
-                                $mylistoftrunk_next[]= $mycurrenttrunk = $result[$i][34];
-                        }
@@ -356 +352 @@
-                $billingblockc                                  = $this -> ratecard_obj[$K][28];
-                // ****************  PACKAGE PARAMETERS ****************
-
-
-
-
-
-
-
+
+
+
-                // CHANGE THIS - ONLY ALLOW FREE TIME FOR CUSTOMER THAT HAVE MINIMUM CREDIT TO CALL A DESTINATION
-
-                // WE HAVE THE SAME CALL PLAN FOR ALL SO WE CAN RESTRICT THIS CALCULATION TO 1 BEFORE EACH CALL
-                $this -> freetimetocall_left[$K] = 0;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                $credit -= $connectcharge;
@@ -419 +462 @@
-                if ($rateinitial<=0){
-                        $this -> ratecard_obj[$K]['timeout']= $A2B->agiconfig['maxtime_tocall_negatif_free_route']; // 90 min
+                        if ($this -> debug_st) print_r($this -> ratecard_obj[$K]);
+                        return $TIMEOUT;
+                }
+                
+                if ($this -> freecall[$K]){
+                        if(     $this -> package_to_apply [$K] ["type"] == 0){
+                                $this -> ratecard_obj[$K]['timeout']= $A2B->agiconfig['maxtime_tounlimited_calls']; // default : 90 min
+                        }else{
+                                $this -> ratecard_obj[$K]['timeout']= $A2B->agiconfig['maxtime_tofree_calls'];
+                        }
+                        
-                        if ($this -> debug_st) print_r($this -> ratecard_obj[$K]);
-                        return $TIMEOUT;
@@ -649 +703 @@
-                $billingblockc                                  = $this -> ratecard_obj[$K][28];
-                // Initialization rounding calltime and rounding threshold variables
-9
-60
+4
+55
-                // Initialization additional block charge and additional block charge time variables
-61
-62
+56
+57
-
-                if (!is_numeric($rounding_calltime))                    $rounding_calltime = 0;
@@ -703 +757 @@
-                $buyratecost -= ($buyratecallduration/60) * $buyrate;
-                if ($this -> debug_st)  echo "1. cost: $cost\n buyratecost:$buyratecost\n";
+
+        // IF IT S A FREE CALL, WE CAN STOP HERE COST = 0
+        if($this -> freecall[$K]){
+                $this -> lastcost = 0;
+                        $this -> lastbuycost = $buyratecost;
+                        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]");
+                return; 
+        }
-
-                // ####         CALCUL SELLRATE COST   #####
@@ -841 +904 @@
-                $K = $this->usedratecard;
-                // ****************  PACKAGE PARAMETERS ****************
-
-
-offer = $this -> ratecard_obj[$K][50
+//
+//
+group= $this -> ratecard_obj[$K][45
-
-                if ($A2B -> CC_TESTING){
@@ -860 +923 @@
-                        if ($this -> debug_st) print_r($this -> freetimetocall_left[$K]);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                $this -> rate_engine_calculcost ($A2B, $sessiontime, 0);
@@ -1016 +1089 @@
-                        $addparameter   = $this -> ratecard_obj[$k][42+$usetrunk_failover];
-                        $cidgroupid             = $this -> ratecard_obj[$k][44];
-53
-5
-7
+48
+0
+2
-
-                        if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0)
@@ -1248 +1321 @@
-                } // End for
-
-1
+$loop_failover
-                $A2B -> debug( VERBOSE | WRITELOG, $agi, __FILE__, __LINE__, "[USEDRATECARD - FAIL =".$this -> usedratecard."]");
-                return false;

trunk/common/lib/interface/constants.php

@@ -142 +142 @@
-   public static function getPackagesTypeList(){
-        $packagetype_list = array();
-
-
-
-
+
+
+
-        return $packagetype_list;
-   }

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

@@ -983 +983 @@
-
-ALTER TABLE cc_card ADD id_group INT NOT NULL DEFAULT '1';
+
+--create 
+
+CREATE TABLE cc_logpackage (
+id BIGINT NOT NULL AUTO_INCREMENT ,
+call_id BIGINT NOT NULL ,
+package_id INT NOT NULL ,
+username CHAR( 40 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ,
+card_id BIGINT NOT NULL ,
+time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+PRIMARY KEY ( id )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin; 
+
+
+ CREATE TABLE cc_package_group (
+id INT NOT NULL AUTO_INCREMENT ,
+name CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ,
+description MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_bin NULL,
+PRIMARY KEY ( id )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+ CREATE TABLE cc_packgroup_package (
+packagegroup_id INT NOT NULL ,
+package_id INT NOT NULL ,
+PRIMARY KEY ( packagegroup_id , package_id )
+) ENGINE = MYISAM ;
+
+
+ CREATE TABLE cc_package_rate (
+package_id INT NOT NULL ,
+rate_id INT NOT NULL ,
+PRIMARY KEY ( package_id , rate_id )
+) ENGINE = MYISAM ;
+
+
+NSERT INTO cc_config (
+id ,
+config_title ,
+config_key ,
+config_value ,
+config_description ,
+config_valuetype ,
+config_group_id ,
+config_listvalues
+)
+VALUES (
+NULL , 'Max Time For Unlimited Calls', 'maxtime_tounlimited_calls', '5400', 'For unlimited calls, limit the duration: amount in seconds .', '0', '11', NULL
+), (
+NULL , 'Max Time For Free Calls', 'maxtime_tofree_calls', '5400', 'For free calls, limit the duration: amount in seconds .', '0', '11', NULL
+);