iNextrix / ASTPP

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));

Braces +9 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
 		$this->load->library('astpp/form');
 		$this->load->model('charges_model');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function periodiccharges_add() {
@@ -182,13 +183,15 @@ 
                                             OR  charges.charge like '%$instant_search%' 
                                                 )"
 										   :null;
-		if(!empty($like_str))
-		$this->db->where($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))
-		$this->db->where($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));
 		$json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);

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;

Braces +4 added lines, -3 removed lines

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

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

 

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class Email_form {

 	function __construct($library_name = '') {

@@ -153,7 +154,7 @@ 
 			$account_data = $this->CI->session->userdata("accountinfo");

 			$loginid = $account_data['id'];

 

-		}else{

+		} else{

 			$loginid = "0";

 		}

 		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

Indentation +7 added lines, -7 removed lines

@@ -105,13 +105,13 @@
             change status active or inactive.

             */

             

-            /***********************************************/

-            array(gettext("Action"), "150", "", "", "", array("EDIT" => array("url" => "charges/periodiccharges_edit/", "mode" => "popup", 'popup'),

-                    "DELETE" => array("url" => "charges/periodiccharges_delete/", "mode" => "single")))

-                ));

-        return $grid_field_arr;

-    }

-    /********************************************/

+			/***********************************************/

+			array(gettext("Action"), "150", "", "", "", array("EDIT" => array("url" => "charges/periodiccharges_edit/", "mode" => "popup", 'popup'),

+					"DELETE" => array("url" => "charges/periodiccharges_delete/", "mode" => "single")))

+				));

+		return $grid_field_arr;

+	}

+	/********************************************/

 

 	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"),

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", '');

Braces +9 added lines, -6 removed lines

@@ -39,8 +39,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($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', '', '', '');
@@ -66,8 +67,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($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', '', '', '');
@@ -96,8 +98,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($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', '', '', '');

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

Indentation +520 added lines, -520 removed lines

@@ -24,579 +24,579 @@
 
 class Summary extends MX_Controller {
 
-    function Summary() {
-        parent::__construct();
+	function Summary() {
+		parent::__construct();
 
-        $this->load->helper('template_inheritance');
+		$this->load->helper('template_inheritance');
 
-        $this->load->library('session');
-        $this->load->library('astpp/form');
-        $this->load->library("summary_form");
-        $this->load->model('summary_model');
-        $this->load->library('fpdf');
-        $this->load->library('pdf');
-        $this->fpdf = new PDF('P', 'pt');
-        $this->fpdf->initialize('P', 'mm', 'A4');
+		$this->load->library('session');
+		$this->load->library('astpp/form');
+		$this->load->library("summary_form");
+		$this->load->model('summary_model');
+		$this->load->library('fpdf');
+		$this->load->library('pdf');
+		$this->fpdf = new PDF('P', 'pt');
+		$this->fpdf->initialize('P', 'mm', 'A4');
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url().'/astpp/login');
-    }
-    function customer() {
-        $data['page_title'] = 'Customer Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('customersummary_reports_search');
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "GLOBAL"));
-        $data['accountlist'] = $accountlist;
-        $data['session_info'] = $session_info;
-        $data['search_string_type'] = $this->common->search_string_type();
-        $data['search_report'] = $this->common->search_report_in();
-        $new_column_arr = $this->summary_column_arr('customer');
-        $data['grid_fields'] = $this->summary_form->build_customersummary($new_column_arr);
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_customersummary();
-        $data['groupby_field'] = $this->common->set_summarycustomer_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_customersummary_report', $data);
-    }
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
+	}
+	function customer() {
+		$data['page_title'] = 'Customer Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('customersummary_reports_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "GLOBAL"));
+		$data['accountlist'] = $accountlist;
+		$data['session_info'] = $session_info;
+		$data['search_string_type'] = $this->common->search_string_type();
+		$data['search_report'] = $this->common->search_report_in();
+		$new_column_arr = $this->summary_column_arr('customer');
+		$data['grid_fields'] = $this->summary_form->build_customersummary($new_column_arr);
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_customersummary();
+		$data['groupby_field'] = $this->common->set_summarycustomer_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_customersummary_report', $data);
+	}
 
-    function customer_json() {
-        $search_arr = $this->summary_search_info('customer');
-        $count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'customer', 'grid');
-        }
-        $this->session->set_userdata('customersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function customer_json() {
+		$search_arr = $this->summary_search_info('customer');
+		$count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'customer', 'grid');
+		}
+		$this->session->set_userdata('customersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    /**
-     * @param string $entity
-     */
-    function summary_column_arr($entity) {
-        $new_column_arr = array();
-        $total_width = '322';
-        $column_name = 'accountid';
-        if ($this->session->userdata('advance_search') == '1') {
-            $search_array = $this->session->userdata($entity.'summary_reports_search');
-            if (isset($search_array['time']) && ! empty($search_array['time'])) {
-                   $new_column_arr[] = array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
-            }
-            if (isset($search_array['groupby_1']) && ! empty($search_array['groupby_1'])) {
-                $first_column_groupby = $search_array['groupby_1'];
+	/**
+	 * @param string $entity
+	 */
+	function summary_column_arr($entity) {
+		$new_column_arr = array();
+		$total_width = '322';
+		$column_name = 'accountid';
+		if ($this->session->userdata('advance_search') == '1') {
+			$search_array = $this->session->userdata($entity.'summary_reports_search');
+			if (isset($search_array['time']) && ! empty($search_array['time'])) {
+				   $new_column_arr[] = array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
+			}
+			if (isset($search_array['groupby_1']) && ! empty($search_array['groupby_1'])) {
+				$first_column_groupby = $search_array['groupby_1'];
 
-                if ($first_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($first_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif ($first_column_groupby == 'package_id') {
-		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (isset($search_array['groupby_2']) && ! empty($search_array['groupby_2'])) {
-                $third_column_groupby = $search_array['groupby_2'];
-                if ($third_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($third_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif ($third_column_groupby == 'package_id') {
-		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (isset($search_array['groupby_3']) && ! empty($search_array['groupby_3'])) {
-                $fifth_column_groupby = $search_array['groupby_3'];
-                if ($fifth_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($fifth_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif ($fifth_column_groupby == 'package_id') {
-		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (empty($new_column_arr)) {
-                $new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-            }
-        } else {
-            $new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-        }
+				if ($first_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($first_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif ($first_column_groupby == 'package_id') {
+			$new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (isset($search_array['groupby_2']) && ! empty($search_array['groupby_2'])) {
+				$third_column_groupby = $search_array['groupby_2'];
+				if ($third_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($third_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif ($third_column_groupby == 'package_id') {
+			$new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (isset($search_array['groupby_3']) && ! empty($search_array['groupby_3'])) {
+				$fifth_column_groupby = $search_array['groupby_3'];
+				if ($fifth_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($fifth_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif ($fifth_column_groupby == 'package_id') {
+			$new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (empty($new_column_arr)) {
+				$new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+			}
+		} else {
+			$new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+		}
         
-        return $new_column_arr;
-    }
+		return $new_column_arr;
+	}
 
-    /**
-     * @param string $entity
-     * @param string $purpose
-     */
-    function summary_report_grid($search_arr, $query, $entity, $purpose) {
-        $export_arr = array();
-        $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
-        $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-        $currency_info = $this->common->get_currency_info();
-        foreach ($query->result_array() as $row1) {
-            $atmpt = $row1['attempts'];
-            $cmplt = ($row1['completed'] != 0) ? $row1['completed'] : 0;
-            $acd = ($row1['completed'] > 0) ? round($row1['billable'] / $row1['completed']) : 0;
-            $mcd = $row1['mcd'];
-            if ($show_seconds == 'minutes') {
-                $avgsec = $acd > 0 ? sprintf('%02d', $acd / 60).":".sprintf('%02d', ($acd % 60)) : "00:00";
-                $maxsec = $mcd > 0 ? sprintf('%02d', $mcd / 60).":".sprintf('%02d', ($mcd % 60)) : "00:00";
-                $duration = ($row1['duration'] > 0) ? sprintf('%02d', $row1['duration'] / 60).":".sprintf('%02d', ($row1['duration'] % 60)) : "00:00";
-                $billsec = ($row1['billable'] > 0) ? sprintf('%02d', $row1['billable'] / 60).":".sprintf('%02d', ($row1['billable'] % 60)) : "00:00";
-            } else {
-                $duration = sprintf('%02d', $row1['duration']);
-                $avgsec = $acd;
-                $maxsec = $mcd;
-                $billsec = sprintf('%02d', $row1['billable']);
-            }
-            if ($entity != 'provider') {
-                $profit = $this->common->calculate_currency_manually($currency_info, $row1['debit'] - $row1['cost'], false);
-                $debit  = $this->common->calculate_currency_manually($currency_info, $row1['debit'], false);
-            }
-            $cost = $this->common->calculate_currency_manually($currency_info, $row1['cost'], false);
-            $asr = ($atmpt > 0) ? (round(($cmplt / $atmpt) * 100, 2)) : '0.00';
-            $new_arr = array();
-            if ($this->session->userdata('advance_search') == 1) {
-                if ( ! empty($search_arr['groupby_time'])) {
-                       $time = $row1[$search_arr['groupby_time']];
-                       if ($search_arr['groupby_time'] == "HOUR" || $search_arr['groupby_time'] == "DAY") {
+	/**
+	 * @param string $entity
+	 * @param string $purpose
+	 */
+	function summary_report_grid($search_arr, $query, $entity, $purpose) {
+		$export_arr = array();
+		$db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
+		$show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+		$currency_info = $this->common->get_currency_info();
+		foreach ($query->result_array() as $row1) {
+			$atmpt = $row1['attempts'];
+			$cmplt = ($row1['completed'] != 0) ? $row1['completed'] : 0;
+			$acd = ($row1['completed'] > 0) ? round($row1['billable'] / $row1['completed']) : 0;
+			$mcd = $row1['mcd'];
+			if ($show_seconds == 'minutes') {
+				$avgsec = $acd > 0 ? sprintf('%02d', $acd / 60).":".sprintf('%02d', ($acd % 60)) : "00:00";
+				$maxsec = $mcd > 0 ? sprintf('%02d', $mcd / 60).":".sprintf('%02d', ($mcd % 60)) : "00:00";
+				$duration = ($row1['duration'] > 0) ? sprintf('%02d', $row1['duration'] / 60).":".sprintf('%02d', ($row1['duration'] % 60)) : "00:00";
+				$billsec = ($row1['billable'] > 0) ? sprintf('%02d', $row1['billable'] / 60).":".sprintf('%02d', ($row1['billable'] % 60)) : "00:00";
+			} else {
+				$duration = sprintf('%02d', $row1['duration']);
+				$avgsec = $acd;
+				$maxsec = $mcd;
+				$billsec = sprintf('%02d', $row1['billable']);
+			}
+			if ($entity != 'provider') {
+				$profit = $this->common->calculate_currency_manually($currency_info, $row1['debit'] - $row1['cost'], false);
+				$debit  = $this->common->calculate_currency_manually($currency_info, $row1['debit'], false);
+			}
+			$cost = $this->common->calculate_currency_manually($currency_info, $row1['cost'], false);
+			$asr = ($atmpt > 0) ? (round(($cmplt / $atmpt) * 100, 2)) : '0.00';
+			$new_arr = array();
+			if ($this->session->userdata('advance_search') == 1) {
+				if ( ! empty($search_arr['groupby_time'])) {
+					   $time = $row1[$search_arr['groupby_time']];
+					   if ($search_arr['groupby_time'] == "HOUR" || $search_arr['groupby_time'] == "DAY") {
 			  $time = sprintf('%02d', $time);
-                       }
-                       if ($search_arr['groupby_time'] == "MONTH") {
+					   }
+					   if ($search_arr['groupby_time'] == "MONTH") {
 			  $dateObj = DateTime::createFromFormat('!m', $time);
 			  $time = $dateObj->format('F');
-                       }
-                    $new_arr[] = $time;
-                }
-                if ($search_arr['groupby_1'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_1'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_1'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif ($search_arr['groupby_1'] == 'package_id') {
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
+					   }
+					$new_arr[] = $time;
+				}
+				if ($search_arr['groupby_1'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_1'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_1'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				} elseif ($search_arr['groupby_1'] == 'package_id') {
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
                 
-                if ($search_arr['groupby_2'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_2'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_2'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif ($search_arr['groupby_2'] == 'package_id') {
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
+				if ($search_arr['groupby_2'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_2'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_2'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				} elseif ($search_arr['groupby_2'] == 'package_id') {
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
                 
-                if ($search_arr['groupby_3'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_3'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_3'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif ($search_arr['groupby_3'] == 'package_id') {
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
-                if (empty($new_arr)) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                }
-            } else {
-                $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-            }
-            if ($entity != 'provider') {
-                $custom_array = array(
-                    $atmpt,
-                    $cmplt,
-                    $duration,
-                    round($asr, 2),
-                    $avgsec,
-                    $maxsec,
-                    $billsec,
-                    $debit,
-                    $cost,
-                    $profit);
-            } else {
-                $custom_array = array(
-                    $atmpt,
-                    $cmplt,
-                    $duration,
-                    round($asr, 2),
-                    $avgsec,
-                    $maxsec,
-                    $billsec,
-                    $cost
-                );
-            }
-            $final_array = array_merge($new_arr, $custom_array);
-            $json_data[] = array('cell' => $final_array);
-            $export_arr[] = $final_array;
-        }
-        $function_name = 'get_'.$entity.'summary_report_list';
-        $total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'], $search_arr['order_str'], true);
-        $total_info = $total_info->result_array();
-        $total_info = $total_info[0];
-        $total_asr = ($total_info['attempts'] > 0) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
-        $total_acd = ($total_info['completed'] > 0) ? round($total_info['billable'] / $total_info['completed']) : 0;
-        if ($show_seconds == 'minutes') {
-            $total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d', $total_info['duration'] / 60).":".sprintf('%02d', ($total_info['duration'] % 60)) : "00:00";
-            $total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d', $total_info['billable'] / 60).":".sprintf('%02d', ($total_info['billable'] % 60)) : "00:00";
-            $total_acd = $total_acd > 0 ? sprintf('%02d', $total_acd / 60).":".sprintf('%02d', ($total_acd % 60)) : "00:00";
-            $total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d', $total_info['mcd'] / 60).":".sprintf('%02d', ($total_info['mcd'] % 60)) : "00:00";
-        }
-        if ($entity != 'provider') {
-            $total_profit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'] - $total_info['cost'], false);
-            $total_debit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'], false);
-        }
-        $total_cost = $this->common->calculate_currency_manually($currency_info, $total_info['cost'], false);
-        if ($entity != 'provider') {
-            $last_array = array(
-                "<b>".$total_info['attempts']."</b>",
-                "<b>".$total_info['completed']."</b>",
-                "<b>".$total_info['duration']."</b>",
-                "<b>".$total_asr."</b>",
+				if ($search_arr['groupby_3'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_3'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_3'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				}  elseif ($search_arr['groupby_3'] == 'package_id') {
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
+				if (empty($new_arr)) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				}
+			} else {
+				$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+			}
+			if ($entity != 'provider') {
+				$custom_array = array(
+					$atmpt,
+					$cmplt,
+					$duration,
+					round($asr, 2),
+					$avgsec,
+					$maxsec,
+					$billsec,
+					$debit,
+					$cost,
+					$profit);
+			} else {
+				$custom_array = array(
+					$atmpt,
+					$cmplt,
+					$duration,
+					round($asr, 2),
+					$avgsec,
+					$maxsec,
+					$billsec,
+					$cost
+				);
+			}
+			$final_array = array_merge($new_arr, $custom_array);
+			$json_data[] = array('cell' => $final_array);
+			$export_arr[] = $final_array;
+		}
+		$function_name = 'get_'.$entity.'summary_report_list';
+		$total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'], $search_arr['order_str'], true);
+		$total_info = $total_info->result_array();
+		$total_info = $total_info[0];
+		$total_asr = ($total_info['attempts'] > 0) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
+		$total_acd = ($total_info['completed'] > 0) ? round($total_info['billable'] / $total_info['completed']) : 0;
+		if ($show_seconds == 'minutes') {
+			$total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d', $total_info['duration'] / 60).":".sprintf('%02d', ($total_info['duration'] % 60)) : "00:00";
+			$total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d', $total_info['billable'] / 60).":".sprintf('%02d', ($total_info['billable'] % 60)) : "00:00";
+			$total_acd = $total_acd > 0 ? sprintf('%02d', $total_acd / 60).":".sprintf('%02d', ($total_acd % 60)) : "00:00";
+			$total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d', $total_info['mcd'] / 60).":".sprintf('%02d', ($total_info['mcd'] % 60)) : "00:00";
+		}
+		if ($entity != 'provider') {
+			$total_profit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'] - $total_info['cost'], false);
+			$total_debit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'], false);
+		}
+		$total_cost = $this->common->calculate_currency_manually($currency_info, $total_info['cost'], false);
+		if ($entity != 'provider') {
+			$last_array = array(
+				"<b>".$total_info['attempts']."</b>",
+				"<b>".$total_info['completed']."</b>",
+				"<b>".$total_info['duration']."</b>",
+				"<b>".$total_asr."</b>",
 		"<b>".$total_acd."</b>",
 		"<b>".$total_info['mcd']."</b>",
 		"<b>".$total_info['billable']."</b>",
 		"<b>".$total_debit."</b>",
 		"<b>".$total_cost."</b>",
 		"<b>".$total_profit."</b>"
-            );
-        } else {
-            $last_array = array(
-                 "<b>".$total_info['attempts']."</b>",
-                 "<b>".$total_info['completed']."</b>",
-                 "<b>".$total_info['duration']."</b>",
-                 "<b>".$total_asr."</b>",
-                 "<b>".$total_acd."</b>",
-                 "<b>".$total_info['mcd']."</b>",
-                 "<b>".$total_info['billable']."</b>",
-                 "<b>".$total_cost."</b>",
-            );
-        }
-        if ($purpose == 'export') {
-            $search_arr['custom_total_array'][0] = "Grand Total";
-        }
-        $new_export_array = array();
-        foreach ($last_array as $key=>$value) {
+			);
+		} else {
+			$last_array = array(
+				 "<b>".$total_info['attempts']."</b>",
+				 "<b>".$total_info['completed']."</b>",
+				 "<b>".$total_info['duration']."</b>",
+				 "<b>".$total_asr."</b>",
+				 "<b>".$total_acd."</b>",
+				 "<b>".$total_info['mcd']."</b>",
+				 "<b>".$total_info['billable']."</b>",
+				 "<b>".$total_cost."</b>",
+			);
+		}
+		if ($purpose == 'export') {
+			$search_arr['custom_total_array'][0] = "Grand Total";
+		}
+		$new_export_array = array();
+		foreach ($last_array as $key=>$value) {
 	  $value = str_replace("<b>", "", $value);
 	  $value = str_replace("</b>", '', $value);
 	  if ($key == 7 || $key == 8 || $key == 9) {
-	      $value = sprintf("%.".$currency_info['decimalpoints']."f", floatval(preg_replace('/[^\d.]/', '', $value)));
+		  $value = sprintf("%.".$currency_info['decimalpoints']."f", floatval(preg_replace('/[^\d.]/', '', $value)));
 	  }
 	  $new_export_array[$key] = $value;
-        }
-        $total_array = array_merge($search_arr['custom_total_array'], $last_array);
-        $custom_export_arr = array_merge($search_arr['custom_total_array'], $new_export_array);
-        $export_arr[] = $custom_export_arr;
-        $json_data[] = array('cell' => $total_array);
-        return $purpose == 'grid' ? $json_data : $export_arr;
-    }
+		}
+		$total_array = array_merge($search_arr['custom_total_array'], $last_array);
+		$custom_export_arr = array_merge($search_arr['custom_total_array'], $new_export_array);
+		$export_arr[] = $custom_export_arr;
+		$json_data[] = array('cell' => $total_array);
+		return $purpose == 'grid' ? $json_data : $export_arr;
+	}
 
-    function customer_export_csv() {
+	function customer_export_csv() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info['currency_id'];
 		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
-        $search_arr = $this->session->userdata('customersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array('Attempted Calls', 'Completed Calls', 'Duration', 'ASR', 'ACD', 'MCD', 'Billable', 'Debit('.$currency.')', 'Cost('.$currency.')', 'Profit');
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'customer', 'export');
-        } 
-        $customer_array = array_merge($header_arr, $data_arr);
+		$search_arr = $this->session->userdata('customersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array('Attempted Calls', 'Completed Calls', 'Duration', 'ASR', 'ACD', 'MCD', 'Billable', 'Debit('.$currency.')', 'Cost('.$currency.')', 'Profit');
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'customer', 'export');
+		} 
+		$customer_array = array_merge($header_arr, $data_arr);
 
-        $this->load->helper('csv');
-        array_to_csv($customer_array, 'Customer_Summary_Report_'.date("Y-m-d").'.csv');
-    }
+		$this->load->helper('csv');
+		array_to_csv($customer_array, 'Customer_Summary_Report_'.date("Y-m-d").'.csv');
+	}
 
-    function customer_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action']);
-            unset($_POST['advance_search']);
-            $this->session->set_userdata('customersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url() . 'summary/customer/');
-    }
+	function customer_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action']);
+			unset($_POST['advance_search']);
+			$this->session->set_userdata('customersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url() . 'summary/customer/');
+	}
 
-    function customer_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('customersummary_reports_search', "");
-        $this->session->set_userdata('customersummary_reports_export', "");
-        redirect(base_url() . 'summary/customer/');
-    }
+	function customer_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('customersummary_reports_search', "");
+		$this->session->set_userdata('customersummary_reports_export', "");
+		redirect(base_url() . 'summary/customer/');
+	}
 
-    /**
-     * @param string $entity
-     */
-    function summary_search_info($entity) {
-        $group_by_str = null;
-        $select_str = null;
-        $group_by_time=null;
-        $group_by_1 = null;
-        $group_by_2 = null;
-        $group_by_3 = null;
-        $order_str=null;
-        $custom_total_array = array();
-        $custom_search = array();
-        $export_select_str = null;
-        $new_arr['search_in'] = 'minutes';
-        $i = 0;
-        $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
-        if ($this->session->userdata('advance_search') == 1) {
-            $custom_search = $this->session->userdata($entity.'summary_reports_search');
-            if (isset($custom_search['time']) && ! empty($custom_search['time'])) {
-                $group_by_str .= $custom_search['time']."(callstart),";
-                $select_str .= $custom_search['time']."(callstart) as ".$custom_search['time'].",";
-                $order_str .= $custom_search['time'].",";
-                $group_by_time = $custom_search['time'];
-                $export_select_str .= $custom_search['time'].",";
-                $custom_total_array[$i] = null;
-                $i++;
-            }
-            if (isset($custom_search['groupby_1']) && ! empty($custom_search['groupby_1'])) {
-                $group_by_str .= $custom_search['groupby_1'].",";
-                $select_str .= $custom_search['groupby_1'].",";
-                $order_str .= $custom_search['groupby_1'].",";
-                $group_by_1 = $custom_search['groupby_1'];
-                if ($custom_search['groupby_1'] == $db_field_name) {
-                    $export_select_str .= 'Account,';
-                } elseif ($custom_search['groupby_1'] == 'trunk_id') {
-                    $export_select_str .= 'Trunk,';
-                } elseif ($custom_search['groupby_1'] == 'pattern') {
-                    $select_str .= 'notes,';
-                    $order_str .= 'notes,';
-                    $export_select_str .= "Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif ($custom_search['groupby_1'] == 'package_id') {
-		    $export_select_str .= 'Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
+	/**
+	 * @param string $entity
+	 */
+	function summary_search_info($entity) {
+		$group_by_str = null;
+		$select_str = null;
+		$group_by_time=null;
+		$group_by_1 = null;
+		$group_by_2 = null;
+		$group_by_3 = null;
+		$order_str=null;
+		$custom_total_array = array();
+		$custom_search = array();
+		$export_select_str = null;
+		$new_arr['search_in'] = 'minutes';
+		$i = 0;
+		$db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
+		if ($this->session->userdata('advance_search') == 1) {
+			$custom_search = $this->session->userdata($entity.'summary_reports_search');
+			if (isset($custom_search['time']) && ! empty($custom_search['time'])) {
+				$group_by_str .= $custom_search['time']."(callstart),";
+				$select_str .= $custom_search['time']."(callstart) as ".$custom_search['time'].",";
+				$order_str .= $custom_search['time'].",";
+				$group_by_time = $custom_search['time'];
+				$export_select_str .= $custom_search['time'].",";
+				$custom_total_array[$i] = null;
+				$i++;
+			}
+			if (isset($custom_search['groupby_1']) && ! empty($custom_search['groupby_1'])) {
+				$group_by_str .= $custom_search['groupby_1'].",";
+				$select_str .= $custom_search['groupby_1'].",";
+				$order_str .= $custom_search['groupby_1'].",";
+				$group_by_1 = $custom_search['groupby_1'];
+				if ($custom_search['groupby_1'] == $db_field_name) {
+					$export_select_str .= 'Account,';
+				} elseif ($custom_search['groupby_1'] == 'trunk_id') {
+					$export_select_str .= 'Trunk,';
+				} elseif ($custom_search['groupby_1'] == 'pattern') {
+					$select_str .= 'notes,';
+					$order_str .= 'notes,';
+					$export_select_str .= "Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif ($custom_search['groupby_1'] == 'package_id') {
+			$export_select_str .= 'Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
             
-            if (isset($custom_search['groupby_2']) && ! empty($custom_search['groupby_2'])) {
-                $group_by_str .= $custom_search['groupby_2'].",";
-                $select_str .= $custom_search['groupby_2'].",";
-                $order_str .= $custom_search['groupby_2'].",";
-                $group_by_2 = $custom_search['groupby_2'];
-                if ($custom_search['groupby_2'] == $db_field_name) {
-                    $export_select_str .= 'Account,';
-                } elseif ($custom_search['groupby_2'] == 'trunk_id') {
-                    $export_select_str .= 'Trunk,';
-                } elseif ($custom_search['groupby_2'] == 'pattern') {
-                    $select_str .= 'notes,';
-                    $order_str .= 'notes,';
-                    $export_select_str .= "Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif ($custom_search['groupby_2'] == 'package_id') {
-		    $export_select_str .= 'Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
+			if (isset($custom_search['groupby_2']) && ! empty($custom_search['groupby_2'])) {
+				$group_by_str .= $custom_search['groupby_2'].",";
+				$select_str .= $custom_search['groupby_2'].",";
+				$order_str .= $custom_search['groupby_2'].",";
+				$group_by_2 = $custom_search['groupby_2'];
+				if ($custom_search['groupby_2'] == $db_field_name) {
+					$export_select_str .= 'Account,';
+				} elseif ($custom_search['groupby_2'] == 'trunk_id') {
+					$export_select_str .= 'Trunk,';
+				} elseif ($custom_search['groupby_2'] == 'pattern') {
+					$select_str .= 'notes,';
+					$order_str .= 'notes,';
+					$export_select_str .= "Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif ($custom_search['groupby_2'] == 'package_id') {
+			$export_select_str .= 'Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
 
-            if (isset($custom_search['groupby_3']) && ! empty($custom_search['groupby_3'])) {
-                $group_by_str .= $custom_search['groupby_3'].",";
-                $select_str .= $custom_search['groupby_3'].",";
-                $order_str .= $custom_search['groupby_3'].",";
-                $group_by_3 = $custom_search['groupby_3'];
-                if ($custom_search['groupby_3'] == 'accountid' || $custom_search['groupby_3'] == 'provider_id') {
-                    $export_select_str .= 'Account,';
-                } elseif ($custom_search['groupby_3'] == 'trunk_id') {
-                    $export_select_str .= 'Trunk,';
-                } elseif ($custom_search['groupby_3'] == 'pattern') {
-                    $select_str .= 'notes,';
-                    $order_str .= 'notes,';
-                    $export_select_str .= "Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif ($custom_search['groupby_3'] == 'package_id') {
-		    $export_select_str .= 'Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
-            $new_arr['search_in'] = (isset($custom_search['search_in']) && ! empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
-            unset($custom_search['groupby_1'], $custom_search['groupby_2'], $custom_search['groupby_3'], $custom_search['search_in']);
-            $this->session->set_userdata('summary_'.$entity.'_search', $custom_search);
-        }
-        if ( ! empty($group_by_str)) {
-            $group_by_str = rtrim($group_by_str, ",");
-            $select_str = rtrim($select_str, ",");
-            $order_str = rtrim($order_str, ",");
-            $export_select_str = rtrim($export_select_str, ",");
-        } else {
-            $select_str = $db_field_name;
-            $order_str = $db_field_name;
-            $group_by_str = $db_field_name;
-            $export_select_str = "Account";
-        }
+			if (isset($custom_search['groupby_3']) && ! empty($custom_search['groupby_3'])) {
+				$group_by_str .= $custom_search['groupby_3'].",";
+				$select_str .= $custom_search['groupby_3'].",";
+				$order_str .= $custom_search['groupby_3'].",";
+				$group_by_3 = $custom_search['groupby_3'];
+				if ($custom_search['groupby_3'] == 'accountid' || $custom_search['groupby_3'] == 'provider_id') {
+					$export_select_str .= 'Account,';
+				} elseif ($custom_search['groupby_3'] == 'trunk_id') {
+					$export_select_str .= 'Trunk,';
+				} elseif ($custom_search['groupby_3'] == 'pattern') {
+					$select_str .= 'notes,';
+					$order_str .= 'notes,';
+					$export_select_str .= "Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif ($custom_search['groupby_3'] == 'package_id') {
+			$export_select_str .= 'Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
+			$new_arr['search_in'] = (isset($custom_search['search_in']) && ! empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
+			unset($custom_search['groupby_1'], $custom_search['groupby_2'], $custom_search['groupby_3'], $custom_search['search_in']);
+			$this->session->set_userdata('summary_'.$entity.'_search', $custom_search);
+		}
+		if ( ! empty($group_by_str)) {
+			$group_by_str = rtrim($group_by_str, ",");
+			$select_str = rtrim($select_str, ",");
+			$order_str = rtrim($order_str, ",");
+			$export_select_str = rtrim($export_select_str, ",");
+		} else {
+			$select_str = $db_field_name;
+			$order_str = $db_field_name;
+			$group_by_str = $db_field_name;
+			$export_select_str = "Account";
+		}
 
-        array_pop($custom_total_array);
-        array_unshift($custom_total_array, '<b>Grand Total</b>');
-        $new_arr['export_str'] = $export_select_str;
-        $new_arr['select_str'] = $select_str;
-        $new_arr['order_str'] = $order_str;
-        $new_arr['group_by_str'] = $group_by_str;
-        $new_arr['groupby_1'] = $group_by_1;
-        $new_arr['groupby_2'] = $group_by_2;
-        $new_arr['groupby_3'] = $group_by_3;
-        $new_arr['groupby_time'] = $group_by_time;
-        $new_arr['custom_total_array'] = $custom_total_array;
-        return $new_arr;
-    }
+		array_pop($custom_total_array);
+		array_unshift($custom_total_array, '<b>Grand Total</b>');
+		$new_arr['export_str'] = $export_select_str;
+		$new_arr['select_str'] = $select_str;
+		$new_arr['order_str'] = $order_str;
+		$new_arr['group_by_str'] = $group_by_str;
+		$new_arr['groupby_1'] = $group_by_1;
+		$new_arr['groupby_2'] = $group_by_2;
+		$new_arr['groupby_3'] = $group_by_3;
+		$new_arr['groupby_time'] = $group_by_time;
+		$new_arr['custom_total_array'] = $custom_total_array;
+		return $new_arr;
+	}
 
-    function provider() {
-        $data['page_title'] = 'Provider Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('providersummary_reports_search');
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array("type" => "3"));
-        $trunklist = $this->db_model->build_dropdown('id,name', 'trunks', '', array());
-        $data['trunklist'] = $trunklist;
-        $data['accountlist'] = $accountlist;
-        $data['session_info'] = $session_info;
-        $data['seconds'] = $this->session->userdata('provider_seconds');
-        $data['search_report'] = $this->common->search_report_in();
-        $data['grid_fields'] = $this->summary_form->build_providersummary();
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_providersummary();
-        $data['search_string_type'] = $this->common->search_string_type();
-        $data['groupby_field'] = $this->common->set_summaryprovider_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_providersummary_report', $data);
-    }
+	function provider() {
+		$data['page_title'] = 'Provider Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('providersummary_reports_search');
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array("type" => "3"));
+		$trunklist = $this->db_model->build_dropdown('id,name', 'trunks', '', array());
+		$data['trunklist'] = $trunklist;
+		$data['accountlist'] = $accountlist;
+		$data['session_info'] = $session_info;
+		$data['seconds'] = $this->session->userdata('provider_seconds');
+		$data['search_report'] = $this->common->search_report_in();
+		$data['grid_fields'] = $this->summary_form->build_providersummary();
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_providersummary();
+		$data['search_string_type'] = $this->common->search_string_type();
+		$data['groupby_field'] = $this->common->set_summaryprovider_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_providersummary_report', $data);
+	}
 
-    function provider_json() {
-        $search_arr = $this->summary_search_info('provider');
-        $count_all = $this->summary_model->get_providersummary_report_list(false, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'provider', 'grid');
-        }
-        $this->session->set_userdata('providersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function provider_json() {
+		$search_arr = $this->summary_search_info('provider');
+		$count_all = $this->summary_model->get_providersummary_report_list(false, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'provider', 'grid');
+		}
+		$this->session->set_userdata('providersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    function provider_export_csv() {
+	function provider_export_csv() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info['currency_id'];
 		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
-        $search_arr = $this->session->userdata('providersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Cost($currency)");
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'provider', 'export');
-        }
-        $provider_array = array_merge($header_arr, $data_arr);
+		$search_arr = $this->session->userdata('providersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Cost($currency)");
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'provider', 'export');
+		}
+		$provider_array = array_merge($header_arr, $data_arr);
 
-        $this->load->helper('csv');
-        array_to_csv($provider_array, 'Provider_Summary_Report_'.date("Y-m-d").'.csv');
-    }
+		$this->load->helper('csv');
+		array_to_csv($provider_array, 'Provider_Summary_Report_'.date("Y-m-d").'.csv');
+	}
 
-    function provider_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action'], $_POST['advance_search']);
-            $this->session->set_userdata('providersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url().'summary/provider/');
-    }
+	function provider_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action'], $_POST['advance_search']);
+			$this->session->set_userdata('providersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url().'summary/provider/');
+	}
 
-    function provider_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('providersummary_reports_search', "");
-        $this->session->set_userdata('providersummary_reports_export', "");
-        redirect(base_url()."summary/provider/");
-    }
+	function provider_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('providersummary_reports_search', "");
+		$this->session->set_userdata('providersummary_reports_export', "");
+		redirect(base_url()."summary/provider/");
+	}
 
-    function reseller() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Reseller Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('resellersummary_reports_search');
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "1"));
-        $data['accountlist'] = $accountlist;
-        $data['seconds'] = $this->session->userdata('reseller_seconds');
-        $data['session_info'] = $session_info;
-        $data['search_report'] = $this->common->search_report_in();
-        $data['search_string_type'] = $this->common->search_string_type();
-        $new_column_arr = $this->summary_column_arr('reseller');
-        $data['grid_fields'] = $this->summary_form->build_resellersummary($new_column_arr);
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_resellersummary();
-        $data['groupby_field'] = $this->common->set_summarycustomer_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_resellersummary_report', $data);
-    }
+	function reseller() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Reseller Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('resellersummary_reports_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "1"));
+		$data['accountlist'] = $accountlist;
+		$data['seconds'] = $this->session->userdata('reseller_seconds');
+		$data['session_info'] = $session_info;
+		$data['search_report'] = $this->common->search_report_in();
+		$data['search_string_type'] = $this->common->search_string_type();
+		$new_column_arr = $this->summary_column_arr('reseller');
+		$data['grid_fields'] = $this->summary_form->build_resellersummary($new_column_arr);
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_resellersummary();
+		$data['groupby_field'] = $this->common->set_summarycustomer_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_resellersummary_report', $data);
+	}
 
-    function reseller_json() {
-        $search_arr = $this->summary_search_info('reseller');
-        $count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'reseller', 'grid');
-        }
-        $this->session->set_userdata('resellersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function reseller_json() {
+		$search_arr = $this->summary_search_info('reseller');
+		$count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'reseller', 'grid');
+		}
+		$this->session->set_userdata('resellersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    function reseller_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action'], $_POST['advance_search']);
-            $this->session->set_userdata('resellersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url()."summary/reseller/");
-    }
+	function reseller_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action'], $_POST['advance_search']);
+			$this->session->set_userdata('resellersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url()."summary/reseller/");
+	}
 
-    function reseller_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('resellersummary_reports_search', "");
-        $this->session->set_userdata('resellersummary_reports_export', "");
-        redirect(base_url()."summary/reseller/");
-    }
+	function reseller_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('resellersummary_reports_search', "");
+		$this->session->set_userdata('resellersummary_reports_export', "");
+		redirect(base_url()."summary/reseller/");
+	}
 
-    function reseller_export_csv() {
+	function reseller_export_csv() {
 		 $account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info['currency_id'];
 		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		
-        $search_arr = $this->session->userdata('resellersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Debit($currency)", "Cost($currency)", "Profit");
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'reseller', 'export');
-        }
-        $reseller_array = array_merge($header_arr, $data_arr);
-        $this->load->helper('csv');
-        array_to_csv($reseller_array, 'Reseller_Summary_Report_'.date("Y-m-d").'.csv');
-    }
+		$search_arr = $this->session->userdata('resellersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Debit($currency)", "Cost($currency)", "Profit");
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'reseller', 'export');
+		}
+		$reseller_array = array_merge($header_arr, $data_arr);
+		$this->load->helper('csv');
+		array_to_csv($reseller_array, 'Reseller_Summary_Report_'.date("Y-m-d").'.csv');
+	}
 
 }
 ?>

Spacing +4 added lines, -4 removed lines

@@ -327,14 +327,14 @@ 
             unset($_POST['advance_search']);
             $this->session->set_userdata('customersummary_reports_search', $this->input->post());
         }
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     function customer_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('customersummary_reports_search', "");
         $this->session->set_userdata('customersummary_reports_export', "");
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     /**
@@ -343,11 +343,11 @@ 
     function summary_search_info($entity) {
         $group_by_str = null;
         $select_str = null;
-        $group_by_time=null;
+        $group_by_time = null;
         $group_by_1 = null;
         $group_by_2 = null;
         $group_by_3 = null;
-        $order_str=null;
+        $order_str = null;
         $custom_total_array = array();
         $custom_search = array();
         $export_select_str = null;

Braces +4 added lines, -3 removed lines

@@ -38,8 +38,9 @@ 
         $this->fpdf = new PDF('P', 'pt');
         $this->fpdf->initialize('P', 'mm', 'A4');
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url().'/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url().'/astpp/login');
+        }
     }
     function customer() {
         $data['page_title'] = 'Customer Summary Report';
@@ -202,7 +203,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_3'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif ($search_arr['groupby_3'] == 'package_id') {
+                } elseif ($search_arr['groupby_3'] == 'package_id') {
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 if (empty($new_arr)) {

web_interface/astpp/application/modules/summary/libraries/summary_form.php

Spacing +92 added lines, -92 removed lines

@@ -20,7 +20,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 Summary_form {

@@ -33,9 +33,9 @@ 
 		$form['Search'] = array(

 	array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-			array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"3")),

+			array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"3")),

 			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`status`=2, concat(name,"","^"),name) as name', 'trunks', 'build_dropdown_deleted', '', array("status" => "1")),

-			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array(' Code Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

@@ -44,124 +44,124 @@ 
 

 		return $form;

 	}

-	function build_providersummary(){

+	function build_providersummary() {

 		

 $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);	

 		

-		$new_arr=array();

-	if($this->CI->session->userdata('advance_search')=='1'){

-		$search_array=$this->CI->session->userdata('providersummary_reports_search');

-				if(isset($search_array['time']) && !empty($search_array['time'])){

-				   $new_arr[]=array($search_array['time'], "151", $search_array['time']."(callstart)", "", "", "");

+		$new_arr = array();

+	if ($this->CI->session->userdata('advance_search') == '1') {

+		$search_array = $this->CI->session->userdata('providersummary_reports_search');

+				if (isset($search_array['time']) && ! empty($search_array['time'])) {

+				   $new_arr[] = array($search_array['time'], "151", $search_array['time']."(callstart)", "", "", "");

 				}

-		if(isset($search_array['groupby_1']) && !empty($search_array['groupby_1'])){

-					$first_column_groupby=$search_array['groupby_1'];

-					if($first_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($first_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($first_column_groupby =='trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($first_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+		if (isset($search_array['groupby_1']) && ! empty($search_array['groupby_1'])) {

+					$first_column_groupby = $search_array['groupby_1'];

+					if ($first_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($first_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($first_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($first_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

-				if(isset($search_array['groupby_2']) && !empty($search_array['groupby_2'])){

-					$third_column_groupby=$search_array['groupby_2'];

-					if($third_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($third_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($third_column_groupby=='trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($third_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+				if (isset($search_array['groupby_2']) && ! empty($search_array['groupby_2'])) {

+					$third_column_groupby = $search_array['groupby_2'];

+					if ($third_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($third_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($third_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($third_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

-				if(isset($search_array['groupby_3']) && !empty($search_array['groupby_3'])){

-					$fifth_column_groupby=$search_array['groupby_3'];

-					if($fifth_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($fifth_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($fifth_column_groupby == 'trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($fifth_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+				if (isset($search_array['groupby_3']) && ! empty($search_array['groupby_3'])) {

+					$fifth_column_groupby = $search_array['groupby_3'];

+					if ($fifth_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($fifth_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($fifth_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($fifth_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

 	}

-		if(empty($new_arr))

-			$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

+		if (empty($new_arr))

+			$new_arr[] = array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

 		$fixed_arr = array(

 			array("Attempted Calls", "130", "attempted_calls", "", "", ""),

 			array("Completed Calls", "130", "description", "", "", ""),

-			array("Duration","85","billable",'','',''),

-			array("ASR","83","asr",'','',''),

-			array("ACD","83","acd  ",'','',''),

-			array("MCD","83","mcd",'','',''),

-			array("Billable","102","billable",'','',''),

-			array("Cost($currency)","117","cost",'','',''),

+			array("Duration", "85", "billable", '', '', ''),

+			array("ASR", "83", "asr", '', '', ''),

+			array("ACD", "83", "acd  ", '', '', ''),

+			array("MCD", "83", "mcd", '', '', ''),

+			array("Billable", "102", "billable", '', '', ''),

+			array("Cost($currency)", "117", "cost", '', '', ''),

 			);

-		$grid_field_arr = json_encode(array_merge($new_arr,$fixed_arr));

+		$grid_field_arr = json_encode(array_merge($new_arr, $fixed_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_providersummary() {

-	   $buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/provider_export_csv/", 'single')));

+	   $buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/provider_export_csv/", 'single')));

 	   return $buttons_json;

 	}

 	function get_resellersummary_search_form() {

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

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

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-			array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"1")),

+			array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"1")),

 			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array('Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

-			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

+			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''), array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

 		$form['button_search'] = array('name' => 'action', 'id' => "resellersummary_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

 		return $form;

 	}

-	function build_resellersummary($new_column_arr){

+	function build_resellersummary($new_column_arr) {

 		

 $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);		

 		

-$column_arr=array(

-			array("Attempted Calls", "120", "attempted_calls", "", "", "","","true","center"),

-			array("Completed Calls", "120", "description", "", "", "","","true","center"),

-			array("Duration","91","billable",'','','',"","true","center"),

-			array("ASR","78","asr",'','','',"","true","center"),

-			array("ACD","78","acd  ",'','','',"","true","center"),

-			array("MCD","78","mcd",'','','',"","true","center"),

-			array("Billable","80","billable",'','','',"","true","center"),

-			array("Debit($currency)","100","cost",'','','',"","true","right"),

-			array("Cost($currency)","100","price",'','','',"","true","right"),            

-			array("Profit($currency)", "100", "profit", "", "", "","","true","right"),

+$column_arr = array(

+			array("Attempted Calls", "120", "attempted_calls", "", "", "", "", "true", "center"),

+			array("Completed Calls", "120", "description", "", "", "", "", "true", "center"),

+			array("Duration", "91", "billable", '', '', '', "", "true", "center"),

+			array("ASR", "78", "asr", '', '', '', "", "true", "center"),

+			array("ACD", "78", "acd  ", '', '', '', "", "true", "center"),

+			array("MCD", "78", "mcd", '', '', '', "", "true", "center"),

+			array("Billable", "80", "billable", '', '', '', "", "true", "center"),

+			array("Debit($currency)", "100", "cost", '', '', '', "", "true", "right"),

+			array("Cost($currency)", "100", "price", '', '', '', "", "true", "right"),            

+			array("Profit($currency)", "100", "profit", "", "", "", "", "true", "right"),

 			);

-		$grid_field_arr = json_encode(array_merge($new_column_arr,$column_arr));

+		$grid_field_arr = json_encode(array_merge($new_column_arr, $column_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_resellersummary() {

-		 $buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/reseller_export_csv/", 'single')));

+		 $buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/reseller_export_csv/", 'single')));

 		return $buttons_json;

 	}

 	function get_customersummary_search_form() {

         

-		$form['forms'] = array(base_url() . 'summary/customer_search',array('id' => "customersummary_search","name"=>"customersummary_search"));

+		$form['forms'] = array(base_url().'summary/customer_search', array('id' => "customersummary_search", "name"=>"customersummary_search"));

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Accounts', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"GLOBAL")),

-			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+		array('Accounts', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"GLOBAL")),

+			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array('Code Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''),

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')

@@ -176,29 +176,29 @@ 
 

 		return $form;

 	}

-	function build_customersummary($new_column_arr){

+	function build_customersummary($new_column_arr) {

 		

 $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);		

 		

-		$column_arr=array(

-			array("Attempted Calls", "120", "attempted_calls", "", "", "","","true","center"),

-			array("Completed Calls", "120", "description", "", "", "","","true","center"),

-			array("Duration","95","billable",'','','',"","true","center"),

-			array("ASR","85","asr",'','','',"","true","center"),

-			array("ACD","85","acd  ",'','','',"","true","center"),

-			array("MCD","85","mcd",'','','',"","true","center"),

-			array("Billable","90","billable",'','','',"","true","right"),

-			array("Debit($currency)","87","cost",'','','',"","true","right"),

-			array("Cost($currency)","85","price",'','','',"","true","right"),            

-			array("Profit($currency)", "93", "profit", "", "", "","","true","right"),

+		$column_arr = array(

+			array("Attempted Calls", "120", "attempted_calls", "", "", "", "", "true", "center"),

+			array("Completed Calls", "120", "description", "", "", "", "", "true", "center"),

+			array("Duration", "95", "billable", '', '', '', "", "true", "center"),

+			array("ASR", "85", "asr", '', '', '', "", "true", "center"),

+			array("ACD", "85", "acd  ", '', '', '', "", "true", "center"),

+			array("MCD", "85", "mcd", '', '', '', "", "true", "center"),

+			array("Billable", "90", "billable", '', '', '', "", "true", "right"),

+			array("Debit($currency)", "87", "cost", '', '', '', "", "true", "right"),

+			array("Cost($currency)", "85", "price", '', '', '', "", "true", "right"),            

+			array("Profit($currency)", "93", "profit", "", "", "", "", "true", "right"),

 			);

-		$grid_field_arr = json_encode(array_merge($new_column_arr,$column_arr));

+		$grid_field_arr = json_encode(array_merge($new_column_arr, $column_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_customersummary() {

-		$buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/customer_export_csv/", 'single')));

+		$buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/customer_export_csv/", 'single')));

 		return $buttons_json;

 	}

 

Braces +6 added lines, -4 removed lines

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

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

 

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class Summary_form {

 	function __construct() {

@@ -96,8 +97,9 @@ 
 					}

 				}

 	}

-		if(empty($new_arr))

-			$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

+		if(empty($new_arr)) {
+					$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");
+		}
 		$fixed_arr = array(

 			array("Attempted Calls", "130", "attempted_calls", "", "", ""),

 			array("Completed Calls", "130", "description", "", "", ""),

web_interface/astpp/application/modules/summary/views/view_resellersummary_report.php

Spacing +19 added lines, -19 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="accountid" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -71,13 +71,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -89,13 +89,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -120,10 +120,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #time</label>
                                     <select name="time" class='col-md-5 form-control' style='margin-left:5px; selectpicker' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									if (!empty($groupby_field)) {
+									if ( ! empty($groupby_field)) {
 										foreach ($groupby_field as $key => $value) {
 											$selected = null;
-											if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+											if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 												$selected = "selected";
 											}
 											?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+												if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									if (!empty($groupby_field)) {
+									if ( ! empty($groupby_field)) {
 										foreach ($groupby_field as $key => $value) {
 											$selected = null;
-											if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+											if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 												$selected = "selected";
 											}
 											?>
@@ -193,10 +193,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/summary/views/view_customersummary_report.php

Spacing +19 added lines, -19 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="customer_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="customer_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="customer_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="customer_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="accountid" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -71,13 +71,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -89,13 +89,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -120,10 +120,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #Time</label>
                                     <select name="time" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+												if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                             <?php
-											if (!empty($groupby_field)) {
+											if ( ! empty($groupby_field)) {
 												foreach ($groupby_field as $key => $value) {
 													$selected = null;
-													if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+													if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 														$selected = "selected";
 													}
 													?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                             <?php
-											if (!empty($groupby_field)) {
+											if ( ! empty($groupby_field)) {
 												foreach ($groupby_field as $key => $value) {
 													$selected = null;
-													if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+													if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 														$selected = "selected";
 													}
 													?>
@@ -193,10 +193,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/summary/views/view_providersummary_report.php

Spacing +20 added lines, -20 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="provider_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="provider_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="provider_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="provider_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="provider_id" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -74,7 +74,7 @@ 
                                     <select name="trunk_id" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
                                         <?php
-										if (!empty($trunklist)) {
+										if ( ! empty($trunklist)) {
 											foreach ($trunklist as $key => $value) {
 												$selected = null;
 												if (isset($session_info['trunk_id']) && $session_info['trunk_id'] > 0 && $key == $session_info['trunk_id']) {
@@ -88,13 +88,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -106,13 +106,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									   if (!empty($search_string_type)) {
+									   if ( ! empty($search_string_type)) {
 										foreach ($search_string_type as $key => $value) {
 											$selected = null;
-											if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+											if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 												$selected = "selected";
 											}
 									?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #time</label>
                                     <select name="time" class='col-md-5 form-control selectpicker' style='margin-left:5px;'data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+												if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+												if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -188,10 +188,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+												if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -210,10 +210,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/ipmap/models/ipmap_model.php

Spacing +10 added lines, -10 removed lines

@@ -51,9 +51,9 @@ 
 				$value[] = $value1['id'];
 			}
 			//$this->db->where_in('accountid', $value);
-			if(!empty($value)){
+			if ( ! empty($value)) {
 		 		$this->db->where_in('accountid', $value);	
-		 	} else{
+		 	} else {
 		 		$this->db->where_in('accountid', '0');
 		 	}            
 		}
@@ -62,10 +62,10 @@ 
          ASTPP  3.0 
 	 in customer login show ipmap (ACL) module
  	 *******/
-		if( $accountinfo['type'] == '0'){
-		$where=array('accountid'=>$accountinfo['id']);
-		}else{
-		$where='';
+		if ($accountinfo['type'] == '0') {
+		$where = array('accountid'=>$accountinfo['id']);
+		} else {
+		$where = '';
 		}
 		/**************************************************************************************************************/
 		if ($flag) {
@@ -93,11 +93,11 @@ 
     in customer login show ipmap (ACL) module
     *******/
 	$account_data = $this->session->userdata("accountinfo");
-	if($account_data['type'] == '0'){
+	if ($account_data['type'] == '0') {
 	$add_array['accountid'] = $account_data['id'];
 	 }
 	 /*******************************************************************/
-	$data = array('created_date'=>gmdate('Y-m-d H:i:s'),'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'],'status' => $add_array['status'] ,'context' => 'default');
+	$data = array('created_date'=>gmdate('Y-m-d H:i:s'), 'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'], 'status' => $add_array['status'], 'context' => 'default');
 	$this->db->insert("ip_map", $data);
 	return $this->db->insert_id();
 	}
@@ -108,11 +108,11 @@ 
     in customer login show ipmap (ACL) module
     *******/
 	 $account_data = $this->session->userdata("accountinfo");
-	   if($account_data['type'] == '0'){
+	   if ($account_data['type'] == '0') {
 	   $add_array['accountid'] = $account_data['id'];
 	   }
 	   /************************************************************************************************/
-		$data = array('last_modified_date'=>gmdate('Y-m-d H:i:s'),'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'],'status' => $add_array['status'] , 'context' => 'default');
+		$data = array('last_modified_date'=>gmdate('Y-m-d H:i:s'), 'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'], 'status' => $add_array['status'], 'context' => 'default');
 		$this->db->where("id", $id);
 		return $this->db->update("ip_map", $data);
        

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
  	 *******/
 		if( $accountinfo['type'] == '0'){
 		$where=array('accountid'=>$accountinfo['id']);
-		}else{
+		} else{
 		$where='';
 		}
 		/**************************************************************************************************************/