iNextrix / ASTPP

web_interface/astpp/application/modules/accounts/views/view_customer_invoices.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 <? startblock('extra_head') ?>
 <script type="text/javascript" language="javascript">
     $(document).ready(function() {
-        build_grid("invoices_list","<?php echo base_url() . "accounts/customer_details_json/invoices/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
+        build_grid("invoices_list","<?php echo base_url()."accounts/customer_details_json/invoices/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
         $("#left_panel_quick_search").keyup(function(){
             quick_search("accounts/customer_details_search/"+'<?php echo $accounttype?>'+"_invoices/");
         });
@@ -22,12 +22,12 @@ 
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
                         <li>
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
                         </li>
                         <li class="active">
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_invoices/" . $edit_id . "/"; ?>">
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_invoices/".$edit_id."/"; ?>">
                                 Invoices
                             </a>
                         </li>
@@ -36,7 +36,7 @@ 
                 <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                 </div>
             </div>     

web_interface/astpp/application/modules/accounts/views/view_customer_speed_dial.php

Indentation +12 added lines, -12 removed lines

@@ -91,14 +91,14 @@ 
                                 <div class="col-md-4">Action</div>
                                  </div>
                                 <?php
-                                $res = $this->db_model->getSelect("*", "speed_dial", array("accountid" => $account_data[0]['id']));
-                                if ($res->num_rows() > 0) {
-                                    $result = $res->result_array();
-                                } else {
-                                    $result = 0;
-                                }
-                                for ($i = 0; $i <= 9; $i++) {
-                                    ?>
+								$res = $this->db_model->getSelect("*", "speed_dial", array("accountid" => $account_data[0]['id']));
+								if ($res->num_rows() > 0) {
+									$result = $res->result_array();
+								} else {
+									$result = 0;
+								}
+								for ($i = 0; $i <= 9; $i++) {
+									?>
                                     <div class="col-md-12">
                                         <div id="key<?php echo $i; ?><?php echo $i + 1; ?>" style="display:block;">
                                             <div class="col-md-1">
@@ -109,8 +109,8 @@ 
                                             <div class="col-md-3">
                                                 <label class="col-md-2" name="speed_dial" size="16"> 
                                                     <?php if ($result[$i]['speed_num'] == $i) {
-                                                        echo $result[$i]['number'];
-                                                    } ?> 
+														echo $result[$i]['number'];
+													} ?> 
                                                 </label>
                                             </div>
                                             <div class="col-md-4 margin-b-10">
@@ -132,8 +132,8 @@ 
                                             </div>
                                                <div class="col-md-3">
                                             <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && !empty($speeddial[$i])) {
-        echo $speeddial[$i];
-    } ?>">
+		echo $speeddial[$i];
+	} ?>">
                                                </div>
                                             <div class="col-md-4">
                                           <div class="col-md-2 no-padding">

Spacing +5 added lines, -5 removed lines

@@ -62,19 +62,19 @@ 
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s </a></li>
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s </a></li>
                         <li>
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
                         </li>
                        <li class="active">
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_speeddial/" . $edit_id . "/"; ?>"> Speed Dial </a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_speeddial/".$edit_id."/"; ?>"> Speed Dial </a>
                         </li>
                     </ul>
                 </div>
                 <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                 </div>                
             </div>     
@@ -131,7 +131,7 @@ 
                                             </label>
                                             </div>
                                                <div class="col-md-3">
-                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && !empty($speeddial[$i])) {
+                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && ! empty($speeddial[$i])) {
         echo $speeddial[$i];
     } ?>">
                                                </div>

web_interface/astpp/application/modules/accounts/views/view_customer_refill_report.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 <? startblock('extra_head') ?>
 <script type="text/javascript" language="javascript">
     $(document).ready(function() {
-        build_grid("refillreport_grid","<?php echo base_url() . "accounts/customer_details_json/refill/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
+        build_grid("refillreport_grid","<?php echo base_url()."accounts/customer_details_json/refill/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
         $("#left_panel_quick_search").keyup(function(){
             quick_search("accounts/customer_details_search/"+'<?php echo $accounttype?>'+"_refill/");
         });
@@ -20,12 +20,12 @@ 
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
                         <li>
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
                         </li>
                         <li class="active">
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_refillreport/" . $edit_id . "/"; ?>">
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_refillreport/".$edit_id."/"; ?>">
                                 Refill Report
                             </a>
                         </li>
@@ -34,7 +34,7 @@ 
                 <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                 </div>
             </div>

web_interface/astpp/application/modules/accounts/views/view_accounts_add_callerid.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<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">

Braces +4 added lines, -1 removed lines

@@ -24,7 +24,10 @@
     <section class="slice color-three no-margin">
 	<div class="w-section inverse no-padding">
             <div style="color:red;margin-left: 60px;">
-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 
+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 
             </div>
             <?php echo $form; ?>
         </div>      

web_interface/astpp/application/modules/accounts/views/view_customer_dids.php

Indentation +4 added lines, -4 removed lines

@@ -104,10 +104,10 @@
                                 <label for="Country" class="col-md-3 no-padding">Country : </label>
                                 <div class="col-md-8 no-padding sel_drop">
                                  <?php
-                                $country_arr = array("id" => "country_id", "name" => "country_id", "class" => "country_id");
-                                $country = form_dropdown($country_arr, $this->db_model->build_dropdown("id,country", "countrycode", "", ""), $country_id);
-                                echo $country;
-                                ?>
+								$country_arr = array("id" => "country_id", "name" => "country_id", "class" => "country_id");
+								$country = form_dropdown($country_arr, $this->db_model->build_dropdown("id,country", "countrycode", "", ""), $country_id);
+								echo $country;
+								?>
                                 </div>
                             </div>
                             <div class="col-md-4">

Spacing +7 added lines, -7 removed lines

@@ -4,10 +4,10 @@ 
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/validate.js"></script>
 <script type="text/javascript" language="javascript">
     $(document).ready(function() {
-        build_grid("dids_list","<?php echo base_url() . "accounts/customer_details_json/did/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
+        build_grid("dids_list","<?php echo base_url()."accounts/customer_details_json/did/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
         $("#country_id" ).change(function() {
             var country_id= $('#country_id').val();
-            var url ='<?php echo base_url() . "accounts/customer_did_country/"; ?>';
+            var url ='<?php echo base_url()."accounts/customer_did_country/"; ?>';
             var accountid ='<?php echo $edit_id; ?>';
             $.ajax({
                 type: "POST",
@@ -64,19 +64,19 @@ 
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
                         <li>
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
                         </li>
                         <li class="active">
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_dids/" . $edit_id . "/"; ?>"><?= $page_title; ?></a>
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_dids/".$edit_id."/"; ?>"><?= $page_title; ?></a>
                         </li>
                     </ul>
                 </div>
                 <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                 </div>
             </div>
@@ -99,7 +99,7 @@ 
                      <fieldset class="margin-b-20">
                         <legend>Purchase DID</legend>
 
-                        <form method="post" id="did_purchase" name="did_purchase" action="<?= base_url() . "accounts/customer_dids_action/add/$edit_id/$accounttype/"; ?>" enctype="multipart/form-data">
+                        <form method="post" id="did_purchase" name="did_purchase" action="<?= base_url()."accounts/customer_dids_action/add/$edit_id/$accounttype/"; ?>" enctype="multipart/form-data">
                             <div class="col-md-4">
                                 <label for="Country" class="col-md-3 no-padding">Country : </label>
                                 <div class="col-md-8 no-padding sel_drop">

web_interface/astpp/application/modules/accounts/models/accounts_model.php

Indentation +674 added lines, -674 removed lines

@@ -24,24 +24,24 @@ 
 
 class Accounts_model extends CI_Model {
 
-    function Accounts_model() {
-        parent::__construct();
-    }
+	function Accounts_model() {
+		parent::__construct();
+	}
 
-    function add_account($accountinfo) {
+	function add_account($accountinfo) {
 	
-        $account_data = $this->session->userdata("accountinfo");
-        $accountinfo['reseller_id'] = ($account_data['type'] == 1 ) ? $account_data['id'] : 0;
-        $accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1 ) ? "0" : $accountinfo['maxchannels'];
-        unset($accountinfo['action']);
-        $sip_flag = isset($accountinfo['sip_device_flag']) ? 1 : 0;
-        $opensip_flag = isset($accountinfo['opensips_device_flag']) ? 1 : 0;
-        unset($accountinfo['sip_device_flag'],$accountinfo['opensips_device_flag'],$accountinfo['tax_id']);
-
-        /*         * ******************************** */
-        $accountinfo['creation'] = gmdate('Y-m-d H:i:s');
-        $accountinfo['expiry'] = gmdate('Y-m-d H:i:s', strtotime('+20 years'));
-        /*if(isset($accountinfo['is_recording'])){
+		$account_data = $this->session->userdata("accountinfo");
+		$accountinfo['reseller_id'] = ($account_data['type'] == 1 ) ? $account_data['id'] : 0;
+		$accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1 ) ? "0" : $accountinfo['maxchannels'];
+		unset($accountinfo['action']);
+		$sip_flag = isset($accountinfo['sip_device_flag']) ? 1 : 0;
+		$opensip_flag = isset($accountinfo['opensips_device_flag']) ? 1 : 0;
+		unset($accountinfo['sip_device_flag'],$accountinfo['opensips_device_flag'],$accountinfo['tax_id']);
+
+		/*         * ******************************** */
+		$accountinfo['creation'] = gmdate('Y-m-d H:i:s');
+		$accountinfo['expiry'] = gmdate('Y-m-d H:i:s', strtotime('+20 years'));
+		/*if(isset($accountinfo['is_recording'])){
 	  $accountinfo['is_recording']=0;
         }else{
 	  $accountinfo['is_recording']=1;
@@ -51,401 +51,401 @@ 
         }else{
 	  $accountinfo['allow_ip_management']=1;
         }*/
-        if(isset($accountinfo['local_call'])){
+		if(isset($accountinfo['local_call'])){
 	  $accountinfo['local_call']=0;
-        }else{
+		}else{
 	  $accountinfo['local_call']=1;
-        }
-        if ($accountinfo['type'] == 1){
-        $invoice_config = $accountinfo['invoice_config_flag'];
+		}
+		if ($accountinfo['type'] == 1){
+		$invoice_config = $accountinfo['invoice_config_flag'];
 		}else{
 		$invoice_config = "";		
 		}
 		unset($accountinfo['invoice_config_flag']);
-        $result = $this->db->insert('accounts', $accountinfo);
-        $last_id = $this->db->insert_id();
-                /**
+		$result = $this->db->insert('accounts', $accountinfo);
+		$last_id = $this->db->insert_id();
+				/**
           ASTPP  3.0 
           For Invoice Configuration
-         * */ 
-         if ($accountinfo['type'] == 1 && isset($invoice_config) && $invoice_config == "0") {
-                if ($accountinfo['country_id'] == NULL) {
-                    $accountinfo['country_id'] = "";
-                } else {
-                    $data = $this->db_model->getSelect("country", "countrycode", array("id" => $accountinfo['country_id']));
-                    $data = $data->result_array();
-                    $country_name = $data[0];
-                }
-                if ($accountinfo['postal_code'] == NULL) {
-                    $accountinfo['postal_code'] = "";
-                }
-
-                $invoice_config = array('accountid' => $last_id, 'company_name' => $accountinfo['company_name'], 'address' => $accountinfo['address_1'], 'city' => $accountinfo['city'], 'province' => $accountinfo['province'], 'country' => $country_name['country'], 'zipcode' => $accountinfo['postal_code'], 'telephone' => $accountinfo['telephone_1'], 'emailaddress' => $accountinfo['email']);
-                $this->db->where('account_id', $accountinfo['id']);
-                $this->db->insert('invoice_conf', $invoice_config);
-            }
-        if ($sip_flag == '1') {
-            $this->db->select('id');
-            $this->db->where('name','default');
-            $sipprofile_result=(array)$this->db->get('sip_profiles')->first_row();
-            $free_switch_array = array('fs_username' => $accountinfo['number'],
-                'fs_password' => $this->common->decode($accountinfo['password']),
-                'context' => 'default',
-                'effective_caller_id_name' => $accountinfo['number'],
-                'effective_caller_id_number' => $accountinfo['number'],
-                'sip_profile_id' => $sipprofile_result['id'],
-                'pricelist_id' => $accountinfo['pricelist_id'],
-                'accountcode' => $last_id,
-                'status' => $accountinfo['status']);
-            $this->load->model('freeswitch/freeswitch_model');
-            $this->freeswitch_model->add_freeswith($free_switch_array);
-        }
-        if ($opensip_flag == 1) {
-            $opensips_array = array('username' => $accountinfo['number'],
-                'domain' => common_model::$global_config['system_config']['opensips_domain'],
-                'password' => $accountinfo['password'],
-                'accountcode' => $accountinfo['number'],
-                'pricelist_id' => $accountinfo['pricelist_id']);
-            $this->load->model('opensips/opensips_model');
-            $this->opensips_model->add_opensipsdevices($opensips_array);
-        }
-        $accountinfo['confirm'] =  base_url();
-        if($accountinfo['id'] == ""){
-        $accountinfo['id'] = $last_id;
+				 * */ 
+		 if ($accountinfo['type'] == 1 && isset($invoice_config) && $invoice_config == "0") {
+				if ($accountinfo['country_id'] == NULL) {
+					$accountinfo['country_id'] = "";
+				} else {
+					$data = $this->db_model->getSelect("country", "countrycode", array("id" => $accountinfo['country_id']));
+					$data = $data->result_array();
+					$country_name = $data[0];
+				}
+				if ($accountinfo['postal_code'] == NULL) {
+					$accountinfo['postal_code'] = "";
+				}
+
+				$invoice_config = array('accountid' => $last_id, 'company_name' => $accountinfo['company_name'], 'address' => $accountinfo['address_1'], 'city' => $accountinfo['city'], 'province' => $accountinfo['province'], 'country' => $country_name['country'], 'zipcode' => $accountinfo['postal_code'], 'telephone' => $accountinfo['telephone_1'], 'emailaddress' => $accountinfo['email']);
+				$this->db->where('account_id', $accountinfo['id']);
+				$this->db->insert('invoice_conf', $invoice_config);
+			}
+		if ($sip_flag == '1') {
+			$this->db->select('id');
+			$this->db->where('name','default');
+			$sipprofile_result=(array)$this->db->get('sip_profiles')->first_row();
+			$free_switch_array = array('fs_username' => $accountinfo['number'],
+				'fs_password' => $this->common->decode($accountinfo['password']),
+				'context' => 'default',
+				'effective_caller_id_name' => $accountinfo['number'],
+				'effective_caller_id_number' => $accountinfo['number'],
+				'sip_profile_id' => $sipprofile_result['id'],
+				'pricelist_id' => $accountinfo['pricelist_id'],
+				'accountcode' => $last_id,
+				'status' => $accountinfo['status']);
+			$this->load->model('freeswitch/freeswitch_model');
+			$this->freeswitch_model->add_freeswith($free_switch_array);
+		}
+		if ($opensip_flag == 1) {
+			$opensips_array = array('username' => $accountinfo['number'],
+				'domain' => common_model::$global_config['system_config']['opensips_domain'],
+				'password' => $accountinfo['password'],
+				'accountcode' => $accountinfo['number'],
+				'pricelist_id' => $accountinfo['pricelist_id']);
+			$this->load->model('opensips/opensips_model');
+			$this->opensips_model->add_opensipsdevices($opensips_array);
+		}
+		$accountinfo['confirm'] =  base_url();
+		if($accountinfo['id'] == ""){
+		$accountinfo['id'] = $last_id;
 		}
-        $accountinfo['password'] = $this->common->decode($accountinfo['password']);    
+		$accountinfo['password'] = $this->common->decode($accountinfo['password']);    
 
-        $this->common->mail_to_users('email_add_user', $accountinfo);
-        return $last_id;
-    }
+		$this->common->mail_to_users('email_add_user', $accountinfo);
+		return $last_id;
+	}
 
-    /**
+	/**
       ASTPP  3.0 
       Reseller Batch Update
-     * */
-    function reseller_rates_batch_update($update_array) {
-        unset($update_array['action']);
-        $update_array['type'] = 1;
-        $date = gmdate("Y-m-d h:i:s");
-        $this->db_model->build_search('reseller_list_search');
-        if ($update_array['type'] == 1) {
-            $this->db_model->build_batch_update_array($update_array);
-            $login_type = $this->session->userdata('logintype');
-            $reseller_info = $this->session->userdata['accountinfo'];
-            if ($reseller_info['type'] == 1) {
-                $this->db->where('reseller_id', $reseller_info['id']);
-            } else {
-                $this->db->where('reseller_id', '0');
-            }
-            $this->db->where('type', '1');
-            $this->db->update("accounts");
-            $this->db_model->build_search('reseller_list_search');
-            if (isset($update_array['balance']['balance']) && $update_array['balance']['balance'] != '') {
-                $search_flag = $this->db_model->build_search('reseller_list_search');
-                $account_data = $this->session->userdata("accountinfo");
-                if ($account_data['type'] == 1) {
-                    $where = array('type' => 1, "balance" => $update_array['balance']['balance'], "reseller_id" => $account_data['id'], 'deleted' => '0', 'status' => '0');
-                } else {
-                    $where = array('type' => 1, "balance" => $update_array['balance']['balance'], 'deleted' => '0', 'status' => '0');
-                }
-
-                $this->db_model->build_search('reseller_list_search');
-                $query_pricelist = $this->db_model->getSelect("id,reseller_id,balance", "accounts", $where);
-                if ($query_pricelist->num_rows > 0) {
-                    $description = '';
-                    if ($update_array['balance']['operator'] == '2') {
-                        $description .="Reseller update set balance by admin";
-                    }
-                    if ($update_array['balance']['operator'] == '3') {
-                        $description .="Reseller update increase balance by admin";
-                    }
-                    if ($update_array['balance']['operator'] == '4') {
-                        $description .="Reseller update descrise balance by admin";
-                    }
-                    foreach ($query_pricelist->result_array() as $key => $reseller_payment) {
-                        if (!empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
-                            $payment_by = $reseller_payment['reseller_id'];
-                        } else {
-                            $payment_by = '-1';
-                        }
-                        $insert_arr = array("accountid" => $reseller_payment['id'],
-                            "credit" => $update_array['balance']['balance'],
-                            'payment_mode' => 0,
-                            'type' => "SYSTEM",
-                            "notes" => $description,
-                            "payment_date" => $date,
-                            'payment_by' => $payment_by,
-                            'reseller_id' => $reseller_payment['reseller_id'],
-                        );
-                        $this->db->insert("payments", $insert_arr);
-                    }
-                }
-            }
-        }
+	 * */
+	function reseller_rates_batch_update($update_array) {
+		unset($update_array['action']);
+		$update_array['type'] = 1;
+		$date = gmdate("Y-m-d h:i:s");
+		$this->db_model->build_search('reseller_list_search');
+		if ($update_array['type'] == 1) {
+			$this->db_model->build_batch_update_array($update_array);
+			$login_type = $this->session->userdata('logintype');
+			$reseller_info = $this->session->userdata['accountinfo'];
+			if ($reseller_info['type'] == 1) {
+				$this->db->where('reseller_id', $reseller_info['id']);
+			} else {
+				$this->db->where('reseller_id', '0');
+			}
+			$this->db->where('type', '1');
+			$this->db->update("accounts");
+			$this->db_model->build_search('reseller_list_search');
+			if (isset($update_array['balance']['balance']) && $update_array['balance']['balance'] != '') {
+				$search_flag = $this->db_model->build_search('reseller_list_search');
+				$account_data = $this->session->userdata("accountinfo");
+				if ($account_data['type'] == 1) {
+					$where = array('type' => 1, "balance" => $update_array['balance']['balance'], "reseller_id" => $account_data['id'], 'deleted' => '0', 'status' => '0');
+				} else {
+					$where = array('type' => 1, "balance" => $update_array['balance']['balance'], 'deleted' => '0', 'status' => '0');
+				}
+
+				$this->db_model->build_search('reseller_list_search');
+				$query_pricelist = $this->db_model->getSelect("id,reseller_id,balance", "accounts", $where);
+				if ($query_pricelist->num_rows > 0) {
+					$description = '';
+					if ($update_array['balance']['operator'] == '2') {
+						$description .="Reseller update set balance by admin";
+					}
+					if ($update_array['balance']['operator'] == '3') {
+						$description .="Reseller update increase balance by admin";
+					}
+					if ($update_array['balance']['operator'] == '4') {
+						$description .="Reseller update descrise balance by admin";
+					}
+					foreach ($query_pricelist->result_array() as $key => $reseller_payment) {
+						if (!empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
+							$payment_by = $reseller_payment['reseller_id'];
+						} else {
+							$payment_by = '-1';
+						}
+						$insert_arr = array("accountid" => $reseller_payment['id'],
+							"credit" => $update_array['balance']['balance'],
+							'payment_mode' => 0,
+							'type' => "SYSTEM",
+							"notes" => $description,
+							"payment_date" => $date,
+							'payment_by' => $payment_by,
+							'reseller_id' => $reseller_payment['reseller_id'],
+						);
+						$this->db->insert("payments", $insert_arr);
+					}
+				}
+			}
+		}
 
-        return true;
-    }
-    /**
+		return true;
+	}
+	/**
       ASTPP  3.0 
       Customer Batch Update
-     * */
-    function customer_rates_batch_update($update_array) {
-
-        unset($update_array['action']);
-        $date = gmdate("Y-m-d h:i:s");
-        $this->db_model->build_search('customer_list_search');
-        $reseller_info = $this->session->userdata['accountinfo'];
-        if ($reseller_info['type'] == 1) {
-            $this->db->where('reseller_id', $reseller_info['id']);
-        } else {
-            $this->db->where('reseller_id', '0');
-        }
-        $this->db_model->build_search('customer_list_search');
-        $this->db->where('type !=', '1');
-        $this->db_model->build_batch_update_array($update_array);
-        $this->db->update("accounts");
-        if (isset($update_array['balance']['balance']) && $update_array['balance']['balance'] != '') {
-            $account_data = $this->session->userdata("accountinfo");
-
-            if ($account_data['type'] == 1) {
-                $where = array('type' => 1, "reseller_id" => $account_data['id'], 'deleted' => '0', 'status' => '0');
-            } else {
-                $where = array('type !=' => '-1', "balance" => $update_array['balance']['balance'], 'deleted' => '0', 'status' => '0');
-            }
-
-            $this->db_model->build_search('customer_list_search');
-            $query_pricelist = $this->db_model->getSelect("id,reseller_id,balance", "accounts", $where);
-            if ($query_pricelist->num_rows > 0) {
-                $description = '';
-                if ($update_array['balance']['operator'] == '2') {
-                    $description .="Customer update set balance by admin";
-                }
-                if ($update_array['balance']['operator'] == '3') {
-                    $description .="Customer update increase balance by admin";
-                }
-                if ($update_array['balance']['operator'] == '4') {
-                    $description .="Customer update descrise balance by admin";
-                }
-                foreach ($query_pricelist->result_array() as $key => $customer_payment) {
-                    if (!empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
-                        $payment_by = $customer_payment['reseller_id'];
-                    } else {
-                        $payment_by = '-1';
-                    }
-                    $insert_arr = array("accountid" => $customer_payment['id'],
-                        "credit" => $update_array['balance']['balance'],
-                        'payment_mode' => 0,
-                        'type' => "SYSTEM",
-                        "notes" => $description,
-                        "payment_date" => $date,
-                        'payment_by' => $payment_by,
-                        'reseller_id' => $customer_payment['reseller_id'],
-                    );
-                    $this->db->insert("payments", $insert_arr);
-                }
-            }
-        }
-        return true;
-    }
-
-    /*     * ************************************************************************ */
-
-    function edit_account($accountinfo, $edit_id) {
-        unset($accountinfo['action']);
-        unset($accountinfo['onoffswitch']);
-        $this->db->where('id', $edit_id);
-        $result = $this->db->update('accounts', $accountinfo);
-        return true;
-    }
-
-    function bulk_insert_accounts($add_array) {
-        $logintype = $this->session->userdata('logintype');
-        $creation_limit = $this->get_max_limit($add_array);
-        $count = $add_array['count'];
-        $pin_flag = $add_array['pin'];
+	 * */
+	function customer_rates_batch_update($update_array) {
+
+		unset($update_array['action']);
+		$date = gmdate("Y-m-d h:i:s");
+		$this->db_model->build_search('customer_list_search');
+		$reseller_info = $this->session->userdata['accountinfo'];
+		if ($reseller_info['type'] == 1) {
+			$this->db->where('reseller_id', $reseller_info['id']);
+		} else {
+			$this->db->where('reseller_id', '0');
+		}
+		$this->db_model->build_search('customer_list_search');
+		$this->db->where('type !=', '1');
+		$this->db_model->build_batch_update_array($update_array);
+		$this->db->update("accounts");
+		if (isset($update_array['balance']['balance']) && $update_array['balance']['balance'] != '') {
+			$account_data = $this->session->userdata("accountinfo");
+
+			if ($account_data['type'] == 1) {
+				$where = array('type' => 1, "reseller_id" => $account_data['id'], 'deleted' => '0', 'status' => '0');
+			} else {
+				$where = array('type !=' => '-1', "balance" => $update_array['balance']['balance'], 'deleted' => '0', 'status' => '0');
+			}
+
+			$this->db_model->build_search('customer_list_search');
+			$query_pricelist = $this->db_model->getSelect("id,reseller_id,balance", "accounts", $where);
+			if ($query_pricelist->num_rows > 0) {
+				$description = '';
+				if ($update_array['balance']['operator'] == '2') {
+					$description .="Customer update set balance by admin";
+				}
+				if ($update_array['balance']['operator'] == '3') {
+					$description .="Customer update increase balance by admin";
+				}
+				if ($update_array['balance']['operator'] == '4') {
+					$description .="Customer update descrise balance by admin";
+				}
+				foreach ($query_pricelist->result_array() as $key => $customer_payment) {
+					if (!empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
+						$payment_by = $customer_payment['reseller_id'];
+					} else {
+						$payment_by = '-1';
+					}
+					$insert_arr = array("accountid" => $customer_payment['id'],
+						"credit" => $update_array['balance']['balance'],
+						'payment_mode' => 0,
+						'type' => "SYSTEM",
+						"notes" => $description,
+						"payment_date" => $date,
+						'payment_by' => $payment_by,
+						'reseller_id' => $customer_payment['reseller_id'],
+					);
+					$this->db->insert("payments", $insert_arr);
+				}
+			}
+		}
+		return true;
+	}
+
+	/*     * ************************************************************************ */
+
+	function edit_account($accountinfo, $edit_id) {
+		unset($accountinfo['action']);
+		unset($accountinfo['onoffswitch']);
+		$this->db->where('id', $edit_id);
+		$result = $this->db->update('accounts', $accountinfo);
+		return true;
+	}
+
+	function bulk_insert_accounts($add_array) {
+		$logintype = $this->session->userdata('logintype');
+		$creation_limit = $this->get_max_limit($add_array);
+		$count = $add_array['count'];
+		$pin_flag = $add_array['pin'];
         
-        $balance = $add_array['balance'] != '' ? $add_array['balance'] : 0.0000;
-        $credit_limit = $add_array['credit_limit'] != '' ? $add_array['credit_limit'] : 0.0000;
-        $prefix = $add_array['prefix'];
-        $account_length = $add_array['account_length'];
+		$balance = $add_array['balance'] != '' ? $add_array['balance'] : 0.0000;
+		$credit_limit = $add_array['credit_limit'] != '' ? $add_array['credit_limit'] : 0.0000;
+		$prefix = $add_array['prefix'];
+		$account_length = $add_array['account_length'];
         
-        $length = strlen($prefix);
-        if ($length != 0) {
-            $number_length = $account_length - $length;
-        } else {
-            $number_length = $account_length;
-        }
+		$length = strlen($prefix);
+		if ($length != 0) {
+			$number_length = $account_length - $length;
+		} else {
+			$number_length = $account_length;
+		}
 
-        $pricelist_id = $add_array['pricelist_id'] != '' ? $add_array['pricelist_id'] : 0;
-        $number = $this->common->find_uniq_rendno_accno($number_length, 'number', 'accounts', $prefix, $count);
-        $password = $this->common->find_uniq_rendno_accno($number_length, 'password', 'accounts', '', $count);
-        if ($pin_flag) {
-            $pin = $this->common->find_uniq_rendno_accno($number_length, 'pin', 'accounts', '', $count);
-        }
-        $sip_flag = false;
-        $opensip_flag=false;
-        if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips']== 0) {
-            $sip_flag = true;
-        }
-        if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips']== 1) {
-            $opensip_flag = true;
-        }
-        unset(
-                $add_array['count'],
-                $add_array['pin'],
-                $add_array['account_length'],
-                $add_array['prefix'],
-                $add_array['sip_device_flag'],
-                $add_array['opensips_device_flag']
-        );
-        if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
-        $is_recording=1;
-        }else{
-        $is_recording=0;
-        }
-        if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
-        $allow_ip_management=1;
-        }else{
-        $allow_ip_management=0;
-        }
-        if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
-        $local_call=1;
-        }else{
-        $local_call=0;
-        }
-        if ($sip_flag) {
-            $query = $this->db_model->select("*", "sip_profiles", array('status' => "0"), "id", "ASC", '1', '0');
-            $sip_id = $query->result_array();
-            $sip_profile_id = $sip_id[0]['id'];
-            for ($i = 0; $i < $count; $i++) {
-                $acc_num = $number[$i];
-                $current_password = $password[$i];
-                $insert_array = array('number' => $acc_num,
-                    'password' => $this->common->encode($current_password),
-                    'pricelist_id' => $pricelist_id,
-                    'reseller_id' => $add_array['reseller_id'],
-                    'status' => 0,
-                    'credit_limit' => $credit_limit,
-                    'posttoexternal' => $add_array['posttoexternal'],
-                    'balance' => $balance,
-                    'currency_id' => $add_array['currency_id'],
-                    'country_id' => $add_array['country_id'],
-                    'timezone_id' => $add_array['timezone_id'],
-                    'company_name' => $add_array['company_name'],
-                    'first_name' => $acc_num,
-                    'type' => 0,
-                    'charge_per_min'=>$add_array['charge_per_min'],
-                    'validfordays' => $add_array['validfordays'],
-                    "creation"=>gmdate("Y-m-d H:i:s"),
-                    "maxchannels"=>0,
-                    "sweep_id"=>$add_array['sweep_id'],
-                    "local_call"=>$local_call,
-                     "invoice_day"=>$add_array['invoice_day'],
-                    "allow_ip_management"=>$allow_ip_management,
-                    "is_recording"=>$is_recording,
-                    "expiry" => gmdate('Y-m-d H:i:s', strtotime('+10 years'))
-                );
-                if ($pin_flag == 1) {
-                    $insert_array['pin'] = $pin[$i];
-                }
-                $this->db->insert('accounts', $insert_array);
-                $last_id = $this->db->insert_id();
-                $params_array = array('password' => $password[$i],
-                    "vm-enabled"=>"true",
-                    "vm-password"=>"",
-                    "vm-mailto"=>"",
-                    "vm-attach-file"=>"true",
-                    "vm-keep-local-after-email"=>"true",
-                    "vm-email-all-messages"=>"true"
-                    );
-                $params_array_vars = array('effective_caller_id_name' => $acc_num,
-                    'effective_caller_id_number' => $acc_num,
-                    'user_context' => 'default');
-                $sip_device_array[$i] = array('username' => $acc_num,
-                    'sip_profile_id' => $sip_profile_id,
-                    'reseller_id' => $add_array['reseller_id'],
-                    'accountid' => $last_id,
-                    'dir_params' => json_encode($params_array),
-                    'dir_vars' => json_encode($params_array_vars),
-                    'status' => 0,
-                    'creation_date' => gmdate("Y-m-d H:i:s")
-                    );
-            }
-            $this->db->insert_batch('sip_devices', $sip_device_array);
-        } else {
-            for ($i = 0; $i < $count; $i++) {
-                $acc_num = $number[$i];
-                $current_password = $password[$i];
-                $insert_array[$i] = array('number' => $acc_num,
-                    'password' => $this->common->encode($current_password),
-                    'pricelist_id' => $pricelist_id,
-                    'reseller_id' => $add_array['reseller_id'],
-                    'status' => 0,
-                    'credit_limit' => $credit_limit,
-                    'sweep_id' => 0,
-                    'posttoexternal' => $add_array['posttoexternal'],
-                    'balance' => $balance,
-                    'currency_id' => $add_array['currency_id'],
-                    'country_id' => $add_array['country_id'],
-                    'timezone_id' => $add_array['timezone_id'],
-                    'company_name' => $add_array['company_name'],
-                    'invoice_day' => 0,
-                    'first_name' => $acc_num,
-                    'type' => 0,
-                    'validfordays' => $add_array['validfordays'],
-                    "creation"=>gmdate("Y-m-d H:i:s"),
-                    "is_recording"=>0,
-                    "maxchannels"=>0,
-                    "sweep_id"=>2,
-                    "invoice_day"=>gmdate("d"),
-                    "expiry" => gmdate('Y-m-d H:i:s', strtotime('+10 years'))
+		$pricelist_id = $add_array['pricelist_id'] != '' ? $add_array['pricelist_id'] : 0;
+		$number = $this->common->find_uniq_rendno_accno($number_length, 'number', 'accounts', $prefix, $count);
+		$password = $this->common->find_uniq_rendno_accno($number_length, 'password', 'accounts', '', $count);
+		if ($pin_flag) {
+			$pin = $this->common->find_uniq_rendno_accno($number_length, 'pin', 'accounts', '', $count);
+		}
+		$sip_flag = false;
+		$opensip_flag=false;
+		if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips']== 0) {
+			$sip_flag = true;
+		}
+		if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips']== 1) {
+			$opensip_flag = true;
+		}
+		unset(
+				$add_array['count'],
+				$add_array['pin'],
+				$add_array['account_length'],
+				$add_array['prefix'],
+				$add_array['sip_device_flag'],
+				$add_array['opensips_device_flag']
+		);
+		if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
+		$is_recording=1;
+		}else{
+		$is_recording=0;
+		}
+		if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
+		$allow_ip_management=1;
+		}else{
+		$allow_ip_management=0;
+		}
+		if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
+		$local_call=1;
+		}else{
+		$local_call=0;
+		}
+		if ($sip_flag) {
+			$query = $this->db_model->select("*", "sip_profiles", array('status' => "0"), "id", "ASC", '1', '0');
+			$sip_id = $query->result_array();
+			$sip_profile_id = $sip_id[0]['id'];
+			for ($i = 0; $i < $count; $i++) {
+				$acc_num = $number[$i];
+				$current_password = $password[$i];
+				$insert_array = array('number' => $acc_num,
+					'password' => $this->common->encode($current_password),
+					'pricelist_id' => $pricelist_id,
+					'reseller_id' => $add_array['reseller_id'],
+					'status' => 0,
+					'credit_limit' => $credit_limit,
+					'posttoexternal' => $add_array['posttoexternal'],
+					'balance' => $balance,
+					'currency_id' => $add_array['currency_id'],
+					'country_id' => $add_array['country_id'],
+					'timezone_id' => $add_array['timezone_id'],
+					'company_name' => $add_array['company_name'],
+					'first_name' => $acc_num,
+					'type' => 0,
+					'charge_per_min'=>$add_array['charge_per_min'],
+					'validfordays' => $add_array['validfordays'],
+					"creation"=>gmdate("Y-m-d H:i:s"),
+					"maxchannels"=>0,
+					"sweep_id"=>$add_array['sweep_id'],
+					"local_call"=>$local_call,
+					 "invoice_day"=>$add_array['invoice_day'],
+					"allow_ip_management"=>$allow_ip_management,
+					"is_recording"=>$is_recording,
+					"expiry" => gmdate('Y-m-d H:i:s', strtotime('+10 years'))
+				);
+				if ($pin_flag == 1) {
+					$insert_array['pin'] = $pin[$i];
+				}
+				$this->db->insert('accounts', $insert_array);
+				$last_id = $this->db->insert_id();
+				$params_array = array('password' => $password[$i],
+					"vm-enabled"=>"true",
+					"vm-password"=>"",
+					"vm-mailto"=>"",
+					"vm-attach-file"=>"true",
+					"vm-keep-local-after-email"=>"true",
+					"vm-email-all-messages"=>"true"
+					);
+				$params_array_vars = array('effective_caller_id_name' => $acc_num,
+					'effective_caller_id_number' => $acc_num,
+					'user_context' => 'default');
+				$sip_device_array[$i] = array('username' => $acc_num,
+					'sip_profile_id' => $sip_profile_id,
+					'reseller_id' => $add_array['reseller_id'],
+					'accountid' => $last_id,
+					'dir_params' => json_encode($params_array),
+					'dir_vars' => json_encode($params_array_vars),
+					'status' => 0,
+					'creation_date' => gmdate("Y-m-d H:i:s")
+					);
+			}
+			$this->db->insert_batch('sip_devices', $sip_device_array);
+		} else {
+			for ($i = 0; $i < $count; $i++) {
+				$acc_num = $number[$i];
+				$current_password = $password[$i];
+				$insert_array[$i] = array('number' => $acc_num,
+					'password' => $this->common->encode($current_password),
+					'pricelist_id' => $pricelist_id,
+					'reseller_id' => $add_array['reseller_id'],
+					'status' => 0,
+					'credit_limit' => $credit_limit,
+					'sweep_id' => 0,
+					'posttoexternal' => $add_array['posttoexternal'],
+					'balance' => $balance,
+					'currency_id' => $add_array['currency_id'],
+					'country_id' => $add_array['country_id'],
+					'timezone_id' => $add_array['timezone_id'],
+					'company_name' => $add_array['company_name'],
+					'invoice_day' => 0,
+					'first_name' => $acc_num,
+					'type' => 0,
+					'validfordays' => $add_array['validfordays'],
+					"creation"=>gmdate("Y-m-d H:i:s"),
+					"is_recording"=>0,
+					"maxchannels"=>0,
+					"sweep_id"=>2,
+					"invoice_day"=>gmdate("d"),
+					"expiry" => gmdate('Y-m-d H:i:s', strtotime('+10 years'))
                     
-                );
-                if ($pin_flag == 1) {
-                    $insert_array[$i]['pin'] = $pin[$i];
-                }
-                if ($opensip_flag) {
-                    $opensips_domain = common_model::$global_config['system_config']['opensips_domain'];
-                    $opensips_array[$i] = array('username' => $acc_num,
-                        'domain' => $opensips_domain,
-                        'password' => $current_password,
-                        'accountcode' => $acc_num,
-                        'reseller_id' => $add_array['reseller_id'],
-                        "creation_date" => gmdate("Y-m-d H:i:s"),
-                        "status"=>0
-                        );
-                }
-            }
-            $this->db->insert_batch('accounts', $insert_array);
-            if ($opensip_flag == 1) {
-                $db_config = Common_model::$global_config['system_config'];
-                $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-                $this->opensips_db = $this->load->database($opensipdsn, true);
-                $this->opensips_db->insert_batch("subscriber", $opensips_array);
-            }
-        }
-        return TRUE;
-    }
+				);
+				if ($pin_flag == 1) {
+					$insert_array[$i]['pin'] = $pin[$i];
+				}
+				if ($opensip_flag) {
+					$opensips_domain = common_model::$global_config['system_config']['opensips_domain'];
+					$opensips_array[$i] = array('username' => $acc_num,
+						'domain' => $opensips_domain,
+						'password' => $current_password,
+						'accountcode' => $acc_num,
+						'reseller_id' => $add_array['reseller_id'],
+						"creation_date" => gmdate("Y-m-d H:i:s"),
+						"status"=>0
+						);
+				}
+			}
+			$this->db->insert_batch('accounts', $insert_array);
+			if ($opensip_flag == 1) {
+				$db_config = Common_model::$global_config['system_config'];
+				$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+				$this->opensips_db = $this->load->database($opensipdsn, true);
+				$this->opensips_db->insert_batch("subscriber", $opensips_array);
+			}
+		}
+		return TRUE;
+	}
 
-    function get_max_limit($add_array) {
+	function get_max_limit($add_array) {
 		$this->db->where('deleted','0');
-        $this->db->where("length(number)", $add_array['account_length']);
-        $this->db->like('number', $add_array['prefix'], 'after');
-        $this->db->select("count(id) as count");
-        $this->db->from('accounts');
-        $result = $this->db->get();
-        $result = $result->result_array();
-        $count = $result[0]['count'];
-        $remaining_length = 0;
-        $remaining_length = $add_array['account_length'] - strlen($add_array['prefix']);
-        $currentlength = pow(10, $remaining_length);
-        $currentlength = $currentlength - $count;
-        return $currentlength;
-    }
-    function account_process_payment($data) {
+		$this->db->where("length(number)", $add_array['account_length']);
+		$this->db->like('number', $add_array['prefix'], 'after');
+		$this->db->select("count(id) as count");
+		$this->db->from('accounts');
+		$result = $this->db->get();
+		$result = $result->result_array();
+		$count = $result[0]['count'];
+		$remaining_length = 0;
+		$remaining_length = $add_array['account_length'] - strlen($add_array['prefix']);
+		$currentlength = pow(10, $remaining_length);
+		$currentlength = $currentlength - $count;
+		return $currentlength;
+	}
+	function account_process_payment($data) {
 	$data['accountid'] = $data['id'];
-        $accountdata=(array)$this->db->get_where('accounts',array("id"=>$data['accountid']))->first_row();
-        $accountinfo =$this->session->userdata('accountinfo');
+		$accountdata=(array)$this->db->get_where('accounts',array("id"=>$data['accountid']))->first_row();
+		$accountinfo =$this->session->userdata('accountinfo');
 	$data["payment_by"] = $accountdata['reseller_id'] > 0 ? $accountdata['reseller_id'] : '-1';
 	$data['payment_mode'] = $data['payment_type'];
 	unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
@@ -477,300 +477,300 @@ 
 		  $accountdata['refill_amount']=$data['credit'];
 		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
 		  if($accountdata['reseller_id'] == $current_id){
-		    $this->common->mail_to_users('voip_account_refilled', $accountdata);
+			$this->common->mail_to_users('voip_account_refilled', $accountdata);
 		  }else{
-		    $this->common->mail_to_users('voip_child_account_refilled', $accountdata);
+			$this->common->mail_to_users('voip_child_account_refilled', $accountdata);
 		  }
 		}
 	}
-    }
+	}
 /****************Completed******************/
 
-    function get_admin_Account_list($flag, $start = 0, $limit = 0, $reseller_id = 0) {
-        $this->db_model->build_search('admin_list_search');
-        $where = "reseller_id =" . $reseller_id . " AND deleted =0 AND type in (2,4,-1)";
-        if ($this->session->userdata('advance_search') == 1) {
-            $search = $this->session->userdata('admin_list_search');
-            if ($search['type'] == '') {
-                $this->db->where($where);
-                $this->db_model->build_search('admin_list_search');
-            } else {
-                $this->db->where('type', $search['type']);
-            }
-        } else {
-            $this->db->where($where);
-            $this->db_model->build_search('admin_list_search');
-        }
-        if ($flag) {
-            $this->db->limit($limit, $start);
-        }
-        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-          $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
-            $this->db->order_by('number','desc');
-        }
-        $result = $this->db->get('accounts');
+	function get_admin_Account_list($flag, $start = 0, $limit = 0, $reseller_id = 0) {
+		$this->db_model->build_search('admin_list_search');
+		$where = "reseller_id =" . $reseller_id . " AND deleted =0 AND type in (2,4,-1)";
+		if ($this->session->userdata('advance_search') == 1) {
+			$search = $this->session->userdata('admin_list_search');
+			if ($search['type'] == '') {
+				$this->db->where($where);
+				$this->db_model->build_search('admin_list_search');
+			} else {
+				$this->db->where('type', $search['type']);
+			}
+		} else {
+			$this->db->where($where);
+			$this->db_model->build_search('admin_list_search');
+		}
+		if ($flag) {
+			$this->db->limit($limit, $start);
+		}
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
+		}else{
+			$this->db->order_by('number','desc');
+		}
+		$result = $this->db->get('accounts');
 
-        if ($flag) {
-            return $result;
-        } else {
-            return $result->num_rows();
-        }
-    }
-
-    function get_customer_Account_list($flag, $start = 0, $limit = 0, $export = false) {
-        $this->db_model->build_search('customer_list_search');
-        $accountinfo = $this->session->userdata("accountinfo");
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $where = array("deleted" => "0", 'reseller_id' => $reseller_id);
-        $this->db->select('*');
-        $type = "type IN (0,3)";
-        $this->db->where($where);
-        if ($this->session->userdata('advance_search') == 1) {
-            $search = $this->session->userdata('customer_list_search');
-            if ($search['type'] != '0' && $search['type'] != '3') {
-                $this->db->where($type);
-            }
-        } else {
-            $this->db->where($type);
-        }
-        if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
-        }
-        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-          $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
-            $this->db->order_by('number','desc');
-        }
-        $result = $this->db->get('accounts');
-        if ($flag) {
-            return $result;
-        } else {
-            return $result->num_rows();
-        }
-    }
+		if ($flag) {
+			return $result;
+		} else {
+			return $result->num_rows();
+		}
+	}
 
-    function get_reseller_Account_list($flag, $start = 0, $limit = 0, $export = false) {
-        $this->db_model->build_search('reseller_list_search');
-        $where = array('reseller_id' => "0", "deleted" => "0", "type" => "1");
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $where['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
-        }
-        if ($flag) {
-            $query = $this->db_model->select("*", "accounts", $where, "number", "desc", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "accounts", $where);
-        }
-        return $query;
-    }
-
-    function get_provider_Account_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('provider_list_search');
-        $where = array("deleted" => "0", "type" => "3", 'reseller_id' => 0);
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $where['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
-        }
-        if ($flag) {
-            $query = $this->db_model->select("*", "accounts", $where, "number", "desc", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "accounts", $where);
-        }
-        return $query;
-    }
-
-    function remove_customer($id) {
-        $this->db->where("id", $id);
-        $this->db->where("type <>", "-1");
-        $data = array('deleted' => '1');
-        $this->db->update("accounts", $data);
-        return true;
-    }
-
-    function insert_block($data, $accountid) {
-        $data = explode(",", $data);
-        $tmp = array();
-        if (!empty($data)) {
-            foreach ($data as $key => $data_value) {
-                $tmp[$key]["accountid"] = $accountid;
-                $result = $this->get_pattern_by_id($data_value);
-                $tmp[$key]["blocked_patterns"] = $result[0]['pattern'];
-                $tmp[$key]["destination"] = $result[0]['comment'];
-            }
-            return $this->db->insert_batch("block_patterns", $tmp);
-        }
-    }
-
-    function get_pattern_by_id($pattern) {
-        $patterns = $this->db_model->getSelect("pattern,comment", "routes", array("id" => $pattern));
-        $patterns_value = $patterns->result_array();
-        return $patterns_value;
-    }
-
-    function get_callerid($account_id) {
-        $query = $this->db_model->getSelect("*", "accounts_callerid", array("accountid" => $account_id));
-        return $query;
-    }
-
-    function get_account_number($accountid) {
-        $query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
-    }
-
-    function add_callerid($data) {
-        unset($data['action'],$data['flag']);
-        $data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
-        $this->db->insert('accounts_callerid', $data);
-        return true;
-    }
-
-    function edit_callerid($data) {
-        unset($data['action']);
-        unset($data['flag']);
-        $data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
-        $this->db->where('accountid', $data['accountid']);
-        $this->db->update('accounts_callerid', $data);
-        return true;
-    }
-
-    /**
-     * -------Here we write code for model accounting functions remove_all_account_tax------
-     * for remove all account's taxes enteries from database.
-     */
-    function remove_all_account_tax($account_tax) {
-        $this->db->where('accountid', $account_tax);
-        $this->db->delete('taxes_to_accounts');
-        return true;
-    }
-
-    /**
-     * -------Here we write code for model accounting functions add_account_tax------
-     * this function use to insert data for add taxes to account.
-     */
-    function add_account_tax($data) {
-        $this->db->insert('taxes_to_accounts', $data);
-    }
-
-    /**
-     * -------Here we write code for model accounting functions get_accounttax_by_id------
-     * this function use get the account taxes details as per account number
-     * @account_id = account id
-     */
-    function get_accounttax_by_id($account_id) {
-        $this->db->where("accountid", trim($account_id));
-        $query = $this->db->get("taxes_to_accounts");
-        if ($query->num_rows() > 0)
-            return $query->result_array();
-        else
-            return false;
-    }
-
-    /**
-     * -------Here we write code for model accounting functions check_account_num------
-     * this function write to verify the account number is valid or not.
-     * @acc_num = account number
-     */
-    function check_account_num($acc_num) {
-        $this->db->select('accountid');
-        $this->db->where("number", $acc_num);
-        $query = $this->db->get("accounts");
-
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
-    }
-
-    function get_account_by_number($id) {
-        $this->db->where("id", $id);
-        $query = $this->db->get("accounts");
-
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
-    }
-
-    function get_currency_by_id($currency_id) {
-
-        $query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
-    }
-
-
-    function update_balance($amount, $accountid, $payment_type) {
-        if ($payment_type == 0) {
-            $query = 'UPDATE `accounts` SET `balance` = (balance + ' . $amount . ') WHERE `id` = ' . $accountid;
-            return $this->db->query($query);
-        }if ($payment_type == 1) {
-            $query = 'UPDATE `accounts` SET `balance` = (balance - ' . $amount . ') WHERE `id` = ' . $accountid;
-            return $this->db->query($query);
-        }
-    }
+	function get_customer_Account_list($flag, $start = 0, $limit = 0, $export = false) {
+		$this->db_model->build_search('customer_list_search');
+		$accountinfo = $this->session->userdata("accountinfo");
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$where = array("deleted" => "0", 'reseller_id' => $reseller_id);
+		$this->db->select('*');
+		$type = "type IN (0,3)";
+		$this->db->where($where);
+		if ($this->session->userdata('advance_search') == 1) {
+			$search = $this->session->userdata('customer_list_search');
+			if ($search['type'] != '0' && $search['type'] != '3') {
+				$this->db->where($type);
+			}
+		} else {
+			$this->db->where($type);
+		}
+		if ($flag) {
+			if (!$export)
+				$this->db->limit($limit, $start);
+		}
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
+		}else{
+			$this->db->order_by('number','desc');
+		}
+		$result = $this->db->get('accounts');
+		if ($flag) {
+			return $result;
+		} else {
+			return $result->num_rows();
+		}
+	}
 
-    function account_authentication($where_data, $id) {
-        if ($id != "") {
-            $this->db->where("id <>", $id);
-        }
-        $this->db->where($where_data);
-        $this->db->from("accounts");
-        $query = $this->db->count_all_results();
-        return $query;
-    }
-
-    function get_animap($flag, $start, $limit, $id) {
-        $where = array('accountid' => $id);
-
-        if ($flag) {
-            $query = $this->db_model->select("*", "ani_map", $where, "number", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "ani_map", $where);
-        }
-        return $query;
-    }
-
-    function add_animap($data) {
-        $this->db->insert('ani_map', $data);
-        return true;
-    }
-
-    function edit_animap($data, $id) {
-        $new_array = array('number' => $data['number'], 'status' => $data['status']);
-        $this->db->where('id', $id);
-        $this->db->update('ani_map', $new_array);
-        return true;
-    }
-
-    function remove_ani_map($id) {
-        $this->db->where('id', $id);
-        $this->db->delete('ani_map');
-        return true;
-    }
-
-    function animap_authentication($where_data, $id) {
-        if ($id != "") {
-            $this->db->where("id <>", $id);
-        }
-        $this->db->where($where_data);
-        $this->db->from("ani_map");
-        $query = $this->db->count_all_results();
-        return $query;
-    }
-    function add_invoice_config($add_array) {
-        $result = $this->db->insert('invoice_conf', $add_array);
-        return true;
-    }
-
-    function edit_invoice_config($add_array, $edit_id) {
-        $this->db->where('id', $edit_id);
-        $result = $this->db->update('invoice_conf', $add_array);
-        return true;
-    }
+	function get_reseller_Account_list($flag, $start = 0, $limit = 0, $export = false) {
+		$this->db_model->build_search('reseller_list_search');
+		$where = array('reseller_id' => "0", "deleted" => "0", "type" => "1");
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$where['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
+		}
+		if ($flag) {
+			$query = $this->db_model->select("*", "accounts", $where, "number", "desc", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "accounts", $where);
+		}
+		return $query;
+	}
+
+	function get_provider_Account_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('provider_list_search');
+		$where = array("deleted" => "0", "type" => "3", 'reseller_id' => 0);
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$where['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
+		}
+		if ($flag) {
+			$query = $this->db_model->select("*", "accounts", $where, "number", "desc", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "accounts", $where);
+		}
+		return $query;
+	}
+
+	function remove_customer($id) {
+		$this->db->where("id", $id);
+		$this->db->where("type <>", "-1");
+		$data = array('deleted' => '1');
+		$this->db->update("accounts", $data);
+		return true;
+	}
+
+	function insert_block($data, $accountid) {
+		$data = explode(",", $data);
+		$tmp = array();
+		if (!empty($data)) {
+			foreach ($data as $key => $data_value) {
+				$tmp[$key]["accountid"] = $accountid;
+				$result = $this->get_pattern_by_id($data_value);
+				$tmp[$key]["blocked_patterns"] = $result[0]['pattern'];
+				$tmp[$key]["destination"] = $result[0]['comment'];
+			}
+			return $this->db->insert_batch("block_patterns", $tmp);
+		}
+	}
+
+	function get_pattern_by_id($pattern) {
+		$patterns = $this->db_model->getSelect("pattern,comment", "routes", array("id" => $pattern));
+		$patterns_value = $patterns->result_array();
+		return $patterns_value;
+	}
+
+	function get_callerid($account_id) {
+		$query = $this->db_model->getSelect("*", "accounts_callerid", array("accountid" => $account_id));
+		return $query;
+	}
+
+	function get_account_number($accountid) {
+		$query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
+		if ($query->num_rows() > 0)
+			return $query->row_array();
+		else
+			return false;
+	}
+
+	function add_callerid($data) {
+		unset($data['action'],$data['flag']);
+		$data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
+		$this->db->insert('accounts_callerid', $data);
+		return true;
+	}
+
+	function edit_callerid($data) {
+		unset($data['action']);
+		unset($data['flag']);
+		$data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
+		$this->db->where('accountid', $data['accountid']);
+		$this->db->update('accounts_callerid', $data);
+		return true;
+	}
+
+	/**
+	 * -------Here we write code for model accounting functions remove_all_account_tax------
+	 * for remove all account's taxes enteries from database.
+	 */
+	function remove_all_account_tax($account_tax) {
+		$this->db->where('accountid', $account_tax);
+		$this->db->delete('taxes_to_accounts');
+		return true;
+	}
+
+	/**
+	 * -------Here we write code for model accounting functions add_account_tax------
+	 * this function use to insert data for add taxes to account.
+	 */
+	function add_account_tax($data) {
+		$this->db->insert('taxes_to_accounts', $data);
+	}
+
+	/**
+	 * -------Here we write code for model accounting functions get_accounttax_by_id------
+	 * this function use get the account taxes details as per account number
+	 * @account_id = account id
+	 */
+	function get_accounttax_by_id($account_id) {
+		$this->db->where("accountid", trim($account_id));
+		$query = $this->db->get("taxes_to_accounts");
+		if ($query->num_rows() > 0)
+			return $query->result_array();
+		else
+			return false;
+	}
+
+	/**
+	 * -------Here we write code for model accounting functions check_account_num------
+	 * this function write to verify the account number is valid or not.
+	 * @acc_num = account number
+	 */
+	function check_account_num($acc_num) {
+		$this->db->select('accountid');
+		$this->db->where("number", $acc_num);
+		$query = $this->db->get("accounts");
+
+		if ($query->num_rows() > 0)
+			return $query->row_array();
+		else
+			return false;
+	}
+
+	function get_account_by_number($id) {
+		$this->db->where("id", $id);
+		$query = $this->db->get("accounts");
+
+		if ($query->num_rows() > 0)
+			return $query->row_array();
+		else
+			return false;
+	}
+
+	function get_currency_by_id($currency_id) {
+
+		$query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
+		if ($query->num_rows() > 0)
+			return $query->row_array();
+		else
+			return false;
+	}
+
+
+	function update_balance($amount, $accountid, $payment_type) {
+		if ($payment_type == 0) {
+			$query = 'UPDATE `accounts` SET `balance` = (balance + ' . $amount . ') WHERE `id` = ' . $accountid;
+			return $this->db->query($query);
+		}if ($payment_type == 1) {
+			$query = 'UPDATE `accounts` SET `balance` = (balance - ' . $amount . ') WHERE `id` = ' . $accountid;
+			return $this->db->query($query);
+		}
+	}
+
+	function account_authentication($where_data, $id) {
+		if ($id != "") {
+			$this->db->where("id <>", $id);
+		}
+		$this->db->where($where_data);
+		$this->db->from("accounts");
+		$query = $this->db->count_all_results();
+		return $query;
+	}
+
+	function get_animap($flag, $start, $limit, $id) {
+		$where = array('accountid' => $id);
+
+		if ($flag) {
+			$query = $this->db_model->select("*", "ani_map", $where, "number", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "ani_map", $where);
+		}
+		return $query;
+	}
+
+	function add_animap($data) {
+		$this->db->insert('ani_map', $data);
+		return true;
+	}
+
+	function edit_animap($data, $id) {
+		$new_array = array('number' => $data['number'], 'status' => $data['status']);
+		$this->db->where('id', $id);
+		$this->db->update('ani_map', $new_array);
+		return true;
+	}
+
+	function remove_ani_map($id) {
+		$this->db->where('id', $id);
+		$this->db->delete('ani_map');
+		return true;
+	}
+
+	function animap_authentication($where_data, $id) {
+		if ($id != "") {
+			$this->db->where("id <>", $id);
+		}
+		$this->db->where($where_data);
+		$this->db->from("ani_map");
+		$query = $this->db->count_all_results();
+		return $query;
+	}
+	function add_invoice_config($add_array) {
+		$result = $this->db->insert('invoice_conf', $add_array);
+		return true;
+	}
+
+	function edit_invoice_config($add_array, $edit_id) {
+		$this->db->where('id', $edit_id);
+		$result = $this->db->update('invoice_conf', $add_array);
+		return true;
+	}
 
 }

Spacing +65 added lines, -65 removed lines

@@ -31,12 +31,12 @@ 
     function add_account($accountinfo) {
 	
         $account_data = $this->session->userdata("accountinfo");
-        $accountinfo['reseller_id'] = ($account_data['type'] == 1 ) ? $account_data['id'] : 0;
-        $accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1 ) ? "0" : $accountinfo['maxchannels'];
+        $accountinfo['reseller_id'] = ($account_data['type'] == 1) ? $account_data['id'] : 0;
+        $accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1) ? "0" : $accountinfo['maxchannels'];
         unset($accountinfo['action']);
         $sip_flag = isset($accountinfo['sip_device_flag']) ? 1 : 0;
         $opensip_flag = isset($accountinfo['opensips_device_flag']) ? 1 : 0;
-        unset($accountinfo['sip_device_flag'],$accountinfo['opensips_device_flag'],$accountinfo['tax_id']);
+        unset($accountinfo['sip_device_flag'], $accountinfo['opensips_device_flag'], $accountinfo['tax_id']);
 
         /*         * ******************************** */
         $accountinfo['creation'] = gmdate('Y-m-d H:i:s');
@@ -51,14 +51,14 @@ 
         }else{
 	  $accountinfo['allow_ip_management']=1;
         }*/
-        if(isset($accountinfo['local_call'])){
-	  $accountinfo['local_call']=0;
-        }else{
-	  $accountinfo['local_call']=1;
+        if (isset($accountinfo['local_call'])) {
+	  $accountinfo['local_call'] = 0;
+        } else {
+	  $accountinfo['local_call'] = 1;
         }
-        if ($accountinfo['type'] == 1){
+        if ($accountinfo['type'] == 1) {
         $invoice_config = $accountinfo['invoice_config_flag'];
-		}else{
+		} else {
 		$invoice_config = "";		
 		}
 		unset($accountinfo['invoice_config_flag']);
@@ -86,8 +86,8 @@ 
             }
         if ($sip_flag == '1') {
             $this->db->select('id');
-            $this->db->where('name','default');
-            $sipprofile_result=(array)$this->db->get('sip_profiles')->first_row();
+            $this->db->where('name', 'default');
+            $sipprofile_result = (array)$this->db->get('sip_profiles')->first_row();
             $free_switch_array = array('fs_username' => $accountinfo['number'],
                 'fs_password' => $this->common->decode($accountinfo['password']),
                 'context' => 'default',
@@ -109,8 +109,8 @@ 
             $this->load->model('opensips/opensips_model');
             $this->opensips_model->add_opensipsdevices($opensips_array);
         }
-        $accountinfo['confirm'] =  base_url();
-        if($accountinfo['id'] == ""){
+        $accountinfo['confirm'] = base_url();
+        if ($accountinfo['id'] == "") {
         $accountinfo['id'] = $last_id;
 		}
         $accountinfo['password'] = $this->common->decode($accountinfo['password']);    
@@ -154,16 +154,16 @@ 
                 if ($query_pricelist->num_rows > 0) {
                     $description = '';
                     if ($update_array['balance']['operator'] == '2') {
-                        $description .="Reseller update set balance by admin";
+                        $description .= "Reseller update set balance by admin";
                     }
                     if ($update_array['balance']['operator'] == '3') {
-                        $description .="Reseller update increase balance by admin";
+                        $description .= "Reseller update increase balance by admin";
                     }
                     if ($update_array['balance']['operator'] == '4') {
-                        $description .="Reseller update descrise balance by admin";
+                        $description .= "Reseller update descrise balance by admin";
                     }
                     foreach ($query_pricelist->result_array() as $key => $reseller_payment) {
-                        if (!empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
+                        if ( ! empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
                             $payment_by = $reseller_payment['reseller_id'];
                         } else {
                             $payment_by = '-1';
@@ -218,16 +218,16 @@ 
             if ($query_pricelist->num_rows > 0) {
                 $description = '';
                 if ($update_array['balance']['operator'] == '2') {
-                    $description .="Customer update set balance by admin";
+                    $description .= "Customer update set balance by admin";
                 }
                 if ($update_array['balance']['operator'] == '3') {
-                    $description .="Customer update increase balance by admin";
+                    $description .= "Customer update increase balance by admin";
                 }
                 if ($update_array['balance']['operator'] == '4') {
-                    $description .="Customer update descrise balance by admin";
+                    $description .= "Customer update descrise balance by admin";
                 }
                 foreach ($query_pricelist->result_array() as $key => $customer_payment) {
-                    if (!empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
+                    if ( ! empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
                         $payment_by = $customer_payment['reseller_id'];
                     } else {
                         $payment_by = '-1';
@@ -283,11 +283,11 @@ 
             $pin = $this->common->find_uniq_rendno_accno($number_length, 'pin', 'accounts', '', $count);
         }
         $sip_flag = false;
-        $opensip_flag=false;
-        if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips']== 0) {
+        $opensip_flag = false;
+        if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips'] == 0) {
             $sip_flag = true;
         }
-        if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips']== 1) {
+        if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips'] == 1) {
             $opensip_flag = true;
         }
         unset(
@@ -298,20 +298,20 @@ 
                 $add_array['sip_device_flag'],
                 $add_array['opensips_device_flag']
         );
-        if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
-        $is_recording=1;
-        }else{
-        $is_recording=0;
+        if (isset($add_array['is_recording']) && $add_array['is_recording'] != '') {
+        $is_recording = 1;
+        } else {
+        $is_recording = 0;
         }
-        if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
-        $allow_ip_management=1;
-        }else{
-        $allow_ip_management=0;
+        if (isset($add_array['allow_ip_management']) && $add_array['allow_ip_management'] != '') {
+        $allow_ip_management = 1;
+        } else {
+        $allow_ip_management = 0;
         }
-        if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
-        $local_call=1;
-        }else{
-        $local_call=0;
+        if (isset($add_array['local_call']) && $add_array['local_call'] != '') {
+        $local_call = 1;
+        } else {
+        $local_call = 0;
         }
         if ($sip_flag) {
             $query = $this->db_model->select("*", "sip_profiles", array('status' => "0"), "id", "ASC", '1', '0');
@@ -419,7 +419,7 @@ 
             $this->db->insert_batch('accounts', $insert_array);
             if ($opensip_flag == 1) {
                 $db_config = Common_model::$global_config['system_config'];
-                $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+                $opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
                 $this->opensips_db = $this->load->database($opensipdsn, true);
                 $this->opensips_db->insert_batch("subscriber", $opensips_array);
             }
@@ -428,7 +428,7 @@ 
     }
 
     function get_max_limit($add_array) {
-		$this->db->where('deleted','0');
+		$this->db->where('deleted', '0');
         $this->db->where("length(number)", $add_array['account_length']);
         $this->db->like('number', $add_array['prefix'], 'after');
         $this->db->select("count(id) as count");
@@ -444,16 +444,16 @@ 
     }
     function account_process_payment($data) {
 	$data['accountid'] = $data['id'];
-        $accountdata=(array)$this->db->get_where('accounts',array("id"=>$data['accountid']))->first_row();
-        $accountinfo =$this->session->userdata('accountinfo');
+        $accountdata = (array)$this->db->get_where('accounts', array("id"=>$data['accountid']))->first_row();
+        $accountinfo = $this->session->userdata('accountinfo');
 	$data["payment_by"] = $accountdata['reseller_id'] > 0 ? $accountdata['reseller_id'] : '-1';
 	$data['payment_mode'] = $data['payment_type'];
-	unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
-	if (isset($data) && !empty($accountdata)) {
-		$data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
+	unset($data['action'], $data['id'], $data['account_currency'], $data['payment_type']);
+	if (isset($data) && ! empty($accountdata)) {
+		$data['credit'] = $data['credit'] == '' ? 0 : $data['credit'];
 		$date = gmdate('Y-m-d H:i:s');
-		if($data['payment_mode']== 1){       
-		  $balance = $this->update_balance($data['credit'], $data['accountid'],$data['payment_mode']);
+		if ($data['payment_mode'] == 1) {       
+		  $balance = $this->update_balance($data['credit'], $data['accountid'], $data['payment_mode']);
 			  $insert_arr = array("accountid" => $data['accountid'],
 			  "credit" => "-".$data['credit'],
 			  'payment_mode'=>$data['payment_mode'],
@@ -463,8 +463,8 @@ 
 			  'payment_by'=>$data['payment_by'],
 		  );
 		  $this->db->insert("payments", $insert_arr);
-		}else{ 
-		  $balance = $this->update_balance($data['credit'], $data['accountid'],$data['payment_mode']);
+		} else { 
+		  $balance = $this->update_balance($data['credit'], $data['accountid'], $data['payment_mode']);
 		  $insert_arr = array("accountid" => $data['accountid'],
 			  "credit" => $data['credit'],
 			  'payment_mode'=>$data['payment_mode'],
@@ -474,11 +474,11 @@ 
 			  'payment_by'=>$data['payment_by'],
 		  );
 		  $this->db->insert("payments", $insert_arr);
-		  $accountdata['refill_amount']=$data['credit'];
-		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
-		  if($accountdata['reseller_id'] == $current_id){
+		  $accountdata['refill_amount'] = $data['credit'];
+		  $current_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : '0';
+		  if ($accountdata['reseller_id'] == $current_id) {
 		    $this->common->mail_to_users('voip_account_refilled', $accountdata);
-		  }else{
+		  } else {
 		    $this->common->mail_to_users('voip_child_account_refilled', $accountdata);
 		  }
 		}
@@ -488,7 +488,7 @@ 
 
     function get_admin_Account_list($flag, $start = 0, $limit = 0, $reseller_id = 0) {
         $this->db_model->build_search('admin_list_search');
-        $where = "reseller_id =" . $reseller_id . " AND deleted =0 AND type in (2,4,-1)";
+        $where = "reseller_id =".$reseller_id." AND deleted =0 AND type in (2,4,-1)";
         if ($this->session->userdata('advance_search') == 1) {
             $search = $this->session->userdata('admin_list_search');
             if ($search['type'] == '') {
@@ -504,10 +504,10 @@ 
         if ($flag) {
             $this->db->limit($limit, $start);
         }
-        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-          $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
-            $this->db->order_by('number','desc');
+        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+          $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+        } else {
+            $this->db->order_by('number', 'desc');
         }
         $result = $this->db->get('accounts');
 
@@ -535,13 +535,13 @@ 
             $this->db->where($type);
         }
         if ($flag) {
-            if (!$export)
+            if ( ! $export)
                 $this->db->limit($limit, $start);
         }
-        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-          $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
-            $this->db->order_by('number','desc');
+        if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+          $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+        } else {
+            $this->db->order_by('number', 'desc');
         }
         $result = $this->db->get('accounts');
         if ($flag) {
@@ -590,7 +590,7 @@ 
     function insert_block($data, $accountid) {
         $data = explode(",", $data);
         $tmp = array();
-        if (!empty($data)) {
+        if ( ! empty($data)) {
             foreach ($data as $key => $data_value) {
                 $tmp[$key]["accountid"] = $accountid;
                 $result = $this->get_pattern_by_id($data_value);
@@ -621,7 +621,7 @@ 
     }
 
     function add_callerid($data) {
-        unset($data['action'],$data['flag']);
+        unset($data['action'], $data['flag']);
         $data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
         $this->db->insert('accounts_callerid', $data);
         return true;
@@ -706,10 +706,10 @@ 
 
     function update_balance($amount, $accountid, $payment_type) {
         if ($payment_type == 0) {
-            $query = 'UPDATE `accounts` SET `balance` = (balance + ' . $amount . ') WHERE `id` = ' . $accountid;
+            $query = 'UPDATE `accounts` SET `balance` = (balance + '.$amount.') WHERE `id` = '.$accountid;
             return $this->db->query($query);
         }if ($payment_type == 1) {
-            $query = 'UPDATE `accounts` SET `balance` = (balance - ' . $amount . ') WHERE `id` = ' . $accountid;
+            $query = 'UPDATE `accounts` SET `balance` = (balance - '.$amount.') WHERE `id` = '.$accountid;
             return $this->db->query($query);
         }
     }

Braces +37 added lines, -31 removed lines

@@ -53,12 +53,12 @@ 
         }*/
         if(isset($accountinfo['local_call'])){
 	  $accountinfo['local_call']=0;
-        }else{
+        } else{
 	  $accountinfo['local_call']=1;
         }
         if ($accountinfo['type'] == 1){
         $invoice_config = $accountinfo['invoice_config_flag'];
-		}else{
+		} else{
 		$invoice_config = "";		
 		}
 		unset($accountinfo['invoice_config_flag']);
@@ -300,17 +300,17 @@ 
         );
         if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
         $is_recording=1;
-        }else{
+        } else{
         $is_recording=0;
         }
         if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
         $allow_ip_management=1;
-        }else{
+        } else{
         $allow_ip_management=0;
         }
         if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
         $local_call=1;
-        }else{
+        } else{
         $local_call=0;
         }
         if ($sip_flag) {
@@ -463,7 +463,7 @@ 
 			  'payment_by'=>$data['payment_by'],
 		  );
 		  $this->db->insert("payments", $insert_arr);
-		}else{ 
+		} else{ 
 		  $balance = $this->update_balance($data['credit'], $data['accountid'],$data['payment_mode']);
 		  $insert_arr = array("accountid" => $data['accountid'],
 			  "credit" => $data['credit'],
@@ -478,7 +478,7 @@ 
 		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
 		  if($accountdata['reseller_id'] == $current_id){
 		    $this->common->mail_to_users('voip_account_refilled', $accountdata);
-		  }else{
+		  } else{
 		    $this->common->mail_to_users('voip_child_account_refilled', $accountdata);
 		  }
 		}
@@ -506,7 +506,7 @@ 
         }
         if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
           $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
+        } else{
             $this->db->order_by('number','desc');
         }
         $result = $this->db->get('accounts');
@@ -535,12 +535,13 @@ 
             $this->db->where($type);
         }
         if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
+            if (!$export) {
+                            $this->db->limit($limit, $start);
+            }
         }
         if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
           $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-        }else{
+        } else{
             $this->db->order_by('number','desc');
         }
         $result = $this->db->get('accounts');
@@ -614,10 +615,11 @@ 
 
     function get_account_number($accountid) {
         $query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
+        if ($query->num_rows() > 0) {
+                    return $query->row_array();
+        } else {
+                    return false;
+        }
     }
 
     function add_callerid($data) {
@@ -662,10 +664,11 @@ 
     function get_accounttax_by_id($account_id) {
         $this->db->where("accountid", trim($account_id));
         $query = $this->db->get("taxes_to_accounts");
-        if ($query->num_rows() > 0)
-            return $query->result_array();
-        else
-            return false;
+        if ($query->num_rows() > 0) {
+                    return $query->result_array();
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -678,29 +681,32 @@ 
         $this->db->where("number", $acc_num);
         $query = $this->db->get("accounts");
 
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
+        if ($query->num_rows() > 0) {
+                    return $query->row_array();
+        } else {
+                    return false;
+        }
     }
 
     function get_account_by_number($id) {
         $this->db->where("id", $id);
         $query = $this->db->get("accounts");
 
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
+        if ($query->num_rows() > 0) {
+                    return $query->row_array();
+        } else {
+                    return false;
+        }
     }
 
     function get_currency_by_id($currency_id) {
 
         $query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
-        if ($query->num_rows() > 0)
-            return $query->row_array();
-        else
-            return false;
+        if ($query->num_rows() > 0) {
+                    return $query->row_array();
+        } else {
+                    return false;
+        }
     }
 
 

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

Indentation +165 added lines, -165 removed lines

@@ -24,177 +24,177 @@
 
 class Charges extends MX_Controller {
 
-    function Charges() {
-        parent::__construct();
-
-        $this->load->helper('template_inheritance');
-
-        $this->load->library('session');
-        $this->load->library("charges_form");
-        $this->load->library('astpp/form');
-        $this->load->model('charges_model');
-
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
-    }
-
-    function periodiccharges_add() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Create Subscription';
-        $data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), '');
-        $this->load->view('view_periodiccharges_add_edit', $data);
-    }
-
-    function periodiccharges_edit($edit_id = '') {
-        $data['page_title'] = 'Edit Subscription ';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "charges", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $edit_data['charge'] = $this->common_model->to_calculate_currency($edit_data['charge'], '', '', true, false);
+	function Charges() {
+		parent::__construct();
+
+		$this->load->helper('template_inheritance');
+
+		$this->load->library('session');
+		$this->load->library("charges_form");
+		$this->load->library('astpp/form');
+		$this->load->model('charges_model');
+
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . '/astpp/login');
+	}
+
+	function periodiccharges_add() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Create Subscription';
+		$data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), '');
+		$this->load->view('view_periodiccharges_add_edit', $data);
+	}
+
+	function periodiccharges_edit($edit_id = '') {
+		$data['page_title'] = 'Edit Subscription ';
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "charges", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$edit_data['charge'] = $this->common_model->to_calculate_currency($edit_data['charge'], '', '', true, false);
         
-        $data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $edit_data);
-        $this->load->view('view_periodiccharges_add_edit', $data);
-    }
-
-    function periodiccharges_save() {
-        $add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Subscription';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                if ($add_array['pricelist_id'] == '') {
-                    $add_array['pricelist_id'] = '0';
-                }
-                $add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
-                $this->charges_model->edit_charge($add_array, $add_array['id']);
+		$data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $edit_data);
+		$this->load->view('view_periodiccharges_add_edit', $data);
+	}
+
+	function periodiccharges_save() {
+		$add_array = $this->input->post();
+		$data['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Subscription';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				if ($add_array['pricelist_id'] == '') {
+					$add_array['pricelist_id'] = '0';
+				}
+				$add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
+				$this->charges_model->edit_charge($add_array, $add_array['id']);
                 
-                if($add_array['pricelist_id'] > 0){
-                   $this->charges_model->add_account_charges($add_array['pricelist_id'],$add_array['id'],true);
-                }                
-                echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription updated successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Add Subscription';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
-                $charge_id = $this->charges_model->add_charge($add_array);
-                if($add_array['pricelist_id'] > 0 && $charge_id > 0){
-                   $this->charges_model->add_account_charges($add_array['pricelist_id'],$charge_id,false);
-                }                  
-                echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription added successfully!"));
-                exit;
-            }
-        }
-    }
-
-
-
-    function periodiccharges_delete($id) {
-        $this->charges_model->remove_charge($id);
-        $this->session->set_flashdata('astpp_notification', 'Subscription removed successfully!');
-        redirect(base_url() . 'charges/periodiccharges/');
-    }
-
-    function periodiccharges_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            if (isset($action['charge']['charge']) && $action['charge']['charge'] != '') {
-                $action['charge']['charge'] = $this->common_model->add_calculate_currency($action['charge']['charge'], "", '', true, false);
-            }
-            $this->session->set_userdata('charges_list_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'charges/periodiccharges/');
-        }
-    }
-
-    function periodiccharges_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('charges_list_search', "");
-    }
-
-    function periodiccharges() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Subscriptions';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->charges_form->build_charge_list_for_admin();
-        $data["grid_buttons"] = $this->charges_form->build_grid_buttons();
-        $data['form_search'] = $this->form->build_serach_form($this->charges_form->get_charges_search_form());
-
-        $this->load->view('view_charges_list', $data);
-    }
-
-    /**
-     * -------Here we write code for controller accounts functions account_list------
-     * Listing of Accounts table data through php function json_encode
-     */
-    function periodiccharges_json() {
-        $json_data = array();
-        $count_all = $this->charges_model->getcharges_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->charges_model->getcharges_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->charges_form->build_charge_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    }
-
-    function periodiccharges_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $charge_where="charge_id IN(".$ids.")";
-        $this->db->delete('charge_to_account',$charge_where);
-        echo $this->db->delete("charges",$where);
-    }
-    function customer_charge_list($accountid, $accounttype) {
+				if($add_array['pricelist_id'] > 0){
+				   $this->charges_model->add_account_charges($add_array['pricelist_id'],$add_array['id'],true);
+				}                
+				echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription updated successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Add Subscription';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$add_array['charge'] = $this->common_model->add_calculate_currency($add_array['charge'], '', '', false, false);
+				$charge_id = $this->charges_model->add_charge($add_array);
+				if($add_array['pricelist_id'] > 0 && $charge_id > 0){
+				   $this->charges_model->add_account_charges($add_array['pricelist_id'],$charge_id,false);
+				}                  
+				echo json_encode(array("SUCCESS"=> $add_array["description"]." subscription added successfully!"));
+				exit;
+			}
+		}
+	}
+
+
+
+	function periodiccharges_delete($id) {
+		$this->charges_model->remove_charge($id);
+		$this->session->set_flashdata('astpp_notification', 'Subscription removed successfully!');
+		redirect(base_url() . 'charges/periodiccharges/');
+	}
+
+	function periodiccharges_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			if (isset($action['charge']['charge']) && $action['charge']['charge'] != '') {
+				$action['charge']['charge'] = $this->common_model->add_calculate_currency($action['charge']['charge'], "", '', true, false);
+			}
+			$this->session->set_userdata('charges_list_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'charges/periodiccharges/');
+		}
+	}
+
+	function periodiccharges_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('charges_list_search', "");
+	}
+
+	function periodiccharges() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Subscriptions';
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->charges_form->build_charge_list_for_admin();
+		$data["grid_buttons"] = $this->charges_form->build_grid_buttons();
+		$data['form_search'] = $this->form->build_serach_form($this->charges_form->get_charges_search_form());
+
+		$this->load->view('view_charges_list', $data);
+	}
+
+	/**
+	 * -------Here we write code for controller accounts functions account_list------
+	 * Listing of Accounts table data through php function json_encode
+	 */
+	function periodiccharges_json() {
+		$json_data = array();
+		$count_all = $this->charges_model->getcharges_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->charges_model->getcharges_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->charges_form->build_charge_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	}
+
+	function periodiccharges_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$charge_where="charge_id IN(".$ids.")";
+		$this->db->delete('charge_to_account',$charge_where);
+		echo $this->db->delete("charges",$where);
+	}
+	function customer_charge_list($accountid, $accounttype) {
 	
-        $json_data = array();
-
-        $select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id,charges.pro_rate,charges.creation_date,charges.last_modified_date";
-        $table = "charges";
-        $jionTable = array('charge_to_account', 'accounts');
-        $jionCondition = array('charges.id = charge_to_account.charge_id', 'accounts.id = charge_to_account.accountid');
-        $type = array('left', 'inner');
-        $where = array('accounts.id' => $accountid);
-        $order_type = 'id';
-        $order_by = "ASC";
-        $instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_subscription'); 
-        $like_str=!empty($instant_search) ? "(charges.description like '%$instant_search%'  
+		$json_data = array();
+
+		$select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id,charges.pro_rate,charges.creation_date,charges.last_modified_date";
+		$table = "charges";
+		$jionTable = array('charge_to_account', 'accounts');
+		$jionCondition = array('charges.id = charge_to_account.charge_id', 'accounts.id = charge_to_account.accountid');
+		$type = array('left', 'inner');
+		$where = array('accounts.id' => $accountid);
+		$order_type = 'id';
+		$order_by = "ASC";
+		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_subscription'); 
+		$like_str=!empty($instant_search) ? "(charges.description like '%$instant_search%'  
                                             OR  charges.charge like '%$instant_search%'
                                             OR  charges.charge like '%$instant_search%' 
                                                 )"
-                                           :null;
-        if(!empty($like_str))
-        $this->db->where($like_str);
-        $count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        if(!empty($like_str))
-        $this->db->where($like_str);
-        $account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
-        $grid_fields = json_decode($this->charges_form->build_charges_list_for_customer($accountid, $accounttype));
-        $json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);
-
-        echo json_encode($json_data);
-    }
+										   :null;
+		if(!empty($like_str))
+		$this->db->where($like_str);
+		$count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		if(!empty($like_str))
+		$this->db->where($like_str);
+		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
+		$grid_fields = json_decode($this->charges_form->build_charges_list_for_customer($accountid, $accounttype));
+		$json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);
+
+		echo json_encode($json_data);
+	}
 
 
     

Spacing +14 added lines, -14 removed lines

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

Braces +9 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
         $this->load->library('astpp/form');
         $this->load->model('charges_model');
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . '/astpp/login');
+        }
     }
 
     function periodiccharges_add() {
@@ -182,13 +183,15 @@ 
                                             OR  charges.charge like '%$instant_search%' 
                                                 )"
                                            :null;
-        if(!empty($like_str))
-        $this->db->where($like_str);
+        if(!empty($like_str)) {
+                $this->db->where($like_str);
+        }
         $count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        if(!empty($like_str))
-        $this->db->where($like_str);
+        if(!empty($like_str)) {
+                $this->db->where($like_str);
+        }
         $account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
         $grid_fields = json_decode($this->charges_form->build_charges_list_for_customer($accountid, $accounttype));
         $json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);

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

Indentation +79 added lines, -79 removed lines

@@ -23,119 +23,119 @@
 ###############################################################################

 

 if (!defined('BASEPATH'))

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

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

 

 class Charges_form {

-      	function __construct($library_name = '') {

-        $this->CI = & get_instance();

-    }

+	  	function __construct($library_name = '') {

+		$this->CI = & get_instance();

+	}

    

-    function get_charge_form_fields() {

-        $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'),

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

-            array('Amount', 'INPUT', array('name' => 'charge', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|greater_than[0]|currency_decimal|xss_clean', 'tOOL TIP', 'Please Enter account number'),

-	    array('Prorate', 'pro_rate', 'SELECT', '', '', 'tOOL TIP', 'Please Select Pro rate', '', '', '', 'set_prorate'),      

-	    array('Bill cycle', 'sweep_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'sweep', 'sweeplist', 'build_dropdown', '', ''),

+	function get_charge_form_fields() {

+		$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'),

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

+			array('Amount', 'INPUT', array('name' => 'charge', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|greater_than[0]|currency_decimal|xss_clean', 'tOOL TIP', 'Please Enter account number'),

+		array('Prorate', 'pro_rate', 'SELECT', '', '', 'tOOL TIP', 'Please Select Pro rate', '', '', '', 'set_prorate'),      

+		array('Bill cycle', 'sweep_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'sweep', 'sweeplist', 'build_dropdown', '', ''),

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

-        );

-        $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-        $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

-        return $form;

-    }

+		);

+		$form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

+		return $form;

+	}

 

-    function get_charges_search_form() {

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

-        if ($logintype == 1 || $logintype == 5) {

-            $account_data = $this->CI->session->userdata("accountinfo");

-            $loginid = $account_data['id'];

+	function get_charges_search_form() {

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

+		if ($logintype == 1 || $logintype == 5) {

+			$account_data = $this->CI->session->userdata("accountinfo");

+			$loginid = $account_data['id'];

 

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

+		}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('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'),

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

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

-        );

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

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

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

+		);

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

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

 

-        return $form;

-    }

-    /**

+		return $form;

+	}

+	/**

      ASTPP  3.0 

      Change size of grind 

-    **/

-    function build_charge_list_for_admin() {

+	 **/

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

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

 /**

 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 

             change status active or inactive.

             */

             

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

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

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

-                ));

-        return $grid_field_arr;

-    }

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

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

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

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

+				));

+		return $grid_field_arr;

+	}

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

 

-    function build_grid_buttons() {

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

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

-            ));

-        return $buttons_json;

-    }

+	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/")

+			));

+		return $buttons_json;

+	}

    

-    function build_charges_list_for_customer($accountid, $accounttype) {

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

 		

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

-    }   

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

+	}   

 

 }

 

Spacing +25 added lines, -25 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

     exit('No direct script access allowed');

 

 class Charges_form {

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

    

     function get_charge_form_fields() {

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

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

         $form['Information'] = array(

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

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

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

             $loginid = $account_data['id'];

 

-        }else{

+        } else {

             $loginid = "0";

         }

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

         $form['Search'] = array(

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

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

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

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

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

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

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

 		

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

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

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

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

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

 		

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

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

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

 /**

 ASTPP  3.0 

 For DID edit on DID number

 **/

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

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

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

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

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

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

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

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

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

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

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

             /**

 	    ASTPP  3.0 

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

             **/

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

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

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

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

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

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

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

            /*

             ASTPP  3.0 

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

 

     function build_grid_buttons() {

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

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

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

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

             ));

         return $buttons_json;

     }

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

 		

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

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

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

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

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

 		

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

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

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

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

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

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

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

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

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

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

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

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

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

                 ));

         return $grid_field_arr;

Braces +4 added lines, -3 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Charges_form {

       	function __construct($library_name = '') {

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

             $loginid = $account_data['id'];

 

-        }else{

+        } else{

             $loginid = "0";

         }

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

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() ?>