iNextrix / ASTPP

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

Indentation +18 added lines, -18 removed lines

@@ -301,34 +301,34 @@
 				'invoiceid'=>$invoice_id,
 				'description'=>"Your account has been credited due to your customer account recharge done by paypal",
 				'item_type'=>'PAYMENT',
-		  	        'before_balance'=>$account_data['balance'],
+		  			'before_balance'=>$account_data['balance'],
 				'after_balance'=>$account_data['balance']+$balance_amt,
 			   );
-		          $this->db->insert("invoice_details", $details_insert); 
-	          	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
+				  $this->db->insert("invoice_details", $details_insert); 
+			  	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
 			}
-		      }
+			  }
 		}
 		redirect(base_url() . 'user/user/');
-        }
-      }         
+		}
+	  }         
 	redirect(base_url() . 'user/user/');
-    }
+	}
 
-    /**
-     * @param integer $last_invoice_ID
-     * @param string $due_date
-     */
-    function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
+	/**
+	 * @param integer $last_invoice_ID
+	 * @param string $due_date
+	 */
+	function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
 		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-        $this->db->insert("invoices",$invoice_data);
-        $invoiceid = $this->db->insert_id();    
-        return  $invoiceid;  
-    }
+		$this->db->insert("invoices",$invoice_data);
+		$invoiceid = $this->db->insert_id();    
+		return  $invoiceid;  
+	}
     
-    function get_language_text(){
+	function get_language_text(){
    // echo '<pre>'; print_r($_POST); exit;
-      echo gettext($_POST['display']); 
+	  echo gettext($_POST['display']); 
  	}  
     
 }

Spacing +75 added lines, -75 removed lines

@@ -31,23 +31,23 @@ 
 		$this->load->model('db_model');
 	}
     
-	function set_lang_global($post=false){ 
-	if(!is_array($post)){
-		$str=trim($post);
-		$new_arr[$str]=$str;
-		$post=$new_arr;
+	function set_lang_global($post = false) { 
+	if ( ! is_array($post)) {
+		$str = trim($post);
+		$new_arr[$str] = $str;
+		$post = $new_arr;
 	}
-	if(isset($post['fr_FR'])){
-	 $language=$post['fr_FR'];
+	if (isset($post['fr_FR'])) {
+	 $language = $post['fr_FR'];
 	 $this->session->set_userdata('user_language', $language);
 	}
-	if(isset($post['es_ES'])){
-	 $language=$post['es_ES'];
+	if (isset($post['es_ES'])) {
+	 $language = $post['es_ES'];
 	 $this->session->set_userdata('user_language', $language);         
 	}       
-	if(isset($post['en_EN'])){
-	 $language=$post['en_EN'];
-	 $this->session->unset_userdata('user_language',$language);
+	if (isset($post['en_EN'])) {
+	 $language = $post['en_EN'];
+	 $this->session->unset_userdata('user_language', $language);
 	} 
 	$this->locale->set_lang();
 	return true;
@@ -55,17 +55,17 @@ 
 
 	function index() {
 		if ($this->session->userdata('user_login') == FALSE) {
-			if (!empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
-			$_POST['password']=$this->common->encode($_POST['password']);
+			if ( ! empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
+			$_POST['password'] = $this->common->encode($_POST['password']);
 				$user_valid = $this->Auth_model->verify_login($_POST['username'], $_POST['password']);
                 
 				if ($user_valid == 1) {
 					$this->session->set_userdata('user_login', TRUE);
 			$where = "number = '".$this->db->escape_str($_POST['username'])."' OR email = '".$this->db->escape_str($_POST['username'])."'";
-					$result = $this->db_model->getSelect("*", "accounts",$where);
+					$result = $this->db_model->getSelect("*", "accounts", $where);
 					$result = $result->result_array();
 					$result = $result[0];
-					 $logintype=$result['type']== -1 ? 2: $result['type'];
+					 $logintype = $result['type'] == -1 ? 2 : $result['type'];
 					$this->session->set_userdata('logintype', $logintype);
 					$this->session->set_userdata('userlevel_logintype', $result['type']);
 					$this->session->set_userdata('username', $_POST['username']);
@@ -118,15 +118,15 @@ 
 					if ($result['type'] == 0 || $result['type'] == 1) {
 						$menu_list = $this->permission->get_module_access($result['type']);
 						$this->session->set_userdata('mode_cur', 'user');
-						if($result['type'] == 1){
-							redirect(base_url() . 'dashboard/');
-						}else{
-							redirect(base_url() . 'user/user/');
+						if ($result['type'] == 1) {
+							redirect(base_url().'dashboard/');
+						} else {
+							redirect(base_url().'user/user/');
 						}
 					} else {
 						$menu_list = $this->permission->get_module_access($result['type']);
 						$this->session->set_userdata('mode_cur', 'admin');
-						redirect(base_url() . 'dashboard/');
+						redirect(base_url().'dashboard/');
 					}
 				} else {
 		   
@@ -151,7 +151,7 @@ 
 			$this->session->set_userdata('user_login', FALSE);
 			$data['app_name'] = 'ASTPP - Open Source Billing Solution';
 			$this->load->view('view_login', $data);
-		}else {
+		} else {
 	/*
 	*
 	* Purpose : Display logo based on domain name
@@ -173,7 +173,7 @@ 
 	//              echo $data['user_logo'];exit;
 /***************************************************************************************/
 		if ($this->session->userdata('logintype') == '2') {
-		redirect(base_url() . 'dashboard/');
+		redirect(base_url().'dashboard/');
 		} else {
 		redirect(base_url().'user/user/');
 		}
@@ -184,25 +184,25 @@ 
 		$this->session->sess_destroy();
 		redirect(base_url());
 	}
-  function paypal_response(){
-	  if(count($_POST)>0)
+  function paypal_response() {
+	  if (count($_POST) > 0)
 	  {
-		$response_arr=$_POST;
-		$fp=fopen("/var/log/astpp/astpp_payment.log","w+");
+		$response_arr = $_POST;
+		$fp = fopen("/var/log/astpp/astpp_payment.log", "w+");
 		$date = date("Y-m-d H:i:s");
-		fwrite($fp,"====================".$date."===============================\n");
-		foreach($response_arr as $key => $value){	  
-			fwrite($fp,$key.":::>".$value."\n");
+		fwrite($fp, "====================".$date."===============================\n");
+		foreach ($response_arr as $key => $value) {	  
+			fwrite($fp, $key.":::>".$value."\n");
 		}
 		$payment_check = $this->db_model->countQuery("txn_id", "payments", array("txn_id" => $response_arr['txn_id']));
-		if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) && $payment_check == 0){
+		if (($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed") && $payment_check == 0) {
 
-			$paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax","group_title"=>"paypal"))->first_row();
-			$paypal_tax =$paypal_tax['value'];
+			$paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax", "group_title"=>"paypal"))->first_row();
+			$paypal_tax = $paypal_tax['value'];
 			$balance_amt = $actual_amount = $response_arr["custom"];
-			$paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee","group_title"=>"paypal"))->first_row();
+			$paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee", "group_title"=>"paypal"))->first_row();
 			$paypal_fee = $paypal_fee['value'];
-			$paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];
+			$paypalfee = ($paypal_fee == 0) ? '0' : $response_arr["mc_gross"];
 			$account_data = (array)$this->db->get_where("accounts", array("id" => $response_arr["item_number"]))->first_row();
 			$currency = (array)$this->db->get_where('currency', array("id"=>$account_data["currency_id"]))->first_row();
 			$date = date('Y-m-d H:i:s');
@@ -216,35 +216,35 @@ 
 							"currency_rate"=>$currency["currencyrate"],
 							"transaction_details"=>json_encode($response_arr),
 							"date"=>$date);
-			 $paymentid=$this->db->insert('payment_transaction',$payment_trans_array);
-			 $parent_id =$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
+			 $paymentid = $this->db->insert('payment_transaction', $payment_trans_array);
+			 $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
 		 $payment_arr = array("accountid"=> $response_arr["item_number"],
-		 		"payment_mode"=>"1","credit"=>$balance_amt,
+		 		"payment_mode"=>"1", "credit"=>$balance_amt,
 				"type"=>"PAYPAL",
 				"payment_by"=>$parent_id,
 				"notes"=>"Payment Made by Paypal on date:-".$date,
 				"paypalid"=>$paymentid,
 				"txn_id"=>$response_arr["txn_id"],
-				'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+				'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 		 $this->db->insert('payments', $payment_arr);
 		 $this->db->select('invoiceid');
-		 $this->db->order_by('id','desc');
+		 $this->db->order_by('id', 'desc');
 		 $this->db->limit(1);
- 		 $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 		 $last_invoice_ID=isset($last_invoice_result['invoiceid'] ) && $last_invoice_result['invoiceid'] > 0 ?$last_invoice_result['invoiceid'] : 1;
- 		 $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-		 $where="accountid IN ('".$reseller_id."','1')";
+ 		 $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 		 $last_invoice_ID = isset($last_invoice_result['invoiceid']) && $last_invoice_result['invoiceid'] > 0 ? $last_invoice_result['invoiceid'] : 1;
+ 		 $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+		 $where = "accountid IN ('".$reseller_id."','1')";
 		 $this->db->where($where);
 		 $this->db->select('*');
 		 $this->db->order_by('accountid', 'desc');
 		 $this->db->limit(1);
 			 $invoiceconf = $this->db->get('invoice_conf');
 			 $invoiceconf = (array)$invoiceconf->first_row();
-		 $invoice_prefix=$invoiceconf['invoice_prefix'];
+		 $invoice_prefix = $invoiceconf['invoice_prefix'];
 
-		 $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
-		 $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-		 $details_insert=array(
+		 $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
+		 $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+		 $details_insert = array(
 			'created_date'=>$date,
 			'credit'=>$balance_amt,
 			'debit'=>'-',
@@ -254,34 +254,34 @@ 
 			'description'=>"Payment Made by Paypal on date:-".$date,
 			'item_type'=>'PAYMENT',
 	  			'before_balance'=>$account_data['balance'],
-			'after_balance'=>$account_data['balance']+$balance_amt,
+			'after_balance'=>$account_data['balance'] + $balance_amt,
 			);
 		$this->db->insert("invoice_details", $details_insert); 
-		$this->db_model->update_balance($balance_amt,$account_data["id"],"credit");            
-		if($parent_id > 0){
-			  $reseller_ids=$this->common->get_parent_info($parent_id,0);
-			  $reseller_ids=rtrim($reseller_ids,",");
-			  $reseller_arr=explode(",",$reseller_ids);
-			  if(!empty($reseller_arr)){
-			foreach($reseller_arr as $key=>$reseller_id){
+		$this->db_model->update_balance($balance_amt, $account_data["id"], "credit");            
+		if ($parent_id > 0) {
+			  $reseller_ids = $this->common->get_parent_info($parent_id, 0);
+			  $reseller_ids = rtrim($reseller_ids, ",");
+			  $reseller_arr = explode(",", $reseller_ids);
+			  if ( ! empty($reseller_arr)) {
+			foreach ($reseller_arr as $key=>$reseller_id) {
 			  $account_data = (array)$this->db->get_where("accounts", array("id" => $reseller_id))->first_row();
 			  $this->db->select('invoiceid');
-				  $this->db->order_by('id','desc');
+				  $this->db->order_by('id', 'desc');
 				  $this->db->limit(1);
- 					  $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 					  $last_invoice_ID=$last_invoice_result['invoiceid'];
- 		 		  $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-					  $where="accountid IN ('".$reseller_id."','1')";
+ 					  $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 					  $last_invoice_ID = $last_invoice_result['invoiceid'];
+ 		 		  $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+					  $where = "accountid IN ('".$reseller_id."','1')";
 					  $this->db->where($where);
 				  $this->db->select('*');
 				  $this->db->order_by('accountid', 'desc');
 				  $this->db->limit(1);
 				  $invoiceconf = $this->db->get('invoice_conf');
 				  $invoiceconf = (array)$invoiceconf->first_row();
-					  $invoice_prefix=$invoiceconf['invoice_prefix'];
-		 		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-		 		  $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-			  $parent_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
+					  $invoice_prefix = $invoiceconf['invoice_prefix'];
+		 		  $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+		 		  $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+			  $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
 			  $payment_arr = array("accountid"=> $account_data["id"],
 		 					"payment_mode"=>"1",
 		 					"credit"=>$balance_amt,
@@ -290,9 +290,9 @@ 
 							"notes"=>"Your account has been credited due to your customer account recharge done by paypal",
 							"paypalid"=>$paymentid,
 							"txn_id"=>$response_arr["txn_id"],
-							'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+							'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 	 			  $this->db->insert('payments', $payment_arr);
-			  $details_insert=array(
+			  $details_insert = array(
 				'created_date'=>$date,
 				'credit'=>$balance_amt,
 				'debit'=>'-',
@@ -302,31 +302,31 @@ 
 				'description'=>"Your account has been credited due to your customer account recharge done by paypal",
 				'item_type'=>'PAYMENT',
 		  	        'before_balance'=>$account_data['balance'],
-				'after_balance'=>$account_data['balance']+$balance_amt,
+				'after_balance'=>$account_data['balance'] + $balance_amt,
 			   );
 		          $this->db->insert("invoice_details", $details_insert); 
-	          	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
+	          	  $this->db_model->update_balance($balance_amt, $account_data["id"], "credit");  			         
 			}
 		      }
 		}
-		redirect(base_url() . 'user/user/');
+		redirect(base_url().'user/user/');
         }
       }         
-	redirect(base_url() . 'user/user/');
+	redirect(base_url().'user/user/');
     }
 
     /**
      * @param integer $last_invoice_ID
      * @param string $due_date
      */
-    function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
-		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-        $this->db->insert("invoices",$invoice_data);
+    function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
+		$invoice_data = array("accountid"=>$accountid, "invoice_prefix" =>$invoice_prefix, "invoiceid"=>'0000'.$last_invoice_ID, "reseller_id"=>$accountinfo['reseller_id'], "invoice_date"=>gmdate("Y-m-d H:i:s"), "from_date"=>  gmdate("Y-m-d H:i:s"), "to_date"=>gmdate("Y-m-d H:i:s"), "due_date"=>$due_date, "status"=>1, "balance"=>$accountinfo['balance'], "amount"=>$amount, "type"=>'R', "confirm"=>'1');            
+        $this->db->insert("invoices", $invoice_data);
         $invoiceid = $this->db->insert_id();    
         return  $invoiceid;  
     }
     
-    function get_language_text(){
+    function get_language_text() {
    // echo '<pre>'; print_r($_POST); exit;
       echo gettext($_POST['display']); 
  	}  

Braces +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 						$this->session->set_userdata('mode_cur', 'user');
 						if($result['type'] == 1){
 							redirect(base_url() . 'dashboard/');
-						}else{
+						} else{
 							redirect(base_url() . 'user/user/');
 						}
 					} else {
@@ -151,7 +151,7 @@ 
 			$this->session->set_userdata('user_login', FALSE);
 			$data['app_name'] = 'ASTPP - Open Source Billing Solution';
 			$this->load->view('view_login', $data);
-		}else {
+		} else {
 	/*
 	*
 	* Purpose : Display logo based on domain name

web_interface/astpp/application/modules/did/models/did_model.php

Spacing +63 added lines, -63 removed lines

@@ -29,21 +29,21 @@ 
 	}
 
 	function add_did($add_array) {
-	if($add_array['accountid'] > 0 ){
-	  $add_array['assign_date']=gmdate('Y-m-d H:i:s');
+	if ($add_array['accountid'] > 0) {
+	  $add_array['assign_date'] = gmdate('Y-m-d H:i:s');
 	}
 	unset($add_array["action"]);
 	$this->db->insert("dids", $add_array);
-		if($add_array['accountid'] > 0 ){
-	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$add_array['accountid']))->first_row();
-	  $currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$accountinfo['currency_id']));
-	  $available_bal = $this->db_model->update_balance( $add_array["setup"], $add_array['accountid'], "debit");
-	  $this->common->add_invoice_details($accountinfo, "DIDCHRG",  $add_array["setup"], $add_array['number']);
+		if ($add_array['accountid'] > 0) {
+	  $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$add_array['accountid']))->first_row();
+	  $currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$accountinfo['currency_id']));
+	  $available_bal = $this->db_model->update_balance($add_array["setup"], $add_array['accountid'], "debit");
+	  $this->common->add_invoice_details($accountinfo, "DIDCHRG", $add_array["setup"], $add_array['number']);
 	  $accountinfo['did_number'] = $add_array['number'];
 	  $country_id = $this->common->get_field_name('country', 'countrycode', $add_array['country_id']);
 	  $accountinfo['did_country_id'] = $country_id;
-	  $accountinfo['did_setup'] = $this->common_model->calculate_currency($add_array['setup'],'',$currency_name,true,true);
-	  $accountinfo['did_monthlycost'] =$this->common_model->calculate_currency($add_array['monthlycost'],'',$currency_name,true,true);
+	  $accountinfo['did_setup'] = $this->common_model->calculate_currency($add_array['setup'], '', $currency_name, true, true);
+	  $accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($add_array['monthlycost'], '', $currency_name, true, true);
 	  $accountinfo['did_maxchannels'] = $add_array['maxchannels'];
 	  $this->common->mail_to_users('email_add_did', $accountinfo);
 	   }
@@ -54,67 +54,67 @@ 
 		return $this->db->insert_id();
 	}
 
-	function edit_did($data, $id,$number) {
+	function edit_did($data, $id, $number) {
 		unset($data["action"]);
-		$this->db->where('number',$number);
+		$this->db->where('number', $number);
 		$this->db->select('parent_id,accountid');
-		$did_result=$this->db->get('dids');
-		$did_result=(array)$did_result->first_row();
-		if($did_result['accountid'] > 0 || $did_result['parent_id'] > 0){
-		 $data['accountid']=$did_result['accountid'];
-		 $data['parent_id']=$did_result['parent_id'];
+		$did_result = $this->db->get('dids');
+		$did_result = (array)$did_result->first_row();
+		if ($did_result['accountid'] > 0 || $did_result['parent_id'] > 0) {
+		 $data['accountid'] = $did_result['accountid'];
+		 $data['parent_id'] = $did_result['parent_id'];
 		}
 	/**
 	  ASTPP  3.0 
 	  In did edit last modified date and assign date update
 	 **/
-		$data['last_modified_date']=gmdate("Y-m-d H:i:s");
-		if($did_result['accountid'] ==0 && $data['accountid'] > 0 ){
-		$data['assign_date']=gmdate("Y-m-d H:i:s");
+		$data['last_modified_date'] = gmdate("Y-m-d H:i:s");
+		if ($did_result['accountid'] == 0 && $data['accountid'] > 0) {
+		$data['assign_date'] = gmdate("Y-m-d H:i:s");
 	} 
 	$this->db->where("number", $number);
 	$this->db->where("id", $id);
 	$this->db->update("dids", $data);
 		/**************************************/
-		if($did_result['parent_id'] > 0 ){
-			$update_array['call_type']=$data['call_type'];
-			$update_array['extensions']=$data['extensions'];
+		if ($did_result['parent_id'] > 0) {
+			$update_array['call_type'] = $data['call_type'];
+			$update_array['extensions'] = $data['extensions'];
 			$this->db->where("note", $number);
 			$this->db->update("reseller_pricing", $update_array);
 		}
-		if($did_result['accountid'] ==0 && $data['accountid'] > 0 ){
-		$accountinfo=(array)$this->db->get_where('accounts',array("id"=>$data['accountid']))->first_row();
-		$currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$accountinfo['currency_id']));
-		$available_bal = $this->db_model->update_balance( $data["setup"], $data['accountid'], "debit");
+		if ($did_result['accountid'] == 0 && $data['accountid'] > 0) {
+		$accountinfo = (array)$this->db->get_where('accounts', array("id"=>$data['accountid']))->first_row();
+		$currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$accountinfo['currency_id']));
+		$available_bal = $this->db_model->update_balance($data["setup"], $data['accountid'], "debit");
 		$this->common->add_invoice_details($accountinfo, "DIDCHRG", $data["setup"], $number);
 		$accountinfo['did_number'] = $number;
 		$country_id = $this->common->get_field_name('country', 'countrycode', $data['country_id']);
 		$accountinfo['did_country_id'] = $country_id;
-		$accountinfo['did_setup'] = $this->common_model->calculate_currency($data['setup'],'',$currency_name,true,true);
-		$accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($data['monthlycost'],'',$currency_name,true,true);
+		$accountinfo['did_setup'] = $this->common_model->calculate_currency($data['setup'], '', $currency_name, true, true);
+		$accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($data['monthlycost'], '', $currency_name, true, true);
 		$accountinfo['did_maxchannels'] = $data['maxchannels'];
 		$this->common->mail_to_users('email_add_did', $accountinfo);
 		}        
 	}
 
 	function getdid_list($flag, $start = 0, $limit = 0) {
-			$accountinfo=$this->session->userdata('accountinfo');
-			$parent_id= $accountinfo['type']==1 ? $accountinfo['reseller_id'] : 0 ;
+			$accountinfo = $this->session->userdata('accountinfo');
+			$parent_id = $accountinfo['type'] == 1 ? $accountinfo['reseller_id'] : 0;
 	    
-		if($accountinfo['type']==1)
+		if ($accountinfo['type'] == 1)
 		{
-		  $where = array('reseller_id' => $accountinfo['id'],"parent_id"=>$parent_id);
+		  $where = array('reseller_id' => $accountinfo['id'], "parent_id"=>$parent_id);
 		if ($flag) {
-		  if($accountinfo['reseller_id'] > 0 ){
-			 $search_string=$this->db_model->build_search_string('did_list_search');
-			 $search_string= !empty($search_string) ? " AND ".$search_string : null;
-			  if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-			$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
+		  if ($accountinfo['reseller_id'] > 0) {
+			 $search_string = $this->db_model->build_search_string('did_list_search');
+			 $search_string = ! empty($search_string) ? " AND ".$search_string : null;
+			  if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+			$this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
 			  }
 			  $this->db->limit($limit, $start);
-			  $query=$this->db->query("SELECT a.note AS number,a.*,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND a.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = a.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=a.note)) AS accountid FROM reseller_pricing AS a where a.reseller_id=".$accountinfo['id']." AND a.parent_id =".$accountinfo['reseller_id'].$search_string);
+			  $query = $this->db->query("SELECT a.note AS number,a.*,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND a.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = a.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=a.note)) AS accountid FROM reseller_pricing AS a where a.reseller_id=".$accountinfo['id']." AND a.parent_id =".$accountinfo['reseller_id'].$search_string);
 		  }
-		  else{
+		  else {
 			$this->db_model->build_search('did_list_search');
 			$query = $this->db_model->select("*,note as number,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND reseller_pricing.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = reseller_pricing.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=reseller_pricing.note)) AS accountid", "reseller_pricing", $where, "note", "desc", $limit, $start);
 		  }
@@ -132,12 +132,12 @@ 
 	      ASTPP  3.0  last_modified_date,assign_date put in query.
 	      */
 		$this->db->select('dids.id,dids.connectcost,dids.includedseconds,dids.last_modified_date,dids.assign_date,dids.number,dids.extensions,dids.call_type,dids.country_id,dids.init_inc,dids.inc,dids.cost,dids.setup,dids.monthlycost,dids.status,(CASE when parent_id > 0 THEN (SELECT reseller_id as accountid from reseller_pricing where dids.number=reseller_pricing.note AND reseller_pricing.parent_id=0) ELSE dids.accountid END ) as accountid');
-				if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-					$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
+				if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+					$this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
 				}
 		/*********************************************************88*/
 		$this->db->limit($limit, $start);
-		$query=$this->db->get('dids');
+		$query = $this->db->get('dids');
 		  } else {
 		$query = $this->db_model->countQuery("*", "dids");
 		  }
@@ -152,19 +152,19 @@ 
 	$where = array('id' => $id);
 	$this->db->where($where);
 	$this->db->select('accountid,number,parent_id');
-	$did_info=(array)$this->db->get('dids')->first_row();
+	$did_info = (array)$this->db->get('dids')->first_row();
 	$this->db->where("id", $id);
 		$this->db->delete("dids");
 		$this->db->where("note", $did_info['number']);
 		$this->db->delete("reseller_pricing");
-		if($did_info['accountid'] == 0 && $did_info['parent_id'] > 0){
-	  $accountinfo=$this->session->userdata('accountinfo');
-	  $did_info['accountid']=$accouninfo['id'];
-	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$did_info['parent_id']))->first_row();
+		if ($did_info['accountid'] == 0 && $did_info['parent_id'] > 0) {
+	  $accountinfo = $this->session->userdata('accountinfo');
+	  $did_info['accountid'] = $accouninfo['id'];
+	  $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$did_info['parent_id']))->first_row();
 	  $accountinfo['did_number'] = $accountinfo['number'];
 	  $this->common->mail_to_users('email_remove_did', $accountinfo);
-	} elseif($did_info['accountid'] > 0 ){
-	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$did_info['accountid']))->first_row();
+	} elseif ($did_info['accountid'] > 0) {
+	  $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$did_info['accountid']))->first_row();
 	  $accountinfo['did_number'] = $did_info['number'];
 	  $this->common->mail_to_users('email_remove_did', $accountinfo);
 	}
@@ -188,21 +188,21 @@ 
 	}
 
 	function get_account($accountdata) {
-		$q = "SELECT * FROM accounts WHERE number = '" . $this->db->escape_str($accountdata) . "' AND status = 0";
+		$q = "SELECT * FROM accounts WHERE number = '".$this->db->escape_str($accountdata)."' AND status = 0";
 		$query = $this->db->query($q);
 		if ($query->num_rows() > 0) {
 			$row = $query->row_array();
 			return $row;
 		}
 
-		$q = "SELECT * FROM accounts WHERE cc = '" . $this->db->escape_str($accountdata) . "' AND status = 0";
+		$q = "SELECT * FROM accounts WHERE cc = '".$this->db->escape_str($accountdata)."' AND status = 0";
 		$query = $this->db->query($q);
 		if ($query->num_rows() > 0) {
 			$row = $query->row_array();
 			return $row;
 		}
 
-		$q = "SELECT * FROM accounts WHERE accountid = '" . $this->db->escape_str($accountdata) . "' AND status = 0";
+		$q = "SELECT * FROM accounts WHERE accountid = '".$this->db->escape_str($accountdata)."' AND status = 0";
 		$query = $this->db->query($q);
 		if ($query->num_rows() > 0) {
 			$row = $query->row_array();
@@ -237,7 +237,7 @@ 
 				. "dids.dial_as AS dial_as, "
 				. "dids.status AS status "
 				. "FROM dids, reseller_pricing "
-				. "WHERE dids.id = " . $did
+				. "WHERE dids.id = ".$did
 				. " AND reseller_pricing.type = '1' AND reseller_pricing.reseller_id = "
 				. $reseller_id;
 		$query = $this->db->query($sql);
@@ -255,15 +255,15 @@ 
 		else
 			return false;
 	}
-   function edit_did_reseller($did_id,$post) {
+   function edit_did_reseller($did_id, $post) {
 		$accountinfo = $this->session->userdata('accountinfo');
 
-		$where_array=array('reseller_id' => $accountinfo['id'], 'note' => $post['number'], 'type' => '1');
+		$where_array = array('reseller_id' => $accountinfo['id'], 'note' => $post['number'], 'type' => '1');
 	$this->db->where($where_array);
-	$flag='0';
+	$flag = '0';
 		$query = $this->db->get('reseller_pricing');
-		if($query->num_rows() > 0){
-	  $flag='1';
+		if ($query->num_rows() > 0) {
+	  $flag = '1';
 		}
         
 		$this->insert_reseller_pricing($accountinfo, $post);
@@ -305,21 +305,21 @@ 
 	}
 
 	function delete_routes($id, $number, $pricelist_id) {
-		$number = "^" . $number . ".*";
+		$number = "^".$number.".*";
 		$where = array('pricelist_id' => $pricelist_id, 'pattern' => $number);
 		$this->db->where($where);
 		$this->db->delete('routes');
 	}
 
 	function insert_routes($post, $pricelist_id) {
-		$commment = "DID:" . $post['country'] . "," . $post['province'] . "," . $post['city'];
-		$insert_array = array('pattern' => "^" . $post['number'] . ".*", 'comment' => $commment, 'pricelist_id' => $pricelist_id,
+		$commment = "DID:".$post['country'].",".$post['province'].",".$post['city'];
+		$insert_array = array('pattern' => "^".$post['number'].".*", 'comment' => $commment, 'pricelist_id' => $pricelist_id,
 			'connectcost' => $post['connectcost'], 'includedseconds' => $post['included'], 'cost' => $post['cost'], 'inc' => $post['inc']);
 		$this->db->insert('routes', $insert_array);
 		return true;
 	}
 
-	function add_invoice_data($accountid,$charge_type,$description,$credit)
+	function add_invoice_data($accountid, $charge_type, $description, $credit)
 	{
 	$insert_array = array('accountid' => $accountid, 
 				  'charge_type' => $charge_type, 
@@ -335,7 +335,7 @@ 
 	function check_unique_did($number)
 	{
 
-	  $where=array('number'=>$number);
+	  $where = array('number'=>$number);
 	  $query = $this->db_model->countQuery("*", "dids", $where);
 	  return $query;
 	}

Braces +12 added lines, -12 removed lines

@@ -113,8 +113,7 @@ 
 			  }
 			  $this->db->limit($limit, $start);
 			  $query=$this->db->query("SELECT a.note AS number,a.*,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND a.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = a.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=a.note)) AS accountid FROM reseller_pricing AS a where a.reseller_id=".$accountinfo['id']." AND a.parent_id =".$accountinfo['reseller_id'].$search_string);
-		  }
-		  else{
+		  } else{
 			$this->db_model->build_search('did_list_search');
 			$query = $this->db_model->select("*,note as number,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND reseller_pricing.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = reseller_pricing.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=reseller_pricing.note)) AS accountid", "reseller_pricing", $where, "note", "desc", $limit, $start);
 		  }
@@ -123,8 +122,7 @@ 
 		  $query = $this->db_model->countQuery("*", "reseller_pricing", $where);
 		}
 
-		}
-		else
+		} else
 		{	
 		  $this->db_model->build_search('did_list_search');
 		  if ($flag) {
@@ -175,10 +173,11 @@ 
 		$this->db->where("country", ucfirst($field_value));
 		$query = $this->db->get('countrycode');
 		$data = $query->result();
-		if ($query->num_rows > 0)
-			return $data[0]->id;
-		else
-			return '';
+		if ($query->num_rows > 0) {
+					return $data[0]->id;
+		} else {
+					return '';
+		}
 	}
 
 	function bulk_insert_dids($field_value) {
@@ -250,10 +249,11 @@ 
 		$this->db->where("id", $number);
 		$this->db->or_where("number", $number);
 		$query = $this->db->get("dids");
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
    function edit_did_reseller($did_id,$post) {
 		$accountinfo = $this->session->userdata('accountinfo');

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

Spacing +218 added lines, -218 removed lines

@@ -35,14 +35,14 @@ 
 		$this->load->library('csvreader');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function did_add() {
 		$data['page_title'] = 'Create DID';
 		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields(), '');
 		$data['country_id'] = $this->common->get_field_name('id', 'countrycode', array('country' => Common_model::$global_config['system_config']['country']));
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 		$this->load->view('view_did_add_edit', $data);
@@ -64,7 +64,7 @@ 
 			$data['country_id'] = Common_model::$global_config['system_config']['country'];
 		}
 		/*         * ************************************************* */
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 		$edit_data['setup'] = $this->common_model->to_calculate_currency($edit_data['setup'], '', '', false, false);
@@ -83,9 +83,9 @@ 
 
 	function did_save() {
 		$add_array = $this->input->post();
-		$parent_id =isset($add_array['parent_id']) && $add_array['parent_id'] >0 ? $add_array['parent_id'] : '';
-		$accountid =isset($add_array['accountid']) && $add_array['accountid'] > 0 ? $add_array['accountid'] : '';
-		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields($add_array['id'],$parent_id,$accountid), $add_array);
+		$parent_id = isset($add_array['parent_id']) && $add_array['parent_id'] > 0 ? $add_array['parent_id'] : '';
+		$accountid = isset($add_array['accountid']) && $add_array['accountid'] > 0 ? $add_array['accountid'] : '';
+		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields($add_array['id'], $parent_id, $accountid), $add_array);
 		if ($add_array['id'] != '') {
 			$data['page_title'] = 'Edit DID';
 			if ($this->form_validation->run() == FALSE) {
@@ -95,13 +95,13 @@ 
 			} else {
 				$number = $add_array['number'];
 				unset($add_array['number']);
-				$add_array['accountid']=isset($add_array['accountid']) ?$add_array['accountid'] : 0;
+				$add_array['accountid'] = isset($add_array['accountid']) ? $add_array['accountid'] : 0;
 				$add_array['setup'] = $this->common_model->add_calculate_currency($add_array['setup'], '', '', false, false);
 				$add_array['monthlycost'] = $this->common_model->add_calculate_currency($add_array['monthlycost'], '', '', false, false);
 				$add_array['connectcost'] = $this->common_model->add_calculate_currency($add_array['connectcost'], '', '', false, false);
 				$add_array['cost'] = $this->common_model->add_calculate_currency($add_array['cost'], '', '', false, false);
 				$this->did_model->edit_did($add_array, $add_array['id'], $number);
-				echo json_encode(array("SUCCESS" => $number . " DID Updated Successfully!"));
+				echo json_encode(array("SUCCESS" => $number." DID Updated Successfully!"));
 				exit;
 			}
 		} else {
@@ -120,9 +120,9 @@ 
 				$add_array['monthlycost'] = $this->common_model->add_calculate_currency($add_array['monthlycost'], '', '', false, false);
 				$add_array['connectcost'] = $this->common_model->add_calculate_currency($add_array['connectcost'], '', '', false, false);
 				$add_array['cost'] = $this->common_model->add_calculate_currency($add_array['cost'], '', '', false, false);
-				$add_array['accountid']=isset($add_array['accountid'])?$add_array['accountid'] : 0;
+				$add_array['accountid'] = isset($add_array['accountid']) ? $add_array['accountid'] : 0;
 				$this->did_model->add_did($add_array);
-				echo json_encode(array("SUCCESS" => $add_array["number"] . " DID Added Successfully!"));
+				echo json_encode(array("SUCCESS" => $add_array["number"]." DID Added Successfully!"));
 				exit;
 				exit;
 			}
@@ -132,7 +132,7 @@ 
 	function did_remove($id) {
 		$this->did_model->remove_did($id);
 		$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully!');
-		redirect(base_url() . 'did/did_list/');
+		redirect(base_url().'did/did_list/');
 	}
 
 	/*
@@ -141,54 +141,54 @@ 
      */
 
 	function did_list_release($id) {
-	 $accountinfo=$this->session->userdata('accountinfo'); 
-	 $this->db->where('id',$id);
+	 $accountinfo = $this->session->userdata('accountinfo'); 
+	 $this->db->where('id', $id);
 	 $this->db->select('parent_id,accountid,number');
-	 $did_info=(array)$this->db->get('dids')->first_row();
-	 if($did_info['parent_id'] > 0){
-	$str=$this->common->get_parent_info($did_info['parent_id'],$accountinfo['id']);
-	$str=rtrim($str,",");
-	$account_result=(array)$this->db->get_where('accounts',"id IN (".$str.")")->result_array();
-	foreach($account_result as $key=>$acc_row){
-	   $acc_row['did_number']=$did_info['number'];
+	 $did_info = (array)$this->db->get('dids')->first_row();
+	 if ($did_info['parent_id'] > 0) {
+	$str = $this->common->get_parent_info($did_info['parent_id'], $accountinfo['id']);
+	$str = rtrim($str, ",");
+	$account_result = (array)$this->db->get_where('accounts', "id IN (".$str.")")->result_array();
+	foreach ($account_result as $key=>$acc_row) {
+	   $acc_row['did_number'] = $did_info['number'];
 	   $this->common->mail_to_users('email_remove_did', $acc_row);
 	}
 	 }
-	 if($accountinfo['type'] == -1){
-	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
+	 if ($accountinfo['type'] == -1) {
+	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"));
 	  $where = array('id' => $id);
 	  $this->db->where($where);
 	  $this->db->update('dids', $update_array);
-	  if($did_info['parent_id'] > 0){
-		$this->db->where('note',$did_info['number']);
+	  if ($did_info['parent_id'] > 0) {
+		$this->db->where('note', $did_info['number']);
 		$this->db->delete("reseller_pricing");
 	  }
-	  }else{
-	  $reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
-	  $reseller_ids=rtrim($reseller_ids,",");
-	  $where="parent_id IN ($reseller_ids)";
-	  $this->db->where('note',$did_info['number']);
-	  $this->db->delete('reseller_pricing',$where);  
+	  } else {
+	  $reseller_ids = $this->common->get_subreseller_info($accountinfo['id']);
+	  $reseller_ids = rtrim($reseller_ids, ",");
+	  $where = "parent_id IN ($reseller_ids)";
+	  $this->db->where('note', $did_info['number']);
+	  $this->db->delete('reseller_pricing', $where);  
 	  }
-	  if($accountinfo['type']==1){
-		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
-	  }else{
-	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
+	  if ($accountinfo['type'] == 1) {
+		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"));
+	  } else {
+	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"));
 	  }
 	  $where = array('id' => $id);
 	  $this->db->where($where);
 	  $this->db->update('dids', $update_array);
-	  $accountid=$did_info['accountid'] > 0 ? $did_info['accountid']:0;
-	  if($did_info['accountid'] > 0 ){
-	   $email_user_id=$did_info['accountid'];
-	  }elseif($did_info['parent_id'] > 0){
-	$email_user_id=$did_info['parent_id'];
+	  $accountid = $did_info['accountid'] > 0 ? $did_info['accountid'] : 0;
+	  if ($did_info['accountid'] > 0) {
+	   $email_user_id = $did_info['accountid'];
+	  }elseif ($did_info['parent_id'] > 0) {
+	$email_user_id = $did_info['parent_id'];
 	  }
-	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$email_user_id))->first_row();
+	  $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$email_user_id))->first_row();
 	  $accountinfo['did_number'] = $did_info['number'];
 	  $this->common->mail_to_users('email_remove_did', $accountinfo);
 	  $this->session->set_flashdata('astpp_errormsg', 'DID Released Successfully!');
-	  redirect(base_url() . 'did/did_list/');
+	  redirect(base_url().'did/did_list/');
 	}
 
 	function did_list() {
@@ -204,33 +204,33 @@ 
 		}
          
 		if ($this->session->userdata['userlevel_logintype'] == '1') {
-		$drp_list=array();
+		$drp_list = array();
 		$accountinfo = $this->session->userdata('accountinfo');
-		if($accountinfo['reseller_id'] > 0){
-		  $dids_array=$this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
-			}else{
+		if ($accountinfo['reseller_id'] > 0) {
+		  $dids_array = $this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
+			} else {
 			  $this->db->select('id,monthlycost,setup,number');
-			  $this->db->where('accountid',0);
-			  $this->db->where('parent_id',0);
-			  $dids_array=$this->db->get('dids')->result_array();
+			  $this->db->where('accountid', 0);
+			  $this->db->where('parent_id', 0);
+			  $dids_array = $this->db->get('dids')->result_array();
 			}
-			if(!empty($dids_array)){
+			if ( ! empty($dids_array)) {
 		foreach ($dids_array as $drp_value) {
-			if (!empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
+			if ( ! empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
 			$did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'], '', '', true, false);
 			} else {
 			$did_cost = 0;
 			}
-			if (!empty($drp_value['setup']) && $drp_value['setup'] != 0) {
+			if ( ! empty($drp_value['setup']) && $drp_value['setup'] != 0) {
 			$did_setup = $this->common_model->to_calculate_currency($drp_value['setup'], '', '', true, false);
 			} else {
 			$did_setup = 0;
 			}
-			$drp_list[$drp_value['id']] = $drp_value['number'] . ' ( Setup : ' . $did_setup . ')' . '( Monthly : ' . $did_cost . ' )';
+			$drp_list[$drp_value['id']] = $drp_value['number'].' ( Setup : '.$did_setup.')'.'( Monthly : '.$did_cost.' )';
 			/*                 * ********************************************************************************************* */
 		}
 		}
-	  $data['didlist'] = form_dropdown_all(array("name"=>"free_did_list","id"=>"free_did_list","class"=>"did_dropdown"), $drp_list, '');
+	  $data['didlist'] = form_dropdown_all(array("name"=>"free_did_list", "id"=>"free_did_list", "class"=>"did_dropdown"), $drp_list, '');
 		}
 		if ($this->session->userdata['userlevel_logintype'] == '1') {
 			$data['grid_fields'] = $this->did_form->build_did_list_for_reseller_login();
@@ -270,7 +270,7 @@ 
 			$this->session->set_userdata('did_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'did/did_list/');
+			redirect(base_url().'did/did_list/');
 		}
 	}
 
@@ -318,10 +318,10 @@ 
  */
 	function customer_did($accountid, $accounttype) {
 		$json_data = array();
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_did'); 
-		$account_arr=(array)$this->db->get_where('accounts',array("id"=>$accountid))->first_row();
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_did'); 
+		$account_arr = (array)$this->db->get_where('accounts', array("id"=>$accountid))->first_row();
 		$field_name = $accounttype == "reseller" ? "parent_id" : 'accountid';
-	$like_str=!empty($instant_search) ? 
+	$like_str = ! empty($instant_search) ? 
 					"(a.note like '%$instant_search%'
 					OR  a.init_inc like '%$instant_search%'
 					OR  a.inc like '%$instant_search%'
@@ -330,32 +330,32 @@ 
 					OR  a.setup like '%$instant_search%'
 					OR  a.monthlycost like '%$instant_search%'
 					OR  a.connectcost like '%$instant_search%'
-					    )" :null;
+					    )" : null;
 		if ($account_arr['reseller_id'] != 0) {
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 			$this->db->where($like_str);
-			if($accounttype=='reseller'){
-		  $this->db->where('a.note','b.number',false);
-		  $this->db->where('a.reseller_id',$account_arr['id']);
-		  $this->db->where('a.parent_id',$account_arr['reseller_id']);
+			if ($accounttype == 'reseller') {
+		  $this->db->where('a.note', 'b.number', false);
+		  $this->db->where('a.reseller_id', $account_arr['id']);
+		  $this->db->where('a.parent_id', $account_arr['reseller_id']);
 		  $this->db->select('count(a.id) as count');
-		  $count_result=(array)$this->db->get('reseller_pricing as a,dids as b')->first_row();
+		  $count_result = (array)$this->db->get('reseller_pricing as a,dids as b')->first_row();
 		  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
 		  $json_data = $paging_data["json_paging"];
-		  $this->db->where('a.note','b.number',false);
-		  $this->db->where('a.reseller_id',$account_arr['id']);
-		  $this->db->where('a.parent_id',$account_arr['reseller_id']);
+		  $this->db->where('a.note', 'b.number', false);
+		  $this->db->where('a.reseller_id', $account_arr['id']);
+		  $this->db->where('a.parent_id', $account_arr['reseller_id']);
 		  $this->db->select('a . * , b.id, a.reseller_id AS accountid,a.note as number,b.country_id as country_id');
-		  $this->db->limit($paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
-		  $query=$this->db->get('reseller_pricing as a,dids as b');
-		  }else{
-		  $count_result=(array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
+		  $this->db->limit($paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
+		  $query = $this->db->get('reseller_pricing as a,dids as b');
+		  } else {
+		  $count_result = (array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
 			  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
 		  $json_data = $paging_data["json_paging"];
-			  $query=$this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
+			  $query = $this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
 		  }
-		}else{
-						$like_str=!empty($instant_search) ? 
+		} else {
+						$like_str = ! empty($instant_search) ? 
 												"(dids.number like '%$instant_search%'
                                                     OR dids.inc like '%$instant_search%'
                                                     OR dids.cost like '%$instant_search%'
@@ -363,14 +363,14 @@ 
                                                     OR dids.setup like '%$instant_search%'
                                                     OR dids.monthlycost like '%$instant_search%'
                                                     OR dids.connectcost like '%$instant_search%'
-                                                        )" :null;
-			if(!empty($like_str))
+                                                        )" : null;
+			if ( ! empty($like_str))
 			$this->db->where($like_str);
 			$where = array($field_name => $accountid);
 			$count_all = $this->db_model->countQuery("*", "dids", $where);
 			$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);
 			$query = $this->db_model->select("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		}
@@ -382,9 +382,9 @@ 
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
 		$this->db->where($where);
-		$this->db->select("group_concat(concat('''',number,'''')) as number",false);
-		$dids_result=(array)$this->db->get('dids')->first_row();
-		$notes_where="note IN (".$dids_result['number'].")";
+		$this->db->select("group_concat(concat('''',number,'''')) as number", false);
+		$dids_result = (array)$this->db->get('dids')->first_row();
+		$notes_where = "note IN (".$dids_result['number'].")";
 		$this->db->where($notes_where);
 		$this->db->delete('reseller_pricing');
 		$this->db->where($where);
@@ -398,7 +398,7 @@ 
 	 */
 	function did_reseller_edit($action = false, $id = false) {
 		$data['page_title'] = 'Edit DID ';
-		$accountinfo=$this->session->userdata('accountinfo');
+		$accountinfo = $this->session->userdata('accountinfo');
 		if ($action == 'edit') {
 			if (($this->input->post())) {
 				$post = $this->input->post();
@@ -427,7 +427,7 @@ 
 					$accountinfo = $this->did_model->get_account($accountinfo['number']);
 					$reseller_did = $this->db_model->getSelect("*", "reseller_pricing", array('id' => $id));
 					$reseller_didinfo = (array)$reseller_did->first_row();
-					if (!empty($reseller_didinfo)) {
+					if ( ! empty($reseller_didinfo)) {
 						$reseller_didinfo['setup'] = $this->common_model->to_calculate_currency($reseller_didinfo['setup'], '', '', true, false);
 						$reseller_didinfo['monthlycost'] = $this->common_model->to_calculate_currency($reseller_didinfo['monthlycost'], '', '', true, false);
 						$reseller_didinfo['connectcost'] = $this->common_model->to_calculate_currency($reseller_didinfo['connectcost'], '', '', true, false);
@@ -441,43 +441,43 @@ 
 			}
 		}
 		if ($action == 'delete') {
-				$this->db->where('id',$id);
+				$this->db->where('id', $id);
 		$this->db->select('note');
-			$reseller_pricing=(array)$this->db->get('reseller_pricing')->first_row();
-			$did_number=$reseller_pricing['note'];
-			$did_info=(array)$this->db->get_where('dids',array('number'=>$did_number))->first_row();
-			$query="select count(id) as count from reseller_pricing where id >= (select id from reseller_pricing where note =$did_number AND parent_id =".$accountinfo['reseller_id']." AND reseller_id =".$accountinfo['id'].") AND note= $did_number order by id desc";
-		$result=(array)$this->db->query($query)->first_row();
-		if($result['count'] > 0){
-		$str=$this->common->get_parent_info($did_info['parent_id'],$accountinfo['id']);
-		$str=rtrim($str,",");
-		$account_result=(array)$this->db->get_where('accounts',"id IN (".$str.")")->result_array();
-		foreach($account_result as $key=>$acc_row){
-		  $acc_row['did_number']=$did_info['number'];
+			$reseller_pricing = (array)$this->db->get('reseller_pricing')->first_row();
+			$did_number = $reseller_pricing['note'];
+			$did_info = (array)$this->db->get_where('dids', array('number'=>$did_number))->first_row();
+			$query = "select count(id) as count from reseller_pricing where id >= (select id from reseller_pricing where note =$did_number AND parent_id =".$accountinfo['reseller_id']." AND reseller_id =".$accountinfo['id'].") AND note= $did_number order by id desc";
+		$result = (array)$this->db->query($query)->first_row();
+		if ($result['count'] > 0) {
+		$str = $this->common->get_parent_info($did_info['parent_id'], $accountinfo['id']);
+		$str = rtrim($str, ",");
+		$account_result = (array)$this->db->get_where('accounts', "id IN (".$str.")")->result_array();
+		foreach ($account_result as $key=>$acc_row) {
+		  $acc_row['did_number'] = $did_info['number'];
 		  $this->common->mail_to_users('email_remove_did', $acc_row);
 		}
-			$reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
-		$reseller_ids=rtrim($reseller_ids,",");
-		$where="parent_id IN ($reseller_ids)";
-		$this->db->where('note',$did_info['number']);
-		$this->db->delete('reseller_pricing',$where);  
-		$this->db->where('reseller_id',$accountinfo['id']);
-		$this->db->where('note',$did_info['number']);
+			$reseller_ids = $this->common->get_subreseller_info($accountinfo['id']);
+		$reseller_ids = rtrim($reseller_ids, ",");
+		$where = "parent_id IN ($reseller_ids)";
+		$this->db->where('note', $did_info['number']);
+		$this->db->delete('reseller_pricing', $where);  
+		$this->db->where('reseller_id', $accountinfo['id']);
+		$this->db->where('note', $did_info['number']);
 		$this->db->delete('reseller_pricing');  
 		}
-		$this->db->where('number',$did_number);
+		$this->db->where('number', $did_number);
 		$this->db->select('accountid');
-		$did_array=(array)$this->db->get('dids')->first_row();
-		if($did_array['accountid'] > 0){
-		 $customer_info=(array)$this->db->get_where('accounts',array('id'=>$did_array['accountid']))->first_row();
-		 $customer_info['did_number']=$did_number;
+		$did_array = (array)$this->db->get('dids')->first_row();
+		if ($did_array['accountid'] > 0) {
+		 $customer_info = (array)$this->db->get_where('accounts', array('id'=>$did_array['accountid']))->first_row();
+		 $customer_info['did_number'] = $did_number;
 		 $this->common->mail_to_users('email_remove_did', $customer_info);
 		}
-		$did_array=array("accountid"=>0,"parent_id"=>$accountinfo['reseller_id'], "assign_date" => "0000-00-00 00:00:00", "charge_upto" => "0000-00-00 00:00:00");
-		$this->db->where('number',$did_number);
-		$this->db->update('dids',$did_array);
+		$did_array = array("accountid"=>0, "parent_id"=>$accountinfo['reseller_id'], "assign_date" => "0000-00-00 00:00:00", "charge_upto" => "0000-00-00 00:00:00");
+		$this->db->where('number', $did_number);
+		$this->db->update('dids', $did_array);
 			$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully!');
-			redirect(base_url() . 'did/did_list/');
+			redirect(base_url().'did/did_list/');
 		}
 	}
 
@@ -486,37 +486,37 @@ 
 		$accountinfo = $this->session->userdata('accountinfo');
 		$where = array('id' => $accountinfo['id']);
 		$account = $this->db_model->getSelect("*", "accounts", $where);
-		$currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$accountinfo['currency_id']));
-		$accountinfo= (array)$account->first_row();
+		$currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$accountinfo['currency_id']));
+		$accountinfo = (array)$account->first_row();
 		if (($this->input->post())) {
 			$post = $this->input->post();
 			if (isset($post['free_did_list']) && $post['free_did_list'] != '') {
 				// For deduction of admin price to reseller
 				$didinfo = $this->did_model->get_did_by_number($post['free_did_list']);
-				if($accountinfo['reseller_id'] > 0 ){
-				$reseller_pricing_query = $this->db_model->getSelect("call_type,setup,extensions,monthlycost,connectcost,includedseconds,cost,inc", "reseller_pricing", array("note" => $didinfo['number'],'reseller_id'=>$accountinfo['reseller_id']));
+				if ($accountinfo['reseller_id'] > 0) {
+				$reseller_pricing_query = $this->db_model->getSelect("call_type,setup,extensions,monthlycost,connectcost,includedseconds,cost,inc", "reseller_pricing", array("note" => $didinfo['number'], 'reseller_id'=>$accountinfo['reseller_id']));
 				   $reseller_pricing_result = (array)$reseller_pricing_query->first_row();
-				   $didinfo['call_type']=$reseller_pricing_result['call_type'];
-				   $didinfo['extensions']=$reseller_pricing_result['extensions'];
-				   $didinfo['setup']=$reseller_pricing_result['setup'];
-				   $didinfo['monthlycost']=$reseller_pricing_result['monthlycost'];
-				   $didinfo['connectcost']=$reseller_pricing_result['connectcost'];
-				   $didinfo['includedseconds']=$reseller_pricing_result['includedseconds'];
-				   $didinfo['cost']=$reseller_pricing_result['cost'];
-				   $didinfo['inc']=$reseller_pricing_result['inc'];
+				   $didinfo['call_type'] = $reseller_pricing_result['call_type'];
+				   $didinfo['extensions'] = $reseller_pricing_result['extensions'];
+				   $didinfo['setup'] = $reseller_pricing_result['setup'];
+				   $didinfo['monthlycost'] = $reseller_pricing_result['monthlycost'];
+				   $didinfo['connectcost'] = $reseller_pricing_result['connectcost'];
+				   $didinfo['includedseconds'] = $reseller_pricing_result['includedseconds'];
+				   $didinfo['cost'] = $reseller_pricing_result['cost'];
+				   $didinfo['inc'] = $reseller_pricing_result['inc'];
 				}
 				$available_bal = $this->db_model->get_available_bal($accountinfo);
 				 $accountinfo['did_number'] = $didinfo['number'];
 		 $accountinfo['did_country_id'] = $didinfo['country_id'];
-		 $accountinfo['did_setup'] = $this->common_model->calculate_currency($didinfo['setup'],'',$currency_name,true,true);
-		 $accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($didinfo['monthlycost'],'',$currency_name,true,true);
+		 $accountinfo['did_setup'] = $this->common_model->calculate_currency($didinfo['setup'], '', $currency_name, true, true);
+		 $accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($didinfo['monthlycost'], '', $currency_name, true, true);
 		 $accountinfo['did_maxchannels'] = $didinfo['maxchannels'];
 				if ($available_bal >= $didinfo["setup"]) {
 					$available_bal = $this->db_model->update_balance($didinfo['setup'], $accountinfo['id'], "debit");
-					$this->db_model->update("dids", array('parent_id' => $accountinfo['id'],"assign_date"=>gmdate("Y-m-d H:i:s")), array("id" => $didinfo['id']));
+					$this->db_model->update("dids", array('parent_id' => $accountinfo['id'], "assign_date"=>gmdate("Y-m-d H:i:s")), array("id" => $didinfo['id']));
 					$this->did_model->insert_reseller_pricing($accountinfo, $didinfo);
-					$this->common->add_invoice_details($accountinfo,"DIDCHRG",$didinfo['setup'],$didinfo['number']);
-					$this->common->mail_to_users('email_add_did', $accountinfo,"",$didinfo['number']);
+					$this->common->add_invoice_details($accountinfo, "DIDCHRG", $didinfo['setup'], $didinfo['number']);
+					$this->common->mail_to_users('email_add_did', $accountinfo, "", $didinfo['number']);
 					$this->session->set_flashdata('astpp_errormsg', 'DID Purchased Successfully.');
 				} else {
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
@@ -525,7 +525,7 @@ 
 				$this->session->set_flashdata('astpp_notification', 'Please Select DID.');
 			}
 		}
-		redirect(base_url() . 'did/did_list/');
+		redirect(base_url().'did/did_list/');
 		exit;
 	}
 
@@ -547,8 +547,8 @@ 
 
 	function did_download_sample_file($file_name) {
 		$this->load->helper('download');
-		$full_path = base_url() . "assets/Rates_File/" . $file_name . ".csv";
-		$arrContextOptions=array(
+		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -567,28 +567,28 @@ 
 		$this->session->set_userdata('import_did_rate_csv', "");
 		$error_data = $this->session->userdata('import_did_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		if (file_exists($full_path . $error_data) && $error_data != "") {
-			unlink($full_path . $error_data);
+		if (file_exists($full_path.$error_data) && $error_data != "") {
+			unlink($full_path.$error_data);
 			$this->session->set_userdata('import_did_csv_error', "");
 		}
-		$accountinfo=$this->session->userdata('accountinfo');
-		$this->db->where('id',$accountinfo['currency_id']);
+		$accountinfo = $this->session->userdata('accountinfo');
+		$this->db->where('id', $accountinfo['currency_id']);
 		$this->db->select('currency');
-		$currency_info=(array)$this->db->get('currency')->first_row();
-		$data['fields']="DID,Country,Account,Per Minute Cost(".$currency_info['currency']."),Initial Increment,Increment,Setup Fee(".$currency_info['currency']."),Monthly Fee(".$currency_info['currency']."),Call Type,Destination,Status";
+		$currency_info = (array)$this->db->get('currency')->first_row();
+		$data['fields'] = "DID,Country,Account,Per Minute Cost(".$currency_info['currency']."),Initial Increment,Increment,Setup Fee(".$currency_info['currency']."),Monthly Fee(".$currency_info['currency']."),Call Type,Destination,Status";
 		$this->load->view('view_import_did', $data);
 	}
 
 	function did_preview_file() {
 		$data['page_title'] = 'Import DIDs';
 		$config_did_array = $this->config->item('DID-rates-field');
-		$accountinfo=$this->session->userdata('accountinfo');
-		$this->db->where('id',$accountinfo['currency_id']);
+		$accountinfo = $this->session->userdata('accountinfo');
+		$this->db->where('id', $accountinfo['currency_id']);
 		$this->db->select('currency');
-		$currency_info=(array)$this->db->get('currency')->first_row();
-		foreach($config_did_array as $key=>$value){
+		$currency_info = (array)$this->db->get('currency')->first_row();
+		foreach ($config_did_array as $key=>$value) {
 		 $key = str_replace('CURRENCY', $currency_info['currency'], $key);
-		 $did_fields_array[$key]=$value;
+		 $did_fields_array[$key] = $value;
 		}
 		$check_header = $this->input->post('check_header', true);
 		$invalid_flag = false;
@@ -599,10 +599,10 @@ 
 				if ($error == 0) {
 					$uploadedFile = $_FILES["didimport"]["tmp_name"];
 					$full_path = $this->config->item('rates-file-path');
-					$actual_file_name = "ASTPP-DIDs-" . date("Y-m-d H:i:s") . "." . $ext;
-					if (move_uploaded_file($uploadedFile, $full_path . $actual_file_name)) {
+					$actual_file_name = "ASTPP-DIDs-".date("Y-m-d H:i:s").".".$ext;
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
 						$data['page_title'] = 'Import DIDs Preview';
-						$data['csv_tmp_data'] = $this->csvreader->parse_file($full_path . $actual_file_name, $did_fields_array, $check_header);
+						$data['csv_tmp_data'] = $this->csvreader->parse_file($full_path.$actual_file_name, $did_fields_array, $check_header);
 						$data['provider_id'] = $_POST['provider_id'];
 						$data['check_header'] = $check_header;
 						$this->session->set_userdata('import_did_rate_csv', $actual_file_name);
@@ -619,7 +619,7 @@ 
 		if ($invalid_flag) {
 			$str = '';
 			if (empty($_FILES['didimport']['name'])) {
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
 			$data['error'] = $str;
 		}
@@ -630,32 +630,32 @@ 
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('DID-rates-field');
-		$accountinfo=$this->session->userdata('accountinfo');
-		$reseller_id = $accountinfo['type']==1 ? $accountinfo['id']: 0;
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
 	
 		$full_path = $this->config->item('rates-file-path');
 		$did_file_name = $this->session->userdata('import_did_rate_csv');
-		$csv_tmp_data = $this->csvreader->parse_file($full_path . $did_file_name, $new_final_arr_key, $check_header);
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$did_file_name, $new_final_arr_key, $check_header);
 		$flag = false;
 		$i = 0;
 		$number_arr = array();
-		$reseller_array=array();
-		$final_reseller_array=array();
+		$reseller_array = array();
+		$final_reseller_array = array();
 		foreach ($csv_tmp_data as $key => $csv_data) {
         
 			if (isset($csv_data['number']) && $csv_data['number'] != '' && $i != 0) {
 				$str = null;
-				if(isset($csv_data['call_type'])){
-					if(strtolower($csv_data['call_type']) == 'sip-did'){
+				if (isset($csv_data['call_type'])) {
+					if (strtolower($csv_data['call_type']) == 'sip-did') {
 						$call_type = '3';
-					} else if(strtolower($csv_data['call_type']) == 'did-local'){
+					} else if (strtolower($csv_data['call_type']) == 'did-local') {
 						$call_type = '1';
-					} else if(strtolower($csv_data['call_type']) == 'other'){
+					} else if (strtolower($csv_data['call_type']) == 'other') {
 						$call_type = '2';
 					} else {
 						$call_type = '0';
 					}
-				} else{
+				} else {
 					$call_type = '0';
 				}
 				$csv_data['accountid'] = isset($csv_data['accountid']) ? $csv_data['accountid'] : 0;
@@ -664,77 +664,77 @@ 
 				$csv_data['call_type'] = $call_type;
 				$csv_data['extensions'] = isset($csv_data['extensions']) ? $csv_data['extensions'] : '';
 				$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
-				$csv_data['cost'] = !empty($csv_data['cost']) && is_numeric($csv_data['cost']) && $csv_data['cost'] ? $csv_data['cost'] : 0;
-				$csv_data['setup'] = !empty($csv_data['setup']) && is_numeric($csv_data['setup']) && $csv_data['setup'] > 0 ? $csv_data['setup'] : 0;
-				$csv_data['monthlycost'] = !empty($csv_data['monthlycost']) && is_numeric($csv_data['monthlycost']) && $csv_data['monthlycost'] > 0 ? $csv_data['monthlycost'] : 0;
-				$csv_data['connectcost'] = !empty($csv_data['connectcost']) && is_numeric($csv_data['connectcost']) && $csv_data['connectcost'] > 0 ? $csv_data['connectcost'] : 0;
+				$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) && $csv_data['cost'] ? $csv_data['cost'] : 0;
+				$csv_data['setup'] = ! empty($csv_data['setup']) && is_numeric($csv_data['setup']) && $csv_data['setup'] > 0 ? $csv_data['setup'] : 0;
+				$csv_data['monthlycost'] = ! empty($csv_data['monthlycost']) && is_numeric($csv_data['monthlycost']) && $csv_data['monthlycost'] > 0 ? $csv_data['monthlycost'] : 0;
+				$csv_data['connectcost'] = ! empty($csv_data['connectcost']) && is_numeric($csv_data['connectcost']) && $csv_data['connectcost'] > 0 ? $csv_data['connectcost'] : 0;
 				$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
 				$str = $this->data_validate($csv_data);
 				if ($str != "") {
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = $str;
 				} else {
-					if (!in_array($csv_data['number'], $number_arr)) {
+					if ( ! in_array($csv_data['number'], $number_arr)) {
 						$number_count = $this->db_model->countQuery('id', 'dids', array('number' => $csv_data['number']));
 						if ($number_count > 0) {
 							$invalid_array[$i] = $csv_data;
 							$invalid_array[$i]['error'] = 'Duplicate DID found from database';
 						} else {
-							if($csv_data['accountid'] > 0 && $csv_data['setup'] > 0){
+							if ($csv_data['accountid'] > 0 && $csv_data['setup'] > 0) {
 						  $this->db->where('type IN(0,1,3)');
-						  $this->db->where('reseller_id',0);
-						  $this->db->where('deleted',0);
-						  $this->db->where('status',0);
-				  $account_info=(array)$this->db->get_where('accounts',array("number"=>$csv_data['accountid']))->first_row();
-				  if($account_info){
-					  $account_balance=$this->db_model->get_available_bal($account_info);
+						  $this->db->where('reseller_id', 0);
+						  $this->db->where('deleted', 0);
+						  $this->db->where('status', 0);
+				  $account_info = (array)$this->db->get_where('accounts', array("number"=>$csv_data['accountid']))->first_row();
+				  if ($account_info) {
+					  $account_balance = $this->db_model->get_available_bal($account_info);
 					  $setup = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
-					  if($account_balance >= $setup){
-						$field_name=$account_info['type']==1 ? 'parent_id':'accountid';
-						$currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$account_info['currency_id']));
+					  if ($account_balance >= $setup) {
+						$field_name = $account_info['type'] == 1 ? 'parent_id' : 'accountid';
+						$currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$account_info['currency_id']));
 					$csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
 					$csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);
 					$csv_data['connectcost'] = $this->common_model->add_calculate_currency($csv_data['connectcost'], '', '', false, false);
-					$csv_data['setup']=$setup;
-					$csv_data[$field_name]=$account_info['id'];
-					$csv_data['status']=$this->common->get_import_status($csv_data['status']);
-					$available_bal = $this->db_model->update_balance($csv_data["setup"],$account_info['id'], "debit");
+					$csv_data['setup'] = $setup;
+					$csv_data[$field_name] = $account_info['id'];
+					$csv_data['status'] = $this->common->get_import_status($csv_data['status']);
+					$available_bal = $this->db_model->update_balance($csv_data["setup"], $account_info['id'], "debit");
 					$account_info['did_number'] = $csv_data['number'];
 					$account_info['did_country_id'] = $csv_data['country_id'];
-					$account_info['did_setup'] = $this->common_model->calculate_currency($csv_data['setup'],'',$currency_name,true,true);
-					$account_info['did_monthlycost'] = $this->common_model->calculate_currency($csv_data['monthlycost'],'',$currency_name,true,true);
+					$account_info['did_setup'] = $this->common_model->calculate_currency($csv_data['setup'], '', $currency_name, true, true);
+					$account_info['did_monthlycost'] = $this->common_model->calculate_currency($csv_data['monthlycost'], '', $currency_name, true, true);
 					$account_info['did_maxchannels'] = "0";
-					$csv_data['country_id']=$this->common->get_field_name('id','countrycode',array("country"=>$csv_data['country_id']));
-					if($account_info['type']==1){
-					 $reseller_array=$csv_data;
-					 $reseller_array['note']=$csv_data['number'];
-					 $reseller_array['reseller_id']=$account_info['id'];
-					 $reseller_array['parent_id']=$account_info['reseller_id'];
-					 $reseller_array['assign_date']=gmdate("Y-m-d H:i:s");
-					 unset($reseller_array['number'],$csv_data['accountid'],$reseller_array['accountid'],$reseller_array['country_id'],$reseller_array['init_inc']);
-					 $csv_data['accountid']=0;
-					 $final_reseller_array[$i]=$reseller_array;
-					}else{
-					  $csv_data['parent_id']=0;
+					$csv_data['country_id'] = $this->common->get_field_name('id', 'countrycode', array("country"=>$csv_data['country_id']));
+					if ($account_info['type'] == 1) {
+					 $reseller_array = $csv_data;
+					 $reseller_array['note'] = $csv_data['number'];
+					 $reseller_array['reseller_id'] = $account_info['id'];
+					 $reseller_array['parent_id'] = $account_info['reseller_id'];
+					 $reseller_array['assign_date'] = gmdate("Y-m-d H:i:s");
+					 unset($reseller_array['number'], $csv_data['accountid'], $reseller_array['accountid'], $reseller_array['country_id'], $reseller_array['init_inc']);
+					 $csv_data['accountid'] = 0;
+					 $final_reseller_array[$i] = $reseller_array;
+					} else {
+					  $csv_data['parent_id'] = 0;
 					}
-					$csv_data['assign_date']=gmdate("Y-m-d H:i:s");
+					$csv_data['assign_date'] = gmdate("Y-m-d H:i:s");
 					$new_final_arr[$i] = $csv_data;
 					$this->common->mail_to_users('email_add_did', $account_info);
-					  }else{
+					  } else {
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = 'Account have not sufficient amount to purchase this DID.';
 					  }
-				  }else{
+				  } else {
 				$invalid_array[$i] = $csv_data;
 				$invalid_array[$i]['error'] = 'Account not found or assign to invalid account';
 				  }
-							}else{
+							} else {
 				  $csv_data['setup'] = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
 				  $csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
 				  $csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);
 				  $csv_data['connectcost'] = $this->common_model->add_calculate_currency($csv_data['connectcost'], '', '', false, false);
-				  $csv_data['accountid']=0;
-				  $csv_data['country_id']=$this->common->get_field_name('id','countrycode',array("country"=>$csv_data['country_id']));
+				  $csv_data['accountid'] = 0;
+				  $csv_data['country_id'] = $this->common->get_field_name('id', 'countrycode', array("country"=>$csv_data['country_id']));
 				  $new_final_arr[$i] = $csv_data;
 							}
 						}
@@ -747,17 +747,17 @@ 
 			}
 			$i++;
 		}
-		if (!empty($new_final_arr)) {
+		if ( ! empty($new_final_arr)) {
 		   $result = $this->did_model->bulk_insert_dids($new_final_arr);
 		}
-		if(!empty($final_reseller_array)){
+		if ( ! empty($final_reseller_array)) {
 			$this->db->insert_batch('reseller_pricing', $final_reseller_array);
 		}
 	unlink($full_path.$did_file_name);
 		$count = count($invalid_array);
 		if ($count > 0) {
 			$session_id = "-1";
-			$fp = fopen($full_path . $session_id . '.csv', 'w');
+			$fp = fopen($full_path.$session_id.'.csv', 'w');
 			foreach ($new_final_arr_key as $key => $value) {
 				$custom_array[0][$key] = ucfirst($key);
 			}
@@ -767,16 +767,16 @@ 
 				fputcsv($fp, $err_data);
 			}
 			fclose($fp);
-			$this->session->set_userdata('import_did_csv_error', $session_id . ".csv");
+			$this->session->set_userdata('import_did_csv_error', $session_id.".csv");
 			$data["error"] = $invalid_array;
 			$data['provider_id'] = $provider_id;
-			$data['import_record_count'] = count($new_final_arr)+count($reseller_array);
+			$data['import_record_count'] = count($new_final_arr) + count($reseller_array);
 			$data['failure_count'] = count($invalid_array) - 1;
 			$data['page_title'] = 'DID Import Error';
 			$this->load->view('view_import_error', $data);
 		} else {
-			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' DIDs Imported Successfully!');
-			redirect(base_url() . "did/did_list/");
+			$this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' DIDs Imported Successfully!');
+			redirect(base_url()."did/did_list/");
 		}
 	}
 
@@ -785,17 +785,17 @@ 
 		$alpha_regex = "/^[a-z ,.'-]+$/i";
 		$alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 		$email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/";
-		$str.= $csvdata['number'] != '' ? null : 'Number,';
+		$str .= $csvdata['number'] != '' ? null : 'Number,';
 		$str = rtrim($str, ',');
-		if (!$str) {
-			$str.= is_numeric($csvdata['number']) ? null : 'Number,';
-			$str.=!empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : ( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
-			$str.=!empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : ( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
+		if ( ! $str) {
+			$str .= is_numeric($csvdata['number']) ? null : 'Number,';
+			$str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
+			$str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
 			if ($str) {
 				$str = rtrim($str, ',');
 				$error_field = explode(',', $str);
 				$count = count($error_field);
-				$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+				$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 				return $str;
 			} else {
 				return false;
@@ -804,7 +804,7 @@ 
 			$str = rtrim($str, ',');
 			$error_field = explode(',', $str);
 			$count = count($error_field);
-			$str.= $count > 1 ? ' are required' : ' is Required';
+			$str .= $count > 1 ? ' are required' : ' is Required';
 			return $str;
 		}
 	}
@@ -813,38 +813,38 @@ 
 		$this->load->helper('download');
 		$error_data = $this->session->userdata('import_did_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		$data = file_get_contents($full_path . $error_data);
+		$data = file_get_contents($full_path.$error_data);
 		force_download("error_did_rates.csv", $data);
 	}
 
 	function did_export_data_xls() {
 	$account_info = $accountinfo = $this->session->userdata('accountinfo');
-	$currency_id=$account_info['currency_id'];
-	$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+	$currency_id = $account_info['currency_id'];
+	$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 	$query = $this->did_model->getdid_list(true, '0', '10000000');
 	ob_clean();
-	$outbound_array[] = array("DID", "Country", "Account","Per Minute Cost($currency)","Initial Increment","Increment","Setup Fee($currency)","Monthly Fee($currency)","Call Type","Destination","Status","Modified Date","Is Purchased");
+	$outbound_array[] = array("DID", "Country", "Account", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Setup Fee($currency)", "Monthly Fee($currency)", "Call Type", "Destination", "Status", "Modified Date", "Is Purchased");
 	if ($query->num_rows() > 0) {
 	  foreach ($query->result_array() as $row) {
 		$outbound_array[] = array(
 		$row['number'],
 		$this->common->get_field_name("country", "countrycode", $row['country_id']),
 		$this->common->get_field_name("number", "accounts", $row['accountid']),
-		$this->common_model->calculate_currency($row['cost'], '', '',true, false),
+		$this->common_model->calculate_currency($row['cost'], '', '', true, false),
 		$row['init_inc'],
 		$row['inc'],
-		$this->common_model->calculate_currency($row['setup'], '', '',true, false),
-		$this->common_model->calculate_currency($row['monthlycost'], '', '',true, false),
-		$this->common->get_call_type("","",$row['call_type']),
+		$this->common_model->calculate_currency($row['setup'], '', '', true, false),
+		$this->common_model->calculate_currency($row['monthlycost'], '', '', true, false),
+		$this->common->get_call_type("", "", $row['call_type']),
 		$row['extensions'],
-		$this->common->get_status('export','',$row['status']),
+		$this->common->get_status('export', '', $row['status']),
 		$row['last_modified_date'],
 		$this->common->check_did_avl_export($row['number'])
 		);
 	  }
 	}
 		$this->load->helper('csv');
-		array_to_csv($outbound_array, 'DIDs_' . date("Y-m-d") . '.csv');
+		array_to_csv($outbound_array, 'DIDs_'.date("Y-m-d").'.csv');
 	}
 
 }

Braces +22 added lines, -18 removed lines

@@ -34,8 +34,9 @@ 
 		$this->load->model('did_model');
 		$this->load->library('csvreader');
 
-		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 did_add() {
@@ -163,7 +164,7 @@ 
 		$this->db->where('note',$did_info['number']);
 		$this->db->delete("reseller_pricing");
 	  }
-	  }else{
+	  } else{
 	  $reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
 	  $reseller_ids=rtrim($reseller_ids,",");
 	  $where="parent_id IN ($reseller_ids)";
@@ -172,7 +173,7 @@ 
 	  }
 	  if($accountinfo['type']==1){
 		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
-	  }else{
+	  } else{
 	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
 	  }
 	  $where = array('id' => $id);
@@ -181,7 +182,7 @@ 
 	  $accountid=$did_info['accountid'] > 0 ? $did_info['accountid']:0;
 	  if($did_info['accountid'] > 0 ){
 	   $email_user_id=$did_info['accountid'];
-	  }elseif($did_info['parent_id'] > 0){
+	  } elseif($did_info['parent_id'] > 0){
 	$email_user_id=$did_info['parent_id'];
 	  }
 	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$email_user_id))->first_row();
@@ -208,7 +209,7 @@ 
 		$accountinfo = $this->session->userdata('accountinfo');
 		if($accountinfo['reseller_id'] > 0){
 		  $dids_array=$this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
-			}else{
+			} else{
 			  $this->db->select('id,monthlycost,setup,number');
 			  $this->db->where('accountid',0);
 			  $this->db->where('parent_id',0);
@@ -332,8 +333,9 @@ 
 					OR  a.connectcost like '%$instant_search%'
 					    )" :null;
 		if ($account_arr['reseller_id'] != 0) {
-		if(!empty($like_str))
-			$this->db->where($like_str);
+		if(!empty($like_str)) {
+					$this->db->where($like_str);
+		}
 			if($accounttype=='reseller'){
 		  $this->db->where('a.note','b.number',false);
 		  $this->db->where('a.reseller_id',$account_arr['id']);
@@ -348,13 +350,13 @@ 
 		  $this->db->select('a . * , b.id, a.reseller_id AS accountid,a.note as number,b.country_id as country_id');
 		  $this->db->limit($paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
 		  $query=$this->db->get('reseller_pricing as a,dids as b');
-		  }else{
+		  } else{
 		  $count_result=(array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
 			  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
 		  $json_data = $paging_data["json_paging"];
 			  $query=$this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
 		  }
-		}else{
+		} else{
 						$like_str=!empty($instant_search) ? 
 												"(dids.number like '%$instant_search%'
                                                     OR dids.inc like '%$instant_search%'
@@ -364,14 +366,16 @@ 
                                                     OR dids.monthlycost like '%$instant_search%'
                                                     OR dids.connectcost like '%$instant_search%'
                                                         )" :null;
-			if(!empty($like_str))
-			$this->db->where($like_str);
+			if(!empty($like_str)) {
+						$this->db->where($like_str);
+			}
 			$where = array($field_name => $accountid);
 			$count_all = $this->db_model->countQuery("*", "dids", $where);
 			$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);
+			}
 			$query = $this->db_model->select("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		}
 		$did_grid_fields = json_decode($this->did_form->build_did_list_for_customer($accountid, $accounttype));
@@ -714,21 +718,21 @@ 
 					 unset($reseller_array['number'],$csv_data['accountid'],$reseller_array['accountid'],$reseller_array['country_id'],$reseller_array['init_inc']);
 					 $csv_data['accountid']=0;
 					 $final_reseller_array[$i]=$reseller_array;
-					}else{
+					} else{
 					  $csv_data['parent_id']=0;
 					}
 					$csv_data['assign_date']=gmdate("Y-m-d H:i:s");
 					$new_final_arr[$i] = $csv_data;
 					$this->common->mail_to_users('email_add_did', $account_info);
-					  }else{
+					  } else{
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = 'Account have not sufficient amount to purchase this DID.';
 					  }
-				  }else{
+				  } else{
 				$invalid_array[$i] = $csv_data;
 				$invalid_array[$i]['error'] = 'Account not found or assign to invalid account';
 				  }
-							}else{
+							} else{
 				  $csv_data['setup'] = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
 				  $csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
 				  $csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);

web_interface/astpp/application/modules/did/libraries/did_form.php

Spacing +73 added lines, -73 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 did_form {

@@ -31,48 +31,48 @@ 
 		$this->CI = & get_instance();

 	}

 

-	function get_dids_form_fields($id=false,$parent_id='0',$account_id='0') {

-	if ($id != 0){

-	  if($parent_id > 0){

-	  $account_dropdown =  array('Reseller',  array('name' => 'parent_id', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"1", "deleted" => "0","status" => "0"));                

-	  }else{

-	  if($account_id > 0){

-		$account_dropdown =  array('Account ',  array('name' => 'accountid', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0,3", "deleted" => "0","status" => "0"));

+	function get_dids_form_fields($id = false, $parent_id = '0', $account_id = '0') {

+	if ($id != 0) {

+	  if ($parent_id > 0) {

+	  $account_dropdown = array('Reseller', array('name' => 'parent_id', 'disabled' => 'disabled', 'class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"1", "deleted" => "0", "status" => "0"));                

+	  } else {

+	  if ($account_id > 0) {

+		$account_dropdown = array('Account ', array('name' => 'accountid', 'disabled' => 'disabled', 'class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"0,3", "deleted" => "0", "status" => "0"));

 	  }

-	  else{

-		$account_dropdown = array('Account', 'accountid', 'SELECT', '',array("name"=>"accountid","rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id',  'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3","deleted" => "0","status" => "0" ));

+	  else {

+		$account_dropdown = array('Account', 'accountid', 'SELECT', '', array("name"=>"accountid", "rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3", "deleted" => "0", "status" => "0"));

 	  }

 	  }

-   } else{

-	$account_dropdown = array('Account', 'accountid', 'SELECT','' , array("name"=>"accountid","rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id',  'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3", "deleted" => "0","status" => "0" ));

+   } else {

+	$account_dropdown = array('Account', 'accountid', 'SELECT', '', array("name"=>"accountid", "rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3", "deleted" => "0", "status" => "0"));

    }

 

-	$val= $id > 0 ? 'dids.number.'.$id : 'dids.number';

-		$form['forms'] = array(base_url() . '/did/did_save/', array('id' => 'did_form', 'method' => 'POST', 'name' => 'did_form'));

+	$val = $id > 0 ? 'dids.number.'.$id : 'dids.number';

+		$form['forms'] = array(base_url().'/did/did_save/', array('id' => 'did_form', 'method' => 'POST', 'name' => 'did_form'));

 		$form['DID Information'] = array(

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

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

-			  array('Country',array('name'=>'country_id','class'=>'country_id'), 'SELECT', '',array("name"=>"country_id","rules"=>"required"), 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),

+			  array('Country', array('name'=>'country_id', 'class'=>'country_id'), 'SELECT', '', array("name"=>"country_id", "rules"=>"required"), 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),

 			array('City', 'INPUT', array('name' => 'city', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),

 			array('Province', 'INPUT', array('name' => 'province', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),

-			array('Provider', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("type" => "3", "deleted" => "0","status" => "0")),

+			array('Provider', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("type" => "3", "deleted" => "0", "status" => "0")),

 		);

 

 		$form['Billing Information'] = array(

 			$account_dropdown,    

-			array('Connection Cost', 'INPUT', array('name' => 'connectcost', 'size' => '15',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),       

-			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '50',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

-			array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '15',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

-			array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Initial Increment'),

-			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Increment'),

-			array('Setup Fee', 'INPUT', array('name' => 'setup',  'size' => '15', 'class' => 'text field medium'), 'trim|is_numeric|xss_clean', 'tOOL TIP', ''),

-			array('Monthly<br>Fee', 'INPUT', array('name' => 'monthlycost', 'size' => '15',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

+			array('Connection Cost', 'INPUT', array('name' => 'connectcost', 'size' => '15', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),       

+			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '50', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

+			array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '15', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

+			array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Initial Increment'),

+			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Increment'),

+			array('Setup Fee', 'INPUT', array('name' => 'setup', 'size' => '15', 'class' => 'text field medium'), 'trim|is_numeric|xss_clean', 'tOOL TIP', ''),

+			array('Monthly<br>Fee', 'INPUT', array('name' => 'monthlycost', 'size' => '15', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter Password'),

 		);

 

 		$form['DID Setting'] = array(

 			array('Call Type', 'call_type', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_call_type', ''),

 			array('Destination', 'INPUT', array('name' => 'extensions', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),

-			array('Concurrent Calls', 'INPUT', array('name' => 'maxchannels', 'size' => '20',  'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter account number'),

+			array('Concurrent Calls', 'INPUT', array('name' => 'maxchannels', 'size' => '20', 'class' => "text field medium"), 'trim|is_numeric|xss_clean', 'tOOL TIP', 'Please Enter account number'),

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),

 

 		);

@@ -91,13 +91,13 @@ 
 		$form['Search'] = array(

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

 			array('Country', 'country_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),

-			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0")),

+			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"0", "deleted" => "0")),

 			array('Initial Increment', 'INPUT', array('name' => 'init_inc[init_inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'init_inc[init_inc-integer]', '', '', '', 'search_int_type', ''),

-			array('Call Type', 'call_type', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_call_type_search', '',''),

+			array('Call Type', 'call_type', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_call_type_search', '', ''),

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

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

             

-		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' => "did_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

@@ -112,11 +112,11 @@ 
 		$form['forms'] = array("", array('id' => "did_search"));

 		$form['Search'] = array(

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

- 	  array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0")),

-	   array('Call Type', 'call_type', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_call_type_search', '',''),

+ 	  array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"0", "deleted" => "0")),

+	   array('Call Type', 'call_type', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_call_type_search', '', ''),

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

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

-	  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' => "did_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

@@ -131,31 +131,31 @@ 
     */

 	function build_did_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("DID"), "80", "number", "", "", "","EDITABLE","true","center"),

-			array(gettext("Country"), "60", "country_id", "country", "countrycode", "get_field_name","","true","center"),

+			array(gettext("DID"), "80", "number", "", "", "", "EDITABLE", "true", "center"),

+			array(gettext("Country"), "60", "country_id", "country", "countrycode", "get_field_name", "", "true", "center"),

 			array(gettext("Account"), "95", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new"),

-			array("Per Minute <br>Cost($currency)", "85", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-			array(gettext("Initial <br>Increment"), "80", "init_inc", "", "", "","","true","center"),

-			array(gettext("Increment"), "90", "inc", "", "", "","","true","center"),

-			array("Setup <br>Fee($currency)", "70", "setup", "setup", "setup", "convert_to_currency","","true","right"),

-			array("Monthly<br>Fee($currency)", "90", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency","","true","right"),

-			array(gettext("Call Type"), "90", "call_type", "call_type", "call_type", "get_call_type","","true","center"),

-			array(gettext("Destination"), "80", "extensions", "", "", "","","true","center"),       

-			array(gettext("Status"), "90", "status", "status", "dids", "get_status","","true","center"),

-			array(gettext("Modified <br/>Date"), "90", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

-			array(gettext("Is Purchased?"), "110", "number", "number", "number", "check_did_avl","","true","center"),

-			array("Action", "100", "", "", "", array("EDIT" => array("url" => "did/did_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Per Minute <br>Cost($currency)", "85", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+			array(gettext("Initial <br>Increment"), "80", "init_inc", "", "", "", "", "true", "center"),

+			array(gettext("Increment"), "90", "inc", "", "", "", "", "true", "center"),

+			array("Setup <br>Fee($currency)", "70", "setup", "setup", "setup", "convert_to_currency", "", "true", "right"),

+			array("Monthly<br>Fee($currency)", "90", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency", "", "true", "right"),

+			array(gettext("Call Type"), "90", "call_type", "call_type", "call_type", "get_call_type", "", "true", "center"),

+			array(gettext("Destination"), "80", "extensions", "", "", "", "", "true", "center"),       

+			array(gettext("Status"), "90", "status", "status", "dids", "get_status", "", "true", "center"),

+			array(gettext("Modified <br/>Date"), "90", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

+			array(gettext("Is Purchased?"), "110", "number", "number", "number", "check_did_avl", "", "true", "center"),

+			array("Action", "100", "", "", "", array("EDIT" => array("url" => "did/did_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "did/did_remove/", "mode" => "single")))

 			));

 		return $grid_field_arr;

@@ -167,22 +167,22 @@ 
      */

 		function build_did_list_for_reseller_login() {

 	 $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("DID", "90", "number", "", "", "","EDITABLE","","true","center"),

-			array("Account", "100", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

-			array("Per Minute<br>Cost($currency)", "80", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-			array("Initial <br>Increment", "100", "init_inc", "", "", "","","true","center"),

-			array("Increment", "95", "inc", "", "", "","","true","center"),

-			array("Setup <br> Fee($currency)", "90", "setup", "setup", "setup", "convert_to_currency","","true","right"),

-			array("Monthly<br> fee($currency)", "90", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency","","true","right"),

-			array("Call Type", "80", "call_type", "call_type", "call_type", "get_call_type","","true","center"),

-			array("Destination", "95", "extensions", "", "", "","","true","center"),

-			array("Status", "90", "status", "status", "reseller_pricing", "get_status","","true","center"),

-			array("Modified Date", "130", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

-			array("Is purchased?", "100", "number", "number", "number", "check_did_avl_reseller","","true","center"),

+			array("DID", "90", "number", "", "", "", "EDITABLE", "", "true", "center"),

+			array("Account", "100", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new", "", "true", "center"),

+			array("Per Minute<br>Cost($currency)", "80", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+			array("Initial <br>Increment", "100", "init_inc", "", "", "", "", "true", "center"),

+			array("Increment", "95", "inc", "", "", "", "", "true", "center"),

+			array("Setup <br> Fee($currency)", "90", "setup", "setup", "setup", "convert_to_currency", "", "true", "right"),

+			array("Monthly<br> fee($currency)", "90", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency", "", "true", "right"),

+			array("Call Type", "80", "call_type", "call_type", "call_type", "get_call_type", "", "true", "center"),

+			array("Destination", "95", "extensions", "", "", "", "", "true", "center"),

+			array("Status", "90", "status", "status", "reseller_pricing", "get_status", "", "true", "center"),

+			array("Modified Date", "130", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

+			array("Is purchased?", "100", "number", "number", "number", "check_did_avl_reseller", "", "true", "center"),

 		array("Action", "90", "", "", "", array("EDIT" => array("url" => "did/did_reseller_edit/edit/", "mode" => "popup"),

 					"DELETE" => array("url" => "did/did_reseller_edit/delete/", "mode" => "single")))

 				));

@@ -191,27 +191,27 @@ 
 	/************************************************************************/

 	function build_grid_buttons() {

 		$buttons_json = json_encode(array(

-			array(gettext("Create"),"btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/did/did_add/", "popup","medium"),

-			array(gettext("Delete"), "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "/did/did_delete_multiple/"),

-			array(gettext("Import"), "btn btn-line-blue","fa fa-upload fa-lg", "button_action", "/did/did_import/", '',"small"),            

-			array(gettext("Export"),"btn btn-xing" ,"fa fa-download fa-lg", "button_action", "/did/did_export_data_xls", 'single')

+			array(gettext("Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/did/did_add/", "popup", "medium"),

+			array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/did/did_delete_multiple/"),

+			array(gettext("Import"), "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/did/did_import/", '', "small"),            

+			array(gettext("Export"), "btn btn-xing", "fa fa-download fa-lg", "button_action", "/did/did_export_data_xls", 'single')

 			));

 		return $buttons_json;

 	}

 

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

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

 		$grid_field_arr = json_encode(array(

-	array("DID", "110", "number", "", "", "","","true","center"),

-	array("Country", "110", "country_id", "country", "countrycode", "get_field_name","","true","center"),

-	array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-	array("Initial Increment", "140", "init_inc", "", "", "","","true","center"),

-	array("Increment", "120", "inc", "", "", "","","true","center"),

-	array("Setup Fee($currency)", "140", "setup", "setup", "setup", "convert_to_currency","","true","right"),

-	array("Monthly Fee($currency)", "140", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency","","true","right"),

+	array("DID", "110", "number", "", "", "", "", "true", "center"),

+	array("Country", "110", "country_id", "country", "countrycode", "get_field_name", "", "true", "center"),

+	array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+	array("Initial Increment", "140", "init_inc", "", "", "", "", "true", "center"),

+	array("Increment", "120", "inc", "", "", "", "", "true", "center"),

+	array("Setup Fee($currency)", "140", "setup", "setup", "setup", "convert_to_currency", "", "true", "right"),

+	array("Monthly Fee($currency)", "140", "monthlycost", "monthlycost", "monthlycost", "convert_to_currency", "", "true", "right"),

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

 		));

 		return $grid_field_arr;

Braces +5 added lines, -5 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 did_form {

 

@@ -35,11 +36,10 @@ 
 	if ($id != 0){

 	  if($parent_id > 0){

 	  $account_dropdown =  array('Reseller',  array('name' => 'parent_id', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"1", "deleted" => "0","status" => "0"));                

-	  }else{

+	  } else{

 	  if($account_id > 0){

 		$account_dropdown =  array('Account ',  array('name' => 'accountid', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0,3", "deleted" => "0","status" => "0"));

-	  }

-	  else{

+	  } else{

 		$account_dropdown = array('Account', 'accountid', 'SELECT', '',array("name"=>"accountid","rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id',  'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3","deleted" => "0","status" => "0" ));

 	  }

 	  }

web_interface/astpp/application/modules/did/views/view_import_did.php

Spacing +11 added lines, -11 removed lines

@@ -15,12 +15,12 @@ 
               <div class="col-md-12">
             	<div class="w-box">
             	 <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
 						echo $error;
 					}?>
                  </span>
                    <h3 class="padding-t-10 padding-l-16">File must be in the following format(.csv):</h3>
-            <p><?= $fields;?></p>
+            <p><?= $fields; ?></p>
                  </div>
                </div>
                <div class="col-md-12  no-padding">
@@ -30,7 +30,7 @@ 
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Provider:</label>
                                <div>
-                               <? $provider_id = form_dropdown('provider_id', $this->db_model->build_concat_select_dropdown("id,first_name,number", " accounts", "where_arr", array("type" => "3","status"=>"0","deleted" => "0")), '');
+                               <? $provider_id = form_dropdown('provider_id', $this->db_model->build_concat_select_dropdown("id,first_name,number", " accounts", "where_arr", array("type" => "3", "status"=>"0", "deleted" => "0")), '');
 							echo $provider_id;
 							  ?> </div>
                            </div>
@@ -84,24 +84,24 @@ 
 <?php }?>    
         
 <?php
-	if(isset($csv_tmp_data) && !empty($csv_tmp_data)){ ?>
+	if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
  <section class="slice color-three">
 	<div class="w-section inverse no-padding">
            <div class="container">
 	<div class="row">
              
         <div class="col-md-12 margin-t-10">        
-            <form id="import_form" name="import_form" action="<?=base_url()?>did/did_import_file/<?= $provider_id?>/<?=$check_header;?>/" method="POST">
+            <form id="import_form" name="import_form" action="<?=base_url()?>did/did_import_file/<?= $provider_id?>/<?=$check_header; ?>/" method="POST">
             <table width="100%" border="1"  class="details_table table">
-                <?php  $cnt =0;
-					foreach($csv_tmp_data as $csv_key => $csv_value){
-						if($csv_key <  15){
+                <?php  $cnt = 0;
+					foreach ($csv_tmp_data as $csv_key => $csv_value) {
+						if ($csv_key < 15) {
 							echo "<tr>";
-							foreach($csv_value as $field_name => $field_val){
-								if($csv_key == 0){
+							foreach ($csv_value as $field_name => $field_val) {
+								if ($csv_key == 0) {
 					$cnt++;
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else {
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

Braces +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 							foreach($csv_value as $field_name => $field_val){
 								if($csv_key == 0){
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

web_interface/astpp/application/modules/did/views/view_did_manage_reseller_add.php

Spacing +3 added lines, -3 removed lines

@@ -46,9 +46,9 @@
         	      <li class="col-md-12">
                         <label class="col-md-3 no-padding">Call Type</label>
                   		  <select name="call_type" class="col-md-5 form-control selectpicker" data-live-search='true'>
-                  		  <?php $calltype=$this->common->set_call_type();
-				  			 foreach($calltype as $key=>$value){
-				  			   $selected=$reseller_didinfo['call_type']==$key ? "selected='selected'" : '';
+                  		  <?php $calltype = $this->common->set_call_type();
+				  			 foreach ($calltype as $key=>$value) {
+				  			   $selected = $reseller_didinfo['call_type'] == $key ? "selected='selected'" : '';
 				  			   echo "<option value='$key'$selected>$value</option>";
 				  			 }
 				  			 ?>

web_interface/astpp/application/modules/did/language/english/did_lang.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 $_doctypes = array(
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

web_interface/astpp/application/modules/did/language/spanish/did_lang.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 $_doctypes = array(
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

web_interface/astpp/application/modules/reports/models/reports_model.php

Spacing +64 added lines, -64 removed lines

@@ -29,31 +29,31 @@ 
 ASTPP  3.0 
     For Detail Customer Report List,Export
 **/
-	function getcustomer_cdrs($flag, $start, $limit,$export =false) {
+	function getcustomer_cdrs($flag, $start, $limit, $export = false) {
 		$this->db_model->build_search('customer_cdr_list_search');
 		$account_data = $this->session->userdata("accountinfo");
-		$where['reseller_id']=$account_data['type']== 1 ? $account_data['id']:0;
+		$where['reseller_id'] = $account_data['type'] == 1 ? $account_data['id'] : 0;
 		//$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";
+		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";
 		}
 
-		$types = array('0','3');
+		$types = array('0', '3');
 		//$this->db->or_where_in('type', $types);    
 		$this->db->where_in('type', $types);  
 		
 		$this->db->where($where);
-		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
+			if ( ! $export)
 				$this->db->limit($limit, $start);
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids');
 		}
 		$result = $this->db->get('cdrs');
@@ -62,23 +62,23 @@ 
 /*
  * Below function using by Detail reseller report
  */
-	function getreseller_cdrs($flag, $start, $limit,$export=false) {
+	function getreseller_cdrs($flag, $start, $limit, $export = false) {
 		$this->db_model->build_search('reseller_cdr_list_search');
 		$account_data = $this->session->userdata("accountinfo");
-		$where['reseller_id']=$account_data['type']== 1 ? $account_data['id']:0;
-		$where["accountid <>"]=$account_data['type']== 1 ? $account_data['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['reseller_id'] = $account_data['type'] == 1 ? $account_data['id'] : 0;
+		$where["accountid <>"] = $account_data['type'] == 1 ? $account_data['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";
 		}
 		$this->db->where($where);
-		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
+			if ( ! $export)
 				$this->db->limit($limit, $start);
 				$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype');
 		} else {
@@ -89,48 +89,48 @@ 
 	}
 		/*Below function using by Detail provider report
   */
-	function getprovider_cdrs($flag, $start, $limit,$export=false) {
+	function getprovider_cdrs($flag, $start, $limit, $export = false) {
 		$this->db_model->build_search('provider_cdr_list_search');
 		$account_data = $this->session->userdata("accountinfo");
-		$where=array();
-		if($account_data['type']== 3 ){ 
-			$where['provider_id']= $account_data['id'];
+		$where = array();
+		if ($account_data['type'] == 3) { 
+			$where['provider_id'] = $account_data['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";
+		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";
 		}
 		$this->db->where('trunk_id !=', '');
 		$this->db->where($where);
-		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
+			if ( ! $export)
 				$this->db->limit($limit, $start);
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost');
 		}
 		$result = $this->db->get('cdrs');
 	  //  echo $this->db->last_query();
 		return $result;
 	}
-	 function users_cdrs_list($flag,$accountid,$entity_type,$start,$limit) {
+	 function users_cdrs_list($flag, $accountid, $entity_type, $start, $limit) {
 		$where = "callstart >= '".date('Y-m-d 00:00:00')."' AND callstart <='".date('Y-m-d 23:59:59')."' AND ";
-		$account_type= $entity_type =='provider' ? 'provider_id' :'accountid';
-		$where.="accountid = '".$accountid."' ";
+		$account_type = $entity_type == 'provider' ? 'provider_id' : 'accountid';
+		$where .= "accountid = '".$accountid."' ";
 		//~ if($entity_type == 'provider'){
 		 //~ $where.="OR provider_id = '".$accountid."'";
 		//~ }
-		$table=$entity_type=='reseller'?'reseller_cdrs' : 'cdrs';
+		$table = $entity_type == 'reseller' ? 'reseller_cdrs' : 'cdrs';
 		if ($flag) {
 			$query = $this->db_model->select("*", $table, $where, "callstart", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery("*",$table, $where);
+			$query = $this->db_model->countQuery("*", $table, $where);
 		}
 		return $query;
 
@@ -154,13 +154,13 @@ 
 		return $query;
 	}
 
-	function get_refill_list($flag, $start, $limit,$export=false) {
+	function get_refill_list($flag, $start, $limit, $export = false) {
 		$this->db_model->build_search('cdr_refill_search');
 		$accountinfo = $this->session->userdata('accountinfo');
-		$where['payment_by']=$accountinfo['type']==1 ? $accountinfo['id']:-1;
+		$where['payment_by'] = $accountinfo['type'] == 1 ? $accountinfo['id'] : -1;
 		if ($flag) {
-			if($export)
-		  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
+			if ($export)
+		  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", "", "");
 			else
 		   $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
 		} else {
@@ -179,10 +179,10 @@ 
 			$reseller_id = "0";
 		}
 		if ($flag) {
-			$query = $this->db_model->select_by_in("*", "commission","" , "date", "DESC", $limit, $start,"","reseller_id",$reseller_id);
+			$query = $this->db_model->select_by_in("*", "commission", "", "date", "DESC", $limit, $start, "", "reseller_id", $reseller_id);
 
 		} else {
-			$query = $this->db_model->countQuery_by_in("*", "commission", "","reseller_id",$reseller_id);
+			$query = $this->db_model->countQuery_by_in("*", "commission", "", "reseller_id", $reseller_id);
 		}
 
 		return $query;
@@ -192,22 +192,22 @@ 
 Charge History
 ***********/
 	function getcharges_list($flag, $start = 0, $limit = 0) {
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['id'];
-	if($accountinfo['type'] == 1){
-		$where['reseller_id']=$reseller_id;
-	} else{
-		$where['reseller_id']=0;
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['id'];
+	if ($accountinfo['type'] == 1) {
+		$where['reseller_id'] = $reseller_id;
+	} else {
+		$where['reseller_id'] = 0;
 	}
-	if($this->session->userdata('advance_search') != 1){
-		$where['created_date >=']=gmdate("Y-m-01 00:00:01");
-		$where['created_date <=']=gmdate("Y-m-d 23:59:59");
+	if ($this->session->userdata('advance_search') != 1) {
+		$where['created_date >='] = gmdate("Y-m-01 00:00:01");
+		$where['created_date <='] = gmdate("Y-m-d 23:59:59");
 	}
 	$this->db_model->build_search('charges_list_search');
 	$this->db->where($where);
-	$whr= "( invoiceid =0 OR invoiceid in (  select id  from invoices where confirm = 1) )";
+	$whr = "( invoiceid =0 OR invoiceid in (  select id  from invoices where confirm = 1) )";
 	$this->db->where($whr);
-	$this->db->where('item_type <>','STANDARD');
+	$this->db->where('item_type <>', 'STANDARD');
 	if ($flag) {
 		$query = $this->db_model->select('*', "invoice_details", "", "id", "DESC", $limit, $start);
 	} else {
@@ -220,15 +220,15 @@ 
 	/* ASTPP  3.0 
      * This function using for customer edit
      */
-   function get_customer_charge_list($flag,$accountid,$start = 0, $limit = 0){
+   function get_customer_charge_list($flag, $accountid, $start = 0, $limit = 0) {
 		$this->db_model->build_search('charges_list_search');
-		$accountinfo=$this->session->userdata('accountinfo');
-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
-		$where['reseller_id']=$reseller_id;
-		$where['accountid']=$accountid;
-		if($this->session->userdata('advance_search') != 1){
-			 $where['created_date >=']=gmdate("Y-m-1 00:00:00");
-			 $where['created_date <=']=gmdate("Y-m-d 23:59:59");
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$where['reseller_id'] = $reseller_id;
+		$where['accountid'] = $accountid;
+		if ($this->session->userdata('advance_search') != 1) {
+			 $where['created_date >='] = gmdate("Y-m-1 00:00:00");
+			 $where['created_date <='] = gmdate("Y-m-d 23:59:59");
 		}
 		if ($flag) {
 			$query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
@@ -237,7 +237,7 @@ 
 		}
 		return $query;        
 	}
-	function get_customer_refillreport($flag,$accountid,$start = 0, $limit = 0){
+	function get_customer_refillreport($flag, $accountid, $start = 0, $limit = 0) {
 		$where = array("accountid"=>$accountid);
 		if ($flag) {
 			$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);

Braces +19 added lines, -15 removed lines

@@ -46,14 +46,15 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids');
 		}
 		$result = $this->db->get('cdrs');
@@ -74,12 +75,13 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 				$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype');
 		} else {
 		   $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids');
@@ -105,14 +107,15 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost');
 		}
 		$result = $this->db->get('cdrs');
@@ -159,10 +162,11 @@ 
 		$accountinfo = $this->session->userdata('accountinfo');
 		$where['payment_by']=$accountinfo['type']==1 ? $accountinfo['id']:-1;
 		if ($flag) {
-			if($export)
-		  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
-			else
-		   $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
+			if($export) {
+					  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
+			} else {
+					   $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
+			}
 		} else {
 			$query = $this->db_model->countQuery("*", "payments", $where);
 		}