iNextrix / ASTPP

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

Spacing +25 added lines, -25 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

     exit('No direct script access allowed');

 

 class Charges_form {

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

    

     function get_charge_form_fields() {

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

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

         $form['Information'] = array(

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

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

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

             $loginid = $account_data['id'];

 

-        }else{

+        } else {

             $loginid = "0";

         }

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

         $form['Search'] = array(

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

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

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

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

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

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

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

 		

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

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

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

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

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

 		

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

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

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

 /**

 ASTPP  3.0 

 For DID edit on DID number

 **/

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

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

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

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

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

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

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

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

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

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

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

             /**

 	    ASTPP  3.0 

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

             **/

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

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

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

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

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

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

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

            /*

             ASTPP  3.0 

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

 

     function build_grid_buttons() {

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

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

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

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

             ));

         return $buttons_json;

     }

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

 		

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

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

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

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

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

 		

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

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

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

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

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

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

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

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

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

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

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

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

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

                 ));

         return $grid_field_arr;

web_interface/astpp/application/modules/charges/views/view_charges_list.php

Spacing +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@
         
     });
 </script>
- <script src="<?php echo base_url();?>assets/demo/sh/shBrushJScript.js"></script>   
- <script src="<?php echo base_url();?>assets/demo/sh/shCore.js"></script>   
- <script src="<?php echo base_url();?>assets/demo/jquery.searchabledropdown-1.0.8.src.js"></script>  
+ <script src="<?php echo base_url(); ?>assets/demo/sh/shBrushJScript.js"></script>   
+ <script src="<?php echo base_url(); ?>assets/demo/sh/shCore.js"></script>   
+ <script src="<?php echo base_url(); ?>assets/demo/jquery.searchabledropdown-1.0.8.src.js"></script>  
 
 
 <? endblock() ?>

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

Spacing +10 added lines, -10 removed lines

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

web_interface/astpp/application/modules/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,35 +630,35 @@ 
         $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;
@@ -667,77 +667,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;
                             }
                         }
@@ -750,17 +750,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);
             }
@@ -770,16 +770,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/");
         }
     }
 
@@ -788,17 +788,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;
@@ -807,7 +807,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;
         }
     }
@@ -816,38 +816,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');
     }
 
 }

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;

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

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
               <div class="col-md-12">
             	<div class="w-box">
             	 <span  style="margin-left:10px; text-align: center;background-color: none;color:#1c8400;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
                         echo $error;
                     }?>
                  </span>

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

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php include(FCPATH.'application/views/popup_header.php'); ?>
-<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.7.1.js"></script>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/jquery-1.7.1.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/facebox.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/flexigrid.js"></script>
 <script type="text/javascript" src="/js/validate.js"></script>
@@ -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/views/view_import_error.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
         	<div class="row">
                 <div class="col-md-12">      
           
-                    Records Imported Successfully: <?= $import_record_count;?><br/>
+                    Records Imported Successfully: <?= $import_record_count; ?><br/>
                     Records Not Imported : <?= $failure_count?></div>  
             </div>
         </div>
@@ -38,7 +38,7 @@ 
         </div>
     </div> 
 <br/>
-                    <?php if(isset($provider_id) && $provider_id != ""){ ?><div class="col-md-12 padding-b-10">
+                    <?php if (isset($provider_id) && $provider_id != "") { ?><div class="col-md-12 padding-b-10">
                    <div class="pull-right">
                         <a href="<?= base_url().'did/did_error_download/'?>"><input class="btn btn-line-sky margin-x-10" id="dwnld_err" type="button" name="action" value="Download Errors" /> </a>
                        

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

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
     DID Import Process <?//= isset($pricelistid)?$this->common->get_field_name('name', 'pricelists',$pricelistid):"";?><? //= $page_title ?>
 <? endblock() ?>
 <? startblock('content') ?>  
-<?php if(!isset($csv_tmp_data)){ ?>
+<?php if ( ! isset($csv_tmp_data)) { ?>
 
 <section class="slice color-three padding-t-20">
 	<div class="w-section inverse no-padding">
@@ -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>";   
                                 }
                             }