Changeset 863
- Timestamp:
- 07/07/08 09:12:26 (3 months ago)
- Files:
-
- trunk/common/lib/Class.RateEngine.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/common/lib/Class.RateEngine.php
r860 r863 365 365 366 366 $table_packages = new Table("cc_package_group,cc_packgroup_package,cc_package_offer,cc_package_rate", "cc_package_offer.id, packagetype,billingtype,startday,freetimetocall"); 367 $clause_packages= "cc_package_group.id= ".$id_cc_package_group." AND cc_package_group.id=cc_packgroup_package.packagegroup_id AND cc_packgroup_package.package_id = cc_package_offer.id AND cc_package_offer.id = cc_package_rate.package_id AND cc_package_rate.rate_id = ".$id_rate;367 $clause_packages= "cc_package_group.id= ".$id_cc_package_group." AND cc_package_group.id=cc_packgroup_package.packagegroup_id AND cc_packgroup_package.package_id = cc_package_offer.id AND cc_package_offer.id = cc_package_rate.package_id AND cc_package_rate.rate_id = ".$id_rate; 368 368 $order_packages = "cc_package_offer.packagetype"; 369 369 $sens_packages = "ASC"; 370 $result_packages= $table_ agent_security -> Get_list ($HD_Form-> DBHandle, $clause_packages, $order_packages, $sens_packages, null, null, null, null);370 $result_packages= $table_packages -> Get_list ($A2B -> DBHandle, $clause_packages, $order_packages, $sens_packages, null, null, null, null); 371 371 $idx_pack = 0; 372 372 if(!empty($result_packages)) … … 385 385 case 0 : $this -> freecall[$K] = true; 386 386 $package_selected = true; 387 $ package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=>gettext("Unlimited calls"),"type"=>$packagetype);387 $this -> package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=>"Unlimited calls","type"=>$packagetype); 388 388 break; 389 389 // 1 : FREE CALLS … … 394 394 $this -> freecall[$K] = true; 395 395 $package_selected = true; 396 $ package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=> gettext("Number of Free calls"),"type"=>$packagetype);396 $this ->package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=> "Number of Free calls","type"=>$packagetype); 397 397 } 398 398 } … … 406 406 $this -> freetimetocall_left[$K] = $freetimetocall - $this->freetimetocall_used; 407 407 if ($this -> freetimetocall_left[$K] < 0) $this -> freetimetocall_left[$K] = 0; 408 if ($this -> freetimetocall_left[$K] > 0) $package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=> gettext("Free minutes"),"type"=>$packagetype); 408 if ($this -> freetimetocall_left[$K] > 0) { 409 $package_selected = true; 410 $this ->package_to_apply [$K] = array("id"=>$id_cc_package_offer,"label"=> "Free minutes","type"=>$packagetype); 411 } 409 412 410 413 } … … 915 918 $dialstatus = $this -> dialstatus; 916 919 } 917 918 $id_card_package_offer = 0; 920 $id_card_package_offer =0; 919 921 if ($sessiontime > 0) { 920 922 // HANDLE FREETIME BEFORE CALCULATE THE COST … … 924 926 925 927 if (($id_cc_package_group!=-1) && ($this ->package_to_apply[$K] !=null )){ 926 928 929 //$id_card_package_offer = $this ->package_to_apply[$K]["id"]; 927 930 switch($this ->package_to_apply[$K]["type"] ){ 928 931 //Unlimited
