iNextrix / ASTPP

web_interface/astpp/application/views/footer.php

Spacing +6 added lines, -6 removed lines

@@ -7,15 +7,15 @@
 	
   <?php
 	$this->db->select('*');
-	$this->db->where('domain',$_SERVER['HTTP_HOST']);
-	$result=$this->db->get('invoice_conf');
-	if($result->num_rows() > 0){
-		$result=$result->result_array();
+	$this->db->where('domain', $_SERVER['HTTP_HOST']);
+	$result = $this->db->get('invoice_conf');
+	if ($result->num_rows() > 0) {
+		$result = $result->result_array();
 		$footer = $result[0]['website_footer'];
-	}else{
+	} else {
 		$footer = '';
 	}
-  	if($footer != ''){ ?>
+  	if ($footer != '') { ?>
 		 <div style="margin-left:470px; "><?=$footer ?>
 		 
 		 <div style="" class="pull-left">

web_interface/astpp/application/views/left_panel_master.php

Spacing +57 added lines, -58 removed lines

@@ -61,84 +61,83 @@
 <div class="sidebar collapse">

 	

              <?php 

-			 $uri_string= uri_string();

-			 $uri_arr=explode("/",$uri_string);

-			 $entity_name=false;

-			 if(isset($uri_arr[1]) && !empty($uri_arr[1])){

-					$function_explode=explode("_",$uri_arr[1]);

-				   $entity_name = isset($function_explode[1]) && !empty($function_explode[1]) ? $function_explode[0] : false;

+			 $uri_string = uri_string();

+			 $uri_arr = explode("/", $uri_string);

+			 $entity_name = false;

+			 if (isset($uri_arr[1]) && ! empty($uri_arr[1])) {

+					$function_explode = explode("_", $uri_arr[1]);

+				   $entity_name = isset($function_explode[1]) && ! empty($function_explode[1]) ? $function_explode[0] : false;

 			 }

              

-			 $accountinfo=$this->session->userdata('accountinfo');

-			 if($accountinfo['type'] != 0  && $accountinfo['type'] !=3){

-			  $menu_info= ($uri_arr[0]=="user"

-							? unserialize(RESELLERPROFILE_ARRAY):($uri_arr[0]=="accounts"&& $entity_name =='customer'

-							? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

-							? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

-							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-			 }else{

-			   $menu_info=null;

-			   $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

-			   $new_menu_info=array();

-				$menus=  unserialize($this->session->userdata('menuinfo'));

-				foreach($menus as $entity_key=>$entity_menu){

-					foreach($entity_menu as $entity_subkey=>$entity_submenu){

-						 foreach($entity_submenu as $subkey=>$submenus){

-							 if($submenus['module_url']==$current_menu_url){

-								 $new_menu_info=$entity_menu;

+			 $accountinfo = $this->session->userdata('accountinfo');

+			 if ($accountinfo['type'] != 0 && $accountinfo['type'] != 3) {

+			  $menu_info = ($uri_arr[0] == "user"

+							? unserialize(RESELLERPROFILE_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'customer'

+							? unserialize(CUSTOMEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'provider'

+							? unserialize(PROVIDEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'reseller' 

+							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] == "package" ? unserialize(PACKAGEEDIT_ARRAY) : false)))));

+			 } else {

+			   $menu_info = null;

+			   $current_menu_url = $uri_arr[0]."/".$uri_arr[1]."/";

+			   $new_menu_info = array();

+				$menus = unserialize($this->session->userdata('menuinfo'));

+				foreach ($menus as $entity_key=>$entity_menu) {

+					foreach ($entity_menu as $entity_subkey=>$entity_submenu) {

+						 foreach ($entity_submenu as $subkey=>$submenus) {

+							 if ($submenus['module_url'] == $current_menu_url) {

+								 $new_menu_info = $entity_menu;

 							 }

 						 }

 					}

 				}

-				foreach($new_menu_info as $key=>$value){

-					foreach($value as $subvalue){

-						$menu_info[$subvalue['menu_label']]=$subvalue['module_url'];

+				foreach ($new_menu_info as $key=>$value) {

+					foreach ($value as $subvalue) {

+						$menu_info[$subvalue['menu_label']] = $subvalue['module_url'];

 					}

 				}

 			 }

-			 if($accountinfo['type']==0 || $accountinfo['type']==3){

-		  if($uri_arr[0]=='user' && $uri_arr[1] =='user_myprofile' || $uri_arr[0]=='user' && $uri_arr[1]=='user_change_password'){

-		$menu_info=unserialize(CUSTOMERPROFILE_ARRAY);

+			 if ($accountinfo['type'] == 0 || $accountinfo['type'] == 3) {

+		  if ($uri_arr[0] == 'user' && $uri_arr[1] == 'user_myprofile' || $uri_arr[0] == 'user' && $uri_arr[1] == 'user_change_password') {

+		$menu_info = unserialize(CUSTOMERPROFILE_ARRAY);

 		  }

 			 }

-			 if(!empty($menu_info)){

+			 if ( ! empty($menu_info)) {

 				echo "<ul class='sidemenu'>";

-				$i=0;

-				foreach($menu_info as $key=>$value){ 

-				$url=($entity_name=='provider'||$entity_name =='customer' || $entity_name =='reseller' || $uri_arr[0] =="package") && isset($uri_arr[2]) && !empty($uri_arr[2])

+				$i = 0;

+				foreach ($menu_info as $key=>$value) { 

+				$url = ($entity_name == 'provider' || $entity_name == 'customer' || $entity_name == 'reseller' || $uri_arr[0] == "package") && isset($uri_arr[2]) && ! empty($uri_arr[2])

 					?

-				base_url().$value.$uri_arr[2]."/" : 

-				base_url().$value;

-				$value_flag=false;

-		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

-		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

-			$value_flag=false;

-		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

-			$value_flag=false;

-		  }else{

-			$value_flag=true;

+				base_url().$value.$uri_arr[2]."/" : base_url().$value;

+				$value_flag = false;

+		if ($acc_info['type'] == '3' || $acc_info['type'] == '0') {

+		  if ($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1') {

+			$value_flag = false;

+		  }elseif (in_array('user/user_sipdevices/', $menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips'] == 0) {

+			$value_flag = false;

+		  } else {

+			$value_flag = true;

 		  }

-				}else{

-		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

-			  if($value != "accounts/".$entity_name."_opensips/"){

-			  $value_flag=true;

-			  }else{

-			$value_flag=false;

+				} else {

+		  if (common_model::$global_config['system_config']['opensips'] == 1) {

+			  if ($value != "accounts/".$entity_name."_opensips/") {

+			  $value_flag = true;

+			  } else {

+			$value_flag = false;

 			  }

 		  }

-		  if(common_model::$global_config['system_config']['opensips']== 0 ){

-			  if($value != "accounts/".$entity_name."_sipdevices/"){

-			  $value_flag=true;

-			  }else{

-			$value_flag=false;

+		  if (common_model::$global_config['system_config']['opensips'] == 0) {

+			  if ($value != "accounts/".$entity_name."_sipdevices/") {

+			  $value_flag = true;

+			  } else {

+			$value_flag = false;

 			  }

 		  }

 				}

 

-				if($value_flag){

-					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-					if($i==0)

-						$class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+				if ($value_flag) {

+					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/") ? 'active' : '';

+					if ($i == 0)

+						$class = ($uri_arr[1] == $entity_name."_save") ? 'active' : $class;

                     

 					echo "<li class='$class'><a href ='$url'>$key</a></li>";

 				}

web_interface/astpp/application/helpers/email_csv_helper.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 }
 
 function create_csv_string($data) {
-	if (!$fp = fopen('php://temp', 'w+')) {
+	if ( ! $fp = fopen('php://temp', 'w+')) {
 		return FALSE;
 	}
 	foreach ($data as $line) {
@@ -13,13 +13,13 @@ 
 	return stream_get_contents($fp);
 }
 
-function send_csv_mail ($csvData, $body, $to, $subject,$file_name) {
+function send_csv_mail($csvData, $body, $to, $subject, $file_name) {
 	//print_r($csvData);
 	$where = array('group_title' =>'email');
 		$query = $this->CI->db_model->getSelect("*", "system", $where);
 		$query = $query->result_array();
-	foreach($query as $key=>$val){
-		$from=$val['value'];
+	foreach ($query as $key=>$val) {
+		$from = $val['value'];
 	}
 	$multipartSep = '-----'.md5(time()).'-----';
 	$headers = array(

web_interface/astpp/application/config/constants.php

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
 								"Alert Threshold"=>"user/user_alert_threshold/"
 							   ))
 );
-define("CUSTOMEREDIT_ARRAY",serialize(array(
+define("CUSTOMEREDIT_ARRAY", serialize(array(
 											  "Customer Profile"=>"accounts/customer_edit/",
 											  "SIP Devices"=>"accounts/customer_sipdevices/",
 											  "Opensips Device"=>"accounts/customer_opensips/",
@@ -70,7 +70,7 @@ 
 											 )
 							  ));
 
-define("PROVIDEREDIT_ARRAY",serialize(array(
+define("PROVIDEREDIT_ARRAY", serialize(array(
 						  "Provider Profile"=>"accounts/provider_edit/",
 											  "SIP Devices"=>"accounts/provider_sipdevices/",
 											  "Opensips Device"=>"accounts/provider_opensips/",
@@ -88,7 +88,7 @@ 
 											  "Alert Threshold"=>"accounts/provider_alert_threshold/"
 											 )
 							  ));
-define("RESELLEREDIT_ARRAY",serialize(array("Reseller Profile"=>"accounts/reseller_edit/",
+define("RESELLEREDIT_ARRAY", serialize(array("Reseller Profile"=>"accounts/reseller_edit/",
 						"DID"=>"accounts/reseller_dids/",
 											"Subscription"=>"accounts/reseller_subscription/",
 											"Invoice"=>"accounts/reseller_invoices/",
@@ -100,15 +100,15 @@ 
 											"Emails"=>"accounts/reseller_emailhistory/",
 											"Alert Threshold"=>"accounts/reseller_alert_threshold/"
 )));
-define("PACKAGEEDIT_ARRAY",  serialize( array(
+define("PACKAGEEDIT_ARRAY", serialize(array(
 											"Package Details"=>"package/package_edit/",
 											"Package Codes"=>"package/package_pattern_list/"
 									   )));
-define("CUSTOMERPROFILE_ARRAY",serialize(array(
+define("CUSTOMERPROFILE_ARRAY", serialize(array(
 			"My Profile"=>"user/user_myprofile/",
 			"Change Password"=>"user/user_change_password"
 )));
-define("DATABASE_DIRECTORY",FCPATH.'database_backup'.DIRECTORY_SEPARATOR);
+define("DATABASE_DIRECTORY", FCPATH.'database_backup'.DIRECTORY_SEPARATOR);
 define('LOCALE_REQUEST_PARAM', 'lang');
 define('WEBSITE_DOMAIN', 'messages');
 

web_interface/astpp/application/config/config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
 	exit('No direct script access allowed');
 
 /*

web_interface/astpp/application/modules/charges/models/charges_model.php

Spacing +10 added lines, -10 removed lines

@@ -63,8 +63,8 @@ 
 		$this->db->insert("charges", $add_array);
 		$insert_id = $this->db->insert_id(); 
 		$data = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $add_array['pricelist_id']));
-		if($data->num_rows > 0){
-		   foreach ($data->result_array() as $key => $value){
+		if ($data->num_rows > 0) {
+		   foreach ($data->result_array() as $key => $value) {
 				$this->common->mail_to_users('add_subscription', $value);  
 		   }
 		}
@@ -88,7 +88,7 @@ 
 		$this->db->where("id", $id);
 		$this->db->update("charges", $data);
         
-		if($data['pricelist_id'] == 0){
+		if ($data['pricelist_id'] == 0) {
 			$this->db->where("charge_id", $id);
 			$this->db->delete("charge_to_account");
 		}
@@ -103,23 +103,23 @@ 
 		$data = $data->result_array();
 		$data = $data[0];
 		$data = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $data['pricelist_id']));
-		if($data->num_rows > 0){
-		   foreach ($data->result_array() as $key => $value){
+		if ($data->num_rows > 0) {
+		   foreach ($data->result_array() as $key => $value) {
 				$this->common->mail_to_users('remove_subscription', $value);  
 		   }
 		}
 		return true;
 	}
     
-	function add_account_charges($pricelistid,$chargeid,$flag){
-		if($flag){
+	function add_account_charges($pricelistid, $chargeid, $flag) {
+		if ($flag) {
 		   $this->db->where("charge_id", $chargeid);
 		   $this->db->delete("charge_to_account");
 		}
 		$account = $this->db_model->getSelect("*", "accounts", array("pricelist_id"=>$pricelistid));
-		if($account->num_rows > 0){
-		   foreach ($account->result_array() as $key => $value){
-				$charge_arr = array("charge_id"=>$chargeid,"accountid"=>$value['id'],"assign_date"=>gmdate("Y-m-d H:i:s"));
+		if ($account->num_rows > 0) {
+		   foreach ($account->result_array() as $key => $value) {
+				$charge_arr = array("charge_id"=>$chargeid, "accountid"=>$value['id'], "assign_date"=>gmdate("Y-m-d H:i:s"));
 				$this->db->insert("charge_to_account", $charge_arr);               
 		   }
 		}

web_interface/astpp/application/modules/charges/controllers/charges.php

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
 		$this->load->model('charges_model');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function periodiccharges_add() {
@@ -75,8 +75,8 @@ 
 				$add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
 				$this->charges_model->edit_charge($add_array, $add_array['id']);
                 
-				if($add_array['pricelist_id'] > 0){
-				   $this->charges_model->add_account_charges($add_array['pricelist_id'],$add_array['id'],true);
+				if ($add_array['pricelist_id'] > 0) {
+				   $this->charges_model->add_account_charges($add_array['pricelist_id'], $add_array['id'], true);
 				}                
 				echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription updated successfully!"));
 				exit;
@@ -90,8 +90,8 @@ 
 			} else {
 				$add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
 				$charge_id = $this->charges_model->add_charge($add_array);
-				if($add_array['pricelist_id'] > 0 && $charge_id > 0){
-				   $this->charges_model->add_account_charges($add_array['pricelist_id'],$charge_id,false);
+				if ($add_array['pricelist_id'] > 0 && $charge_id > 0) {
+				   $this->charges_model->add_account_charges($add_array['pricelist_id'], $charge_id, false);
 				}                  
 				echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription added successfully!"));
 				exit;
@@ -104,7 +104,7 @@ 
 	function periodiccharges_delete($id) {
 		$this->charges_model->remove_charge($id);
 		$this->session->set_flashdata('astpp_notification', 'Subscription removed successfully!');
-		redirect(base_url() . 'charges/periodiccharges/');
+		redirect(base_url().'charges/periodiccharges/');
 	}
 
 	function periodiccharges_search() {
@@ -120,7 +120,7 @@ 
 			$this->session->set_userdata('charges_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'charges/periodiccharges/');
+			redirect(base_url().'charges/periodiccharges/');
 		}
 	}
 
@@ -160,9 +160,9 @@ 
 	function periodiccharges_delete_multiple() {
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$charge_where="charge_id IN(".$ids.")";
-		$this->db->delete('charge_to_account',$charge_where);
-		echo $this->db->delete("charges",$where);
+		$charge_where = "charge_id IN(".$ids.")";
+		$this->db->delete('charge_to_account', $charge_where);
+		echo $this->db->delete("charges", $where);
 	}
 	function customer_charge_list($accountid, $accounttype) {
 	
@@ -176,18 +176,18 @@ 
 		$where = array('accounts.id' => $accountid);
 		$order_type = 'id';
 		$order_by = "ASC";
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_subscription'); 
-		$like_str=!empty($instant_search) ? "(charges.description like '%$instant_search%'  
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_subscription'); 
+		$like_str = ! empty($instant_search) ? "(charges.description like '%$instant_search%'  
                                             OR  charges.charge like '%$instant_search%'
                                             OR  charges.charge like '%$instant_search%' 
                                                 )"
 										   :null;
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
 		$grid_fields = json_decode($this->charges_form->build_charges_list_for_customer($accountid, $accounttype));

web_interface/astpp/application/modules/charges/libraries/charges_form.php

Spacing +25 added lines, -25 removed lines

@@ -22,7 +22,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Charges_form {

@@ -31,7 +31,7 @@ 
 	}

    

 	function get_charge_form_fields() {

-		$form['forms'] = array(base_url() . 'charges/periodiccharges_save/', array('id' => 'charges_form', 'method' => 'POST', 'name' => 'charges_form'));

+		$form['forms'] = array(base_url().'charges/periodiccharges_save/', array('id' => 'charges_form', 'method' => 'POST', 'name' => 'charges_form'));

 		$form['Information'] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 			array('Name', 'INPUT', array('name' => 'description', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

@@ -52,13 +52,13 @@ 
 			$account_data = $this->CI->session->userdata("accountinfo");

 			$loginid = $account_data['id'];

 

-		}else{

+		} else {

 			$loginid = "0";

 		}

 		$form['forms'] = array("", array('id' => "charges_search"));

 		$form['Search'] = array(

 			array('Name', 'INPUT', array('name' => 'description[description]', '', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '1', 'description[description-string]', '', '', '', 'search_string_type', ''),

-			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array('status'=>0,'reseller_id'=>$loginid)),

+			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array('status'=>0, 'reseller_id'=>$loginid)),

 			array('Amount', 'INPUT', array('name' => 'charge[charge]', 'value' => '', 'size' => '20', 'class' => "text field"), '', 'Tool tips info', '1', 'charge[charge-integer]', '', '', '', 'search_int_type', ''),

 			array('Billing Cycle', 'sweep_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'sweep', 'sweeplist', 'build_dropdown', '', ''), 

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status'),

@@ -77,28 +77,28 @@ 
 	function build_charge_list_for_admin() {

 		

 		  $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

-	$currency_id=$account_info['currency_id'];

-	 $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);

+	$currency_id = $account_info['currency_id'];

+	 $currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);

 		

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 /**

 ASTPP  3.0 

 For DID edit on DID number

 **/

-		array(gettext("Name"), "140", "description", "", "", "","EDITABLE","true","center"),

+		array(gettext("Name"), "140", "description", "", "", "", "EDITABLE", "true", "center"),

 /**************************************************/

-			array(gettext("Rate Group"), "140", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),

-			array("Amount($currency)", "125", "charge", "charge", "charge", "convert_to_currency","","true","right"),

-			array(gettext("Prorate"), "125", "pro_rate", "pro_rate", "charges", "get_prorate","","true","center"),

-			array(gettext("Billing Cycle"), "130", "sweep_id", "sweep", "sweeplist", "get_field_name","","true","center"),

+			array(gettext("Rate Group"), "140", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),

+			array("Amount($currency)", "125", "charge", "charge", "charge", "convert_to_currency", "", "true", "right"),

+			array(gettext("Prorate"), "125", "pro_rate", "pro_rate", "charges", "get_prorate", "", "true", "center"),

+			array(gettext("Billing Cycle"), "130", "sweep_id", "sweep", "sweeplist", "get_field_name", "", "true", "center"),

 			/**

 	    ASTPP  3.0 

 	    Show Creation date,last_modified date in reseller grid with admin login

 			 **/

-			array(gettext("Status"), "125", "status", "status", "charges", "get_status","","true","center"),

-			array(gettext("Created Date"), "150", "creation_date", "", "", "","","true","center"),

-			 array(gettext("Modified Date"), "150", "last_modified_date", "", "", "","","true","center"),

+			array(gettext("Status"), "125", "status", "status", "charges", "get_status", "", "true", "center"),

+			array(gettext("Created Date"), "150", "creation_date", "", "", "", "", "true", "center"),

+			 array(gettext("Modified Date"), "150", "last_modified_date", "", "", "", "", "true", "center"),

 			/************************************************/

 		   /*

             ASTPP  3.0 

@@ -114,8 +114,8 @@ 
 	/********************************************/

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create" , "btn btn-line-warning btn" , "fa fa-plus-circle fa-lg", "button_action", "/charges/periodiccharges_add/", "popup"),

-			array("Delete", "btn btn-line-danger","fa fa-times-circle fa-lg",  "button_action", "/charges/periodiccharges_delete_multiple/")

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/charges/periodiccharges_add/", "popup"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/charges/periodiccharges_delete_multiple/")

 			));

 		return $buttons_json;

 	}

@@ -123,15 +123,15 @@ 
 	function build_charges_list_for_customer($accountid, $accounttype) {

 		

 		$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

-		$currency_id=$account_info['currency_id'];

-		$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);		

+		$currency_id = $account_info['currency_id'];

+		$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);		

 		

-		$grid_field_arr = json_encode(array(array("Name", "140", "description", "", "", "","","true","center"),

-			array("Amount($currency)", "140", "charge", "charge", "charge", "convert_to_currency","","true","right"),

-			array("Prorate", "125", "pro_rate", "pro_rate", "charges", "get_prorate","","true","center"),

-			array("Billing Cycle", "170", "sweep_id", "sweep", "sweeplist", "get_field_name","","true","center"),

-			array("Created Date", "150", "creation_date", "", "", "","","true","center"),

-			 array("Modified Date", "150", "last_modified_date", "", "", "","","true","center"),

+		$grid_field_arr = json_encode(array(array("Name", "140", "description", "", "", "", "", "true", "center"),

+			array("Amount($currency)", "140", "charge", "charge", "charge", "convert_to_currency", "", "true", "right"),

+			array("Prorate", "125", "pro_rate", "pro_rate", "charges", "get_prorate", "", "true", "center"),

+			array("Billing Cycle", "170", "sweep_id", "sweep", "sweeplist", "get_field_name", "", "true", "center"),

+			array("Created Date", "150", "creation_date", "", "", "", "", "true", "center"),

+			 array("Modified Date", "150", "last_modified_date", "", "", "", "", "true", "center"),

 			array("Action", "150", "", "", "", array("DELETE" => array("url" => "accounts/".$accounttype."_subscription_action/delete/$accountid/$accounttype/", "mode" => "single")))

 				));

 		return $grid_field_arr;

web_interface/astpp/application/modules/summary/models/summary_model.php

Spacing +24 added lines, -24 removed lines

@@ -28,24 +28,24 @@ 
 		parent::__construct();
 	}
 
-	function get_resellersummary_report_list($flag, $start = 0, $limit = 0,$group_by, $select,$order, $export = false) {
+	function get_resellersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export = false) {
 
 		$this->db_model->build_search('summary_reseller_search');
-		$accountinfo=$this->session->userdata('accountinfo');
+		$accountinfo = $this->session->userdata('accountinfo');
 		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-		$where['reseller_id']=$reseller_id;
+		$where['reseller_id'] = $reseller_id;
 		if ($this->session->userdata('advance_search') != 1) {
-			$where['callstart >=']=date('Y-m-d') . " 00:00:00";
-			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
+			$where['callstart >='] = date('Y-m-d')." 00:00:00";
+			$where['callstart <='] = date('Y-m-d')." 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
+		if ( ! empty($group_by))
 			$this->db->group_by($group_by);
 		if ($flag) {
 			if ($export) {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "reseller_cdrs", '', $order, 'asc', '', '', '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "reseller_cdrs", '', $order, 'asc', '', '', '');
 			} else {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "reseller_cdrs", '', $order, 'asc', $limit, $start, '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "reseller_cdrs", '', $order, 'asc', $limit, $start, '');
 			}
 		} else {
 			$result = $this->db_model->getSelect("count(*) as total_count", "reseller_cdrs", '');
@@ -58,21 +58,21 @@ 
 		return $result;
 	}
 
-	function get_providersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select,$order, $export = false) {
+	function get_providersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export = false) {
 		$this->db_model->build_search('summary_provider_search');
-		$where['provider_id >']=0;
+		$where['provider_id >'] = 0;
 		if ($this->session->userdata('advance_search') != 1) {
-			$where['callstart >=']=date('Y-m-d') . " 00:00:00";
-			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
+			$where['callstart >='] = date('Y-m-d')." 00:00:00";
+			$where['callstart <='] = date('Y-m-d')." 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
+		if ( ! empty($group_by))
 			$this->db->group_by($group_by);
 		if ($flag) {
 			if ($export) {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');
 			} else {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(cost) AS cost", "cdrs", '', $order, 'asc', $limit, $start, '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(cost) AS cost", "cdrs", '', $order, 'asc', $limit, $start, '');
 			}
 		} else {
 			$result = $this->db_model->getSelect("count(*) as total_count", "cdrs", '');
@@ -85,24 +85,24 @@ 
 		return $result;
 	}
 
-	function get_customersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select,$order, $export) {
+	function get_customersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export) {
 		$this->db_model->build_search('summary_customer_search');
-		$accountinfo=$this->session->userdata('accountinfo');
+		$accountinfo = $this->session->userdata('accountinfo');
 		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-		$where['reseller_id']=$reseller_id;
-		$where['type']=0;
+		$where['reseller_id'] = $reseller_id;
+		$where['type'] = 0;
 		if ($this->session->userdata('advance_search') != 1) {
-			$where['callstart >=']=date('Y-m-d') . " 00:00:00";
-			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
+			$where['callstart >='] = date('Y-m-d')." 00:00:00";
+			$where['callstart <='] = date('Y-m-d')." 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
+		if ( ! empty($group_by))
 			$this->db->group_by($group_by);
 		if ($flag) {
 			if ($export) {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');
 			} else {
-				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "cdrs", '', $order, 'asc', $limit, $start, '');
+				$result = $this->db_model->select($select.",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free'  THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "cdrs", '', $order, 'asc', $limit, $start, '');
 			}
 		} else {
 			$result = $this->db_model->getSelect("count(*) as total_count", "cdrs", '');