Passed
Push — v3.0 ( 2dc815...9faf9f )
by Samir
12:41
created
web_interface/astpp/application/language/spanish/footer_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 $lang['FOOTER.FOOTER'] = 'Copyright © 2003 - 2012. ASTPP - Open Source Solución de Facturación VOIP. Todos los Derechos Reservados.';
3 5
 ?>
Please login to merge, or discard this patch.
web_interface/astpp/application/libraries/locale_menu.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if ( ! defined('BASEPATH'))
25 25
 	exit('No direct script access allowed');
26 26
 
27 27
 /**
28 28
  * Dynamically build forms for display
29 29
  */
30
-class locale_Menu{
30
+class locale_Menu {
31 31
 
32 32
 	function __construct($library_name = '') {
33 33
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		$this->CI->load->model('db_model');
36 36
 		$this->CI->load->library('email');
37 37
 		$this->CI->load->library('session');
38
-	$current_locale=$this->CI->session->userdata('user_language');
38
+	$current_locale = $this->CI->session->userdata('user_language');
39 39
 	putenv("LC_ALL=$current_locale");
40 40
 	setlocale(LC_ALL, $current_locale); 
41 41
 	bindtextdomain(WEBSITE_DOMAIN, FCPATH.'/application/modules/dashboard/language');
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if (!defined('BASEPATH')) {
25 25
 	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 /**
28 29
  * Dynamically build forms for display
Please login to merge, or discard this patch.
web_interface/astpp/application/libraries/global_locale.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if ( ! defined('BASEPATH'))
25 25
 	exit('No direct script access allowed');
26 26
 
27 27
 /**
28 28
  * Dynamically build forms for display
29 29
  */
30
-class Global_locale{
30
+class Global_locale {
31 31
 
32 32
 	function __construct($library_name = '') {
33 33
 
34 34
 		$this->CI = & get_instance();
35 35
 	header("Expires: Tue, 01 Jan 2000 00:00:00 GMT");
36
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
36
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
37 37
 	header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
38 38
 	header("Cache-Control: post-check=0, pre-check=0", false);
39 39
 	header("Pragma: no-cache");
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if (!defined('BASEPATH')) {
25 25
 	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 /**
28 29
  * Dynamically build forms for display
Please login to merge, or discard this patch.
web_interface/astpp/application/views/footer.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 	if($result->num_rows() > 0){
13 13
 		$result=$result->result_array();
14 14
 		$footer = $result[0]['website_footer'];
15
-	}else{
15
+	} else{
16 16
 		$footer = '';
17 17
 	}
18 18
   	if($footer != ''){ ?>
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
    <div class="padding-b-10 col-md-12 no-padding">
7 7
 	
8 8
   <?php
9
-	$str = isset($_SERVER['HTTPS'])&& $_SERVER['HTTPS'] == 'on' ? 'https://' :'http://';
9
+	$str = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
10 10
 	$this->db->select('*');	
11
-	$this->db->where('domain',$_SERVER['HTTP_HOST']);
12
-	$this->db->or_where('domain','http://'.$_SERVER['HTTP_HOST']);
13
-	$this->db->or_where('domain','https://'.$_SERVER['HTTP_HOST']);
14
-	$result=$this->db->get('invoice_conf');
15
-	if($result->num_rows() > 0){
16
-		$result=$result->result_array();
11
+	$this->db->where('domain', $_SERVER['HTTP_HOST']);
12
+	$this->db->or_where('domain', 'http://'.$_SERVER['HTTP_HOST']);
13
+	$this->db->or_where('domain', 'https://'.$_SERVER['HTTP_HOST']);
14
+	$result = $this->db->get('invoice_conf');
15
+	if ($result->num_rows() > 0) {
16
+		$result = $result->result_array();
17 17
 		$footer = $result[0]['website_footer'];
18
-	}else{
18
+	} else {
19 19
 		$footer = '';
20 20
 	}
21
-  	if($footer != ''){ ?>
21
+  	if ($footer != '') { ?>
22 22
 		 <div style="margin-left:470px; "><?=$footer ?>
23 23
 		 
24 24
 		 <div style="" class="pull-left">
Please login to merge, or discard this patch.
web_interface/astpp/system/database/drivers/mssql/mssql_driver.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -295,15 +295,15 @@
 block discarded – undo
295 295
 	// --------------------------------------------------------------------
296 296
 
297 297
 	/**
298
-	* Parse major version
299
-	*
300
-	* Grabs the major version number from the
301
-	* database server version string passed in.
302
-	*
303
-	* @access private
304
-	* @param string $version
305
-	* @return string major version number
306
-	*/
298
+	 * Parse major version
299
+	 *
300
+	 * Grabs the major version number from the
301
+	 * database server version string passed in.
302
+	 *
303
+	 * @access private
304
+	 * @param string $version
305
+	 * @return string major version number
306
+	 */
307 307
 	function _parse_major_version($version)
308 308
 	{
309 309
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);
Please login to merge, or discard this patch.
freeswitch/fs/cdr.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@
 block discarded – undo
67 67
 	//error_log(print_r($data,true));
68 68
 	$logger->log(print_r($data,true));
69 69
 	if($data['variables']['calltype']== "CALLINGCARD"){
70
-    		if(isset($data['variables']['originating_leg_uuid']))
71
-    		{
72
-	     		process_cdr($data,$db,$logger,$decimal_points);
73
-    		}
74
-    	}else{
75
-        	process_cdr($data,$db,$logger,$decimal_points);
76
-    	}
70
+			if(isset($data['variables']['originating_leg_uuid']))
71
+			{
72
+		 		process_cdr($data,$db,$logger,$decimal_points);
73
+			}
74
+		}else{
75
+			process_cdr($data,$db,$logger,$decimal_points);
76
+		}
77 77
 }
78 78
 
79 79
 //$db->cleanup();
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	{
29 29
 		case 'development':
30 30
 //			error_reporting(E_ALL);
31
-			error_reporting(E_ERROR|E_WARNING|E_PARSE);
31
+			error_reporting(E_ERROR | E_WARNING | E_PARSE);
32 32
 		break;
33 33
 	
34 34
 		case 'testing':
@@ -55,24 +55,24 @@  discard block
 block discarded – undo
55 55
 $config = $lib->get_configurations($db);
56 56
 
57 57
 //Set default decimal points 
58
-$decimal_points = ($config['decimal_points'] <= 0)?4:$config['decimal_points'];
58
+$decimal_points = ($config['decimal_points'] <= 0) ? 4 : $config['decimal_points'];
59 59
 
60 60
 //Define logger object
61 61
 $logger = new logger($lib);
62 62
 
63
-if(isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
63
+if (isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
64 64
 
65 65
 	$db->run("SET NAMES utf8");
66
-	$data = json_decode(file_get_contents("php://input"),true);
66
+	$data = json_decode(file_get_contents("php://input"), true);
67 67
 	//error_log(print_r($data,true));
68
-	$logger->log(print_r($data,true));
69
-	if($data['variables']['calltype']== "CALLINGCARD"){
70
-    		if(isset($data['variables']['originating_leg_uuid']))
68
+	$logger->log(print_r($data, true));
69
+	if ($data['variables']['calltype'] == "CALLINGCARD") {
70
+    		if (isset($data['variables']['originating_leg_uuid']))
71 71
     		{
72
-	     		process_cdr($data,$db,$logger,$decimal_points);
72
+	     		process_cdr($data, $db, $logger, $decimal_points);
73 73
     		}
74
-    	}else{
75
-        	process_cdr($data,$db,$logger,$decimal_points);
74
+    	} else {
75
+        	process_cdr($data, $db, $logger, $decimal_points);
76 76
     	}
77 77
 }
78 78
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
     		{
72 72
 	     		process_cdr($data,$db,$logger,$decimal_points);
73 73
     		}
74
-    	}else{
74
+    	} else{
75 75
         	process_cdr($data,$db,$logger,$decimal_points);
76 76
     	}
77 77
 }
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/views/view_systemconf.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -176,35 +176,35 @@
 block discarded – undo
176 176
               <fieldset>
177 177
                <legend> <?=ucfirst($group_title)?></legend>
178 178
                   <div style="width:50%;float:left;">
179
-                    <?php $currency = Common_model::$global_config['system_config']['base_currency'];?>
180
-                    <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>
181
-                    <?php foreach($details as$key=>$val){ ?>
182
-                          <?php if($count==$i){
179
+                    <?php $currency = Common_model::$global_config['system_config']['base_currency']; ?>
180
+                    <?php $count = ceil(sizeof($details) / 2); $i = 0; $class = "tleft"; ?>
181
+                    <?php foreach ($details as$key=>$val) { ?>
182
+                          <?php if ($count == $i) {
183 183
 							  echo '</div><div style="width:50%;float:left;">';
184
-							  $class="tright";
184
+							  $class = "tright";
185 185
 						  } ?>
186 186
                           <div class="col-md-12">
187 187
                             <div class="<?=$class?>" href='#'>
188
-                            <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>
189
-                            <?php if(method_exists($this->common,$val['field_type'])){
190
-								$option_array =  $this->common->$val['field_type'](); 
188
+                            <label class="col-md-5 no-padding"><?php echo $val['display_name']; ?> * </label>
189
+                            <?php if (method_exists($this->common, $val['field_type'])) {
190
+								$option_array = $this->common->$val['field_type'](); 
191 191
 								$drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';
192
-									  foreach($option_array as $option_key=>$option_val){
193
-										$selected = ($val['value'] == $option_key)? "selected='selected'":"";
192
+									  foreach ($option_array as $option_key=>$option_val) {
193
+										$selected = ($val['value'] == $option_key) ? "selected='selected'" : "";
194 194
 										$drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';
195 195
 									  }
196 196
 								$drpstr .= '</select>';
197 197
 								echo $drpstr;
198 198
 								unset($drpstr);
199
-							} else{ ?>
200
-								<input name="<?php echo $val['name'] ?>" value='<?php echo isset($val['value'])?$val['value']:''; ?>' size="20" maxlength="100" class="col-md-5 form-control" type="text">
199
+							} else { ?>
200
+								<input name="<?php echo $val['name'] ?>" value='<?php echo isset($val['value']) ? $val['value'] : ''; ?>' size="20" maxlength="100" class="col-md-5 form-control" type="text">
201 201
 						<?php }?>
202
-                              <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>
202
+                              <span class="demo"><?php echo str_replace('smtp', "SMTP", $val['comment']); ?></span>
203 203
 
204 204
                             </div>
205 205
                           </div>  
206 206
 
207
-                      <?php $i++;?>
207
+                      <?php $i++; ?>
208 208
                     <?php }?>
209 209
                   </div>
210 210
               </fieldset>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/did/controllers/did.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@
 block discarded – undo
173 173
 	  if($accountinfo['type']==1){
174 174
 		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
175 175
 	  }else{
176
-    	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
176
+		  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
177 177
 	  }
178 178
 	  $where = array('id' => $id);
179 179
 	  $this->db->where($where);
Please login to merge, or discard this patch.
Spacing   +218 added lines, -218 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
 		$this->load->library('csvreader');
36 36
 
37 37
 		if ($this->session->userdata('user_login') == FALSE)
38
-			redirect(base_url() . '/astpp/login');
38
+			redirect(base_url().'/astpp/login');
39 39
 	}
40 40
 
41 41
 	function did_add() {
42 42
 		$data['page_title'] = 'Create DID';
43 43
 		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields(), '');
44 44
 		$data['country_id'] = $this->common->get_field_name('id', 'countrycode', array('country' => Common_model::$global_config['system_config']['country']));
45
-		if (!$data['country_id']) {
45
+		if ( ! $data['country_id']) {
46 46
 			$data['country_id'] = 1;
47 47
 		}
48 48
 		$this->load->view('view_did_add_edit', $data);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 			$data['country_id'] = Common_model::$global_config['system_config']['country'];
65 65
 		}
66 66
 		/*         * ************************************************* */
67
-		if (!$data['country_id']) {
67
+		if ( ! $data['country_id']) {
68 68
 			$data['country_id'] = 1;
69 69
 		}
70 70
 		$edit_data['setup'] = $this->common_model->to_calculate_currency($edit_data['setup'], '', '', false, false);
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 
84 84
 	function did_save() {
85 85
 		$add_array = $this->input->post();
86
-		$parent_id =isset($add_array['parent_id']) && $add_array['parent_id'] >0 ? $add_array['parent_id'] : '';
87
-		$accountid =isset($add_array['accountid']) && $add_array['accountid'] > 0 ? $add_array['accountid'] : '';
88
-		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields($add_array['id'],$parent_id,$accountid), $add_array);
86
+		$parent_id = isset($add_array['parent_id']) && $add_array['parent_id'] > 0 ? $add_array['parent_id'] : '';
87
+		$accountid = isset($add_array['accountid']) && $add_array['accountid'] > 0 ? $add_array['accountid'] : '';
88
+		$data['form'] = $this->form->build_form($this->did_form->get_dids_form_fields($add_array['id'], $parent_id, $accountid), $add_array);
89 89
 		if ($add_array['id'] != '') {
90 90
 			$data['page_title'] = 'Edit DID';
91 91
 			if ($this->form_validation->run() == FALSE) {
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 			} else {
96 96
 				$number = $add_array['number'];
97 97
 				unset($add_array['number']);
98
-				$add_array['accountid']=isset($add_array['accountid']) ?$add_array['accountid'] : 0;
98
+				$add_array['accountid'] = isset($add_array['accountid']) ? $add_array['accountid'] : 0;
99 99
 				$add_array['setup'] = $this->common_model->add_calculate_currency($add_array['setup'], '', '', false, false);
100 100
 				$add_array['monthlycost'] = $this->common_model->add_calculate_currency($add_array['monthlycost'], '', '', false, false);
101 101
 				$add_array['connectcost'] = $this->common_model->add_calculate_currency($add_array['connectcost'], '', '', false, false);
102 102
 				$add_array['cost'] = $this->common_model->add_calculate_currency($add_array['cost'], '', '', false, false);
103 103
 				$this->did_model->edit_did($add_array, $add_array['id'], $number);
104
-				echo json_encode(array("SUCCESS" => $number . " DID Updated Successfully!"));
104
+				echo json_encode(array("SUCCESS" => $number." DID Updated Successfully!"));
105 105
 				exit;
106 106
 			}
107 107
 		} else {
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 				$add_array['monthlycost'] = $this->common_model->add_calculate_currency($add_array['monthlycost'], '', '', false, false);
121 121
 				$add_array['connectcost'] = $this->common_model->add_calculate_currency($add_array['connectcost'], '', '', false, false);
122 122
 				$add_array['cost'] = $this->common_model->add_calculate_currency($add_array['cost'], '', '', false, false);
123
-				$add_array['accountid']=isset($add_array['accountid'])?$add_array['accountid'] : 0;
123
+				$add_array['accountid'] = isset($add_array['accountid']) ? $add_array['accountid'] : 0;
124 124
 				$this->did_model->add_did($add_array);
125
-				echo json_encode(array("SUCCESS" => $add_array["number"] . " DID Added Successfully!"));
125
+				echo json_encode(array("SUCCESS" => $add_array["number"]." DID Added Successfully!"));
126 126
 				exit;
127 127
 				exit;
128 128
 			}
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	function did_remove($id) {
133 133
 		$this->did_model->remove_did($id);
134 134
 		$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully!');
135
-		redirect(base_url() . 'did/did_list/');
135
+		redirect(base_url().'did/did_list/');
136 136
 	}
137 137
 
138 138
 	/*
@@ -141,54 +141,54 @@  discard block
 block discarded – undo
141 141
      */
142 142
 
143 143
 	function did_list_release($id) {
144
-	 $accountinfo=$this->session->userdata('accountinfo'); 
145
-	 $this->db->where('id',$id);
144
+	 $accountinfo = $this->session->userdata('accountinfo'); 
145
+	 $this->db->where('id', $id);
146 146
 	 $this->db->select('parent_id,accountid,number');
147
-	 $did_info=(array)$this->db->get('dids')->first_row();
148
-	 if($did_info['parent_id'] > 0){
149
-	$str=$this->common->get_parent_info($did_info['parent_id'],$accountinfo['id']);
150
-	$str=rtrim($str,",");
151
-	$account_result=(array)$this->db->get_where('accounts',"id IN (".$str.")")->result_array();
152
-	foreach($account_result as $key=>$acc_row){
153
-	   $acc_row['did_number']=$did_info['number'];
147
+	 $did_info = (array)$this->db->get('dids')->first_row();
148
+	 if ($did_info['parent_id'] > 0) {
149
+	$str = $this->common->get_parent_info($did_info['parent_id'], $accountinfo['id']);
150
+	$str = rtrim($str, ",");
151
+	$account_result = (array)$this->db->get_where('accounts', "id IN (".$str.")")->result_array();
152
+	foreach ($account_result as $key=>$acc_row) {
153
+	   $acc_row['did_number'] = $did_info['number'];
154 154
 	   $this->common->mail_to_users('email_remove_did', $acc_row);
155 155
 	}
156 156
 	 }
157
-	 if($accountinfo['type'] == -1){
158
-	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
157
+	 if ($accountinfo['type'] == -1) {
158
+	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"), 'call_type'=>'-1', 'extensions'=>'');
159 159
 	  $where = array('id' => $id);
160 160
 	  $this->db->where($where);
161 161
 	  $this->db->update('dids', $update_array);
162
-	  if($did_info['parent_id'] > 0){
163
-		$this->db->where('note',$did_info['number']);
162
+	  if ($did_info['parent_id'] > 0) {
163
+		$this->db->where('note', $did_info['number']);
164 164
 		$this->db->delete("reseller_pricing");
165 165
 	  }
166
-	  }else{
167
-	  $reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
168
-	  $reseller_ids=rtrim($reseller_ids,",");
169
-	  $where="parent_id IN ($reseller_ids)";
170
-	  $this->db->where('note',$did_info['number']);
171
-	  $this->db->delete('reseller_pricing',$where);  
166
+	  } else {
167
+	  $reseller_ids = $this->common->get_subreseller_info($accountinfo['id']);
168
+	  $reseller_ids = rtrim($reseller_ids, ",");
169
+	  $where = "parent_id IN ($reseller_ids)";
170
+	  $this->db->where('note', $did_info['number']);
171
+	  $this->db->delete('reseller_pricing', $where);  
172 172
 	  }
173
-	  if($accountinfo['type']==1){
174
-		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
175
-	  }else{
176
-    	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
173
+	  if ($accountinfo['type'] == 1) {
174
+		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"), 'call_type'=>'-1', 'extensions'=>'');
175
+	  } else {
176
+    	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00", "last_modified_date"=>gmdate("Y-m-d H:i:s"), 'call_type'=>'-1', 'extensions'=>'');
177 177
 	  }
178 178
 	  $where = array('id' => $id);
179 179
 	  $this->db->where($where);
180 180
 	  $this->db->update('dids', $update_array);
181
-	  $accountid=$did_info['accountid'] > 0 ? $did_info['accountid']:0;
182
-	  if($did_info['accountid'] > 0 ){
183
-	   $email_user_id=$did_info['accountid'];
184
-	  }elseif($did_info['parent_id'] > 0){
185
-	$email_user_id=$did_info['parent_id'];
181
+	  $accountid = $did_info['accountid'] > 0 ? $did_info['accountid'] : 0;
182
+	  if ($did_info['accountid'] > 0) {
183
+	   $email_user_id = $did_info['accountid'];
184
+	  }elseif ($did_info['parent_id'] > 0) {
185
+	$email_user_id = $did_info['parent_id'];
186 186
 	  }
187
-	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$email_user_id))->first_row();
187
+	  $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$email_user_id))->first_row();
188 188
 	  $accountinfo['did_number'] = $did_info['number'];
189 189
 	  $this->common->mail_to_users('email_remove_did', $accountinfo);
190 190
 	  $this->session->set_flashdata('astpp_errormsg', 'DID Released Successfully!');
191
-	  redirect(base_url() . 'did/did_list/');
191
+	  redirect(base_url().'did/did_list/');
192 192
 	}
193 193
 
194 194
 	function did_list() {
@@ -204,33 +204,33 @@  discard block
 block discarded – undo
204 204
 		}
205 205
          
206 206
 		if ($this->session->userdata['userlevel_logintype'] == '1') {
207
-		$drp_list=array();
207
+		$drp_list = array();
208 208
 		$accountinfo = $this->session->userdata('accountinfo');
209
-		if($accountinfo['reseller_id'] > 0){
210
-		  $dids_array=$this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
211
-			}else{
209
+		if ($accountinfo['reseller_id'] > 0) {
210
+		  $dids_array = $this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
211
+			} else {
212 212
 			  $this->db->select('id,monthlycost,setup,number');
213
-			  $this->db->where('accountid',0);
214
-			  $this->db->where('parent_id',0);
215
-			  $dids_array=$this->db->get('dids')->result_array();
213
+			  $this->db->where('accountid', 0);
214
+			  $this->db->where('parent_id', 0);
215
+			  $dids_array = $this->db->get('dids')->result_array();
216 216
 			}
217
-			if(!empty($dids_array)){
217
+			if ( ! empty($dids_array)) {
218 218
 		foreach ($dids_array as $drp_value) {
219
-			if (!empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
219
+			if ( ! empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
220 220
 			$did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'], '', '', true, false);
221 221
 			} else {
222 222
 			$did_cost = 0;
223 223
 			}
224
-			if (!empty($drp_value['setup']) && $drp_value['setup'] != 0) {
224
+			if ( ! empty($drp_value['setup']) && $drp_value['setup'] != 0) {
225 225
 			$did_setup = $this->common_model->to_calculate_currency($drp_value['setup'], '', '', true, false);
226 226
 			} else {
227 227
 			$did_setup = 0;
228 228
 			}
229
-			$drp_list[$drp_value['id']] = $drp_value['number'] . ' ( Setup : ' . $did_setup . ')' . '( Monthly : ' . $did_cost . ' )';
229
+			$drp_list[$drp_value['id']] = $drp_value['number'].' ( Setup : '.$did_setup.')'.'( Monthly : '.$did_cost.' )';
230 230
 			/*                 * ********************************************************************************************* */
231 231
 		}
232 232
 		}
233
-	  $data['didlist'] = form_dropdown_all(array("name"=>"free_did_list","id"=>"free_did_list","class"=>"did_dropdown"), $drp_list, '');
233
+	  $data['didlist'] = form_dropdown_all(array("name"=>"free_did_list", "id"=>"free_did_list", "class"=>"did_dropdown"), $drp_list, '');
234 234
 		}
235 235
 		if ($this->session->userdata['userlevel_logintype'] == '1') {
236 236
 			$data['grid_fields'] = $this->did_form->build_did_list_for_reseller_login();
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 			$this->session->set_userdata('did_list_search', $action);
271 271
 		}
272 272
 		if (@$ajax_search != 1) {
273
-			redirect(base_url() . 'did/did_list/');
273
+			redirect(base_url().'did/did_list/');
274 274
 		}
275 275
 	}
276 276
 
@@ -318,10 +318,10 @@  discard block
 block discarded – undo
318 318
  */
319 319
 	function customer_did($accountid, $accounttype) {
320 320
 		$json_data = array();
321
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_did'); 
322
-		$account_arr=(array)$this->db->get_where('accounts',array("id"=>$accountid))->first_row();
321
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_did'); 
322
+		$account_arr = (array)$this->db->get_where('accounts', array("id"=>$accountid))->first_row();
323 323
 		$field_name = $accounttype == "reseller" ? "parent_id" : 'accountid';
324
-	$like_str=!empty($instant_search) ? 
324
+	$like_str = ! empty($instant_search) ? 
325 325
 					"(a.note like '%$instant_search%'
326 326
 					OR  a.init_inc like '%$instant_search%'
327 327
 					OR  a.inc like '%$instant_search%'
@@ -330,32 +330,32 @@  discard block
 block discarded – undo
330 330
 					OR  a.setup like '%$instant_search%'
331 331
 					OR  a.monthlycost like '%$instant_search%'
332 332
 					OR  a.connectcost like '%$instant_search%'
333
-					    )" :null;
333
+					    )" : null;
334 334
 		if ($account_arr['reseller_id'] != 0) {
335
-		if(!empty($like_str))
335
+		if ( ! empty($like_str))
336 336
 			$this->db->where($like_str);
337
-			if($accounttype=='reseller'){
338
-		  $this->db->where('a.note','b.number',false);
339
-		  $this->db->where('a.reseller_id',$account_arr['id']);
340
-		  $this->db->where('a.parent_id',$account_arr['reseller_id']);
337
+			if ($accounttype == 'reseller') {
338
+		  $this->db->where('a.note', 'b.number', false);
339
+		  $this->db->where('a.reseller_id', $account_arr['id']);
340
+		  $this->db->where('a.parent_id', $account_arr['reseller_id']);
341 341
 		  $this->db->select('count(a.id) as count');
342
-		  $count_result=(array)$this->db->get('reseller_pricing as a,dids as b')->first_row();
342
+		  $count_result = (array)$this->db->get('reseller_pricing as a,dids as b')->first_row();
343 343
 		  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
344 344
 		  $json_data = $paging_data["json_paging"];
345
-		  $this->db->where('a.note','b.number',false);
346
-		  $this->db->where('a.reseller_id',$account_arr['id']);
347
-		  $this->db->where('a.parent_id',$account_arr['reseller_id']);
345
+		  $this->db->where('a.note', 'b.number', false);
346
+		  $this->db->where('a.reseller_id', $account_arr['id']);
347
+		  $this->db->where('a.parent_id', $account_arr['reseller_id']);
348 348
 		  $this->db->select('a . * , b.id, a.reseller_id AS accountid,a.note as number,b.country_id as country_id');
349
-		  $this->db->limit($paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
350
-		  $query=$this->db->get('reseller_pricing as a,dids as b');
351
-		  }else{
352
-		  $count_result=(array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
349
+		  $this->db->limit($paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
350
+		  $query = $this->db->get('reseller_pricing as a,dids as b');
351
+		  } else {
352
+		  $count_result = (array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
353 353
 			  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
354 354
 		  $json_data = $paging_data["json_paging"];
355
-			  $query=$this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
355
+			  $query = $this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
356 356
 		  }
357
-		}else{
358
-						$like_str=!empty($instant_search) ? 
357
+		} else {
358
+						$like_str = ! empty($instant_search) ? 
359 359
 												"(dids.number like '%$instant_search%'
360 360
                                                     OR dids.inc like '%$instant_search%'
361 361
                                                     OR dids.cost like '%$instant_search%'
@@ -363,14 +363,14 @@  discard block
 block discarded – undo
363 363
                                                     OR dids.setup like '%$instant_search%'
364 364
                                                     OR dids.monthlycost like '%$instant_search%'
365 365
                                                     OR dids.connectcost like '%$instant_search%'
366
-                                                        )" :null;
367
-			if(!empty($like_str))
366
+                                                        )" : null;
367
+			if ( ! empty($like_str))
368 368
 			$this->db->where($like_str);
369 369
 			$where = array($field_name => $accountid);
370 370
 			$count_all = $this->db_model->countQuery("*", "dids", $where);
371 371
 			$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
372 372
 			$json_data = $paging_data["json_paging"];
373
-			if(!empty($like_str))
373
+			if ( ! empty($like_str))
374 374
 			$this->db->where($like_str);
375 375
 			$query = $this->db_model->select("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
376 376
 		}
@@ -382,9 +382,9 @@  discard block
 block discarded – undo
382 382
 		$ids = $this->input->post("selected_ids", true);
383 383
 		$where = "id IN ($ids)";
384 384
 		$this->db->where($where);
385
-		$this->db->select("group_concat(concat('''',number,'''')) as number",false);
386
-		$dids_result=(array)$this->db->get('dids')->first_row();
387
-		$notes_where="note IN (".$dids_result['number'].")";
385
+		$this->db->select("group_concat(concat('''',number,'''')) as number", false);
386
+		$dids_result = (array)$this->db->get('dids')->first_row();
387
+		$notes_where = "note IN (".$dids_result['number'].")";
388 388
 		$this->db->where($notes_where);
389 389
 		$this->db->delete('reseller_pricing');
390 390
 		$this->db->where($where);
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 	 */
399 399
 	function did_reseller_edit($action = false, $id = false) {
400 400
 		$data['page_title'] = 'Edit DID ';
401
-		$accountinfo=$this->session->userdata('accountinfo');
401
+		$accountinfo = $this->session->userdata('accountinfo');
402 402
 		if ($action == 'edit') {
403 403
 			if (($this->input->post())) {
404 404
 				$post = $this->input->post();
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 					$accountinfo = $this->did_model->get_account($accountinfo['number']);
428 428
 					$reseller_did = $this->db_model->getSelect("*", "reseller_pricing", array('id' => $id));
429 429
 					$reseller_didinfo = (array)$reseller_did->first_row();
430
-					if (!empty($reseller_didinfo)) {
430
+					if ( ! empty($reseller_didinfo)) {
431 431
 						$reseller_didinfo['setup'] = $this->common_model->to_calculate_currency($reseller_didinfo['setup'], '', '', true, false);
432 432
 						$reseller_didinfo['monthlycost'] = $this->common_model->to_calculate_currency($reseller_didinfo['monthlycost'], '', '', true, false);
433 433
 						$reseller_didinfo['connectcost'] = $this->common_model->to_calculate_currency($reseller_didinfo['connectcost'], '', '', true, false);
@@ -441,43 +441,43 @@  discard block
 block discarded – undo
441 441
 			}
442 442
 		}
443 443
 		if ($action == 'delete') {
444
-				$this->db->where('id',$id);
444
+				$this->db->where('id', $id);
445 445
 		$this->db->select('note');
446
-			$reseller_pricing=(array)$this->db->get('reseller_pricing')->first_row();
447
-			$did_number=$reseller_pricing['note'];
448
-			$did_info=(array)$this->db->get_where('dids',array('number'=>$did_number))->first_row();
449
-			$query="select count(id) as count from reseller_pricing where id >= (select id from reseller_pricing where note =$did_number AND parent_id =".$accountinfo['reseller_id']." AND reseller_id =".$accountinfo['id'].") AND note= $did_number order by id desc";
450
-		$result=(array)$this->db->query($query)->first_row();
451
-		if($result['count'] > 0){
452
-		$str=$this->common->get_parent_info($did_info['parent_id'],$accountinfo['id']);
453
-		$str=rtrim($str,",");
454
-		$account_result=(array)$this->db->get_where('accounts',"id IN (".$str.")")->result_array();
455
-		foreach($account_result as $key=>$acc_row){
456
-		  $acc_row['did_number']=$did_info['number'];
446
+			$reseller_pricing = (array)$this->db->get('reseller_pricing')->first_row();
447
+			$did_number = $reseller_pricing['note'];
448
+			$did_info = (array)$this->db->get_where('dids', array('number'=>$did_number))->first_row();
449
+			$query = "select count(id) as count from reseller_pricing where id >= (select id from reseller_pricing where note =$did_number AND parent_id =".$accountinfo['reseller_id']." AND reseller_id =".$accountinfo['id'].") AND note= $did_number order by id desc";
450
+		$result = (array)$this->db->query($query)->first_row();
451
+		if ($result['count'] > 0) {
452
+		$str = $this->common->get_parent_info($did_info['parent_id'], $accountinfo['id']);
453
+		$str = rtrim($str, ",");
454
+		$account_result = (array)$this->db->get_where('accounts', "id IN (".$str.")")->result_array();
455
+		foreach ($account_result as $key=>$acc_row) {
456
+		  $acc_row['did_number'] = $did_info['number'];
457 457
 		  $this->common->mail_to_users('email_remove_did', $acc_row);
458 458
 		}
459
-			$reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
460
-		$reseller_ids=rtrim($reseller_ids,",");
461
-		$where="parent_id IN ($reseller_ids)";
462
-		$this->db->where('note',$did_info['number']);
463
-		$this->db->delete('reseller_pricing',$where);  
464
-		$this->db->where('reseller_id',$accountinfo['id']);
465
-		$this->db->where('note',$did_info['number']);
459
+			$reseller_ids = $this->common->get_subreseller_info($accountinfo['id']);
460
+		$reseller_ids = rtrim($reseller_ids, ",");
461
+		$where = "parent_id IN ($reseller_ids)";
462
+		$this->db->where('note', $did_info['number']);
463
+		$this->db->delete('reseller_pricing', $where);  
464
+		$this->db->where('reseller_id', $accountinfo['id']);
465
+		$this->db->where('note', $did_info['number']);
466 466
 		$this->db->delete('reseller_pricing');  
467 467
 		}
468
-		$this->db->where('number',$did_number);
468
+		$this->db->where('number', $did_number);
469 469
 		$this->db->select('accountid');
470
-		$did_array=(array)$this->db->get('dids')->first_row();
471
-		if($did_array['accountid'] > 0){
472
-		 $customer_info=(array)$this->db->get_where('accounts',array('id'=>$did_array['accountid']))->first_row();
473
-		 $customer_info['did_number']=$did_number;
470
+		$did_array = (array)$this->db->get('dids')->first_row();
471
+		if ($did_array['accountid'] > 0) {
472
+		 $customer_info = (array)$this->db->get_where('accounts', array('id'=>$did_array['accountid']))->first_row();
473
+		 $customer_info['did_number'] = $did_number;
474 474
 		 $this->common->mail_to_users('email_remove_did', $customer_info);
475 475
 		}
476
-		$did_array=array("accountid"=>0,"parent_id"=>$accountinfo['reseller_id'], "assign_date" => "0000-00-00 00:00:00", "charge_upto" => "0000-00-00 00:00:00");
477
-		$this->db->where('number',$did_number);
478
-		$this->db->update('dids',$did_array);
476
+		$did_array = array("accountid"=>0, "parent_id"=>$accountinfo['reseller_id'], "assign_date" => "0000-00-00 00:00:00", "charge_upto" => "0000-00-00 00:00:00");
477
+		$this->db->where('number', $did_number);
478
+		$this->db->update('dids', $did_array);
479 479
 			$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully!');
480
-			redirect(base_url() . 'did/did_list/');
480
+			redirect(base_url().'did/did_list/');
481 481
 		}
482 482
 	}
483 483
 
@@ -486,37 +486,37 @@  discard block
 block discarded – undo
486 486
 		$accountinfo = $this->session->userdata('accountinfo');
487 487
 		$where = array('id' => $accountinfo['id']);
488 488
 		$account = $this->db_model->getSelect("*", "accounts", $where);
489
-		$currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$accountinfo['currency_id']));
490
-		$accountinfo= (array)$account->first_row();
489
+		$currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$accountinfo['currency_id']));
490
+		$accountinfo = (array)$account->first_row();
491 491
 		if (($this->input->post())) {
492 492
 			$post = $this->input->post();
493 493
 			if (isset($post['free_did_list']) && $post['free_did_list'] != '') {
494 494
 				// For deduction of admin price to reseller
495 495
 				$didinfo = $this->did_model->get_did_by_number($post['free_did_list']);
496
-				if($accountinfo['reseller_id'] > 0 ){
497
-				$reseller_pricing_query = $this->db_model->getSelect("call_type,setup,extensions,monthlycost,connectcost,includedseconds,cost,inc", "reseller_pricing", array("note" => $didinfo['number'],'reseller_id'=>$accountinfo['reseller_id']));
496
+				if ($accountinfo['reseller_id'] > 0) {
497
+				$reseller_pricing_query = $this->db_model->getSelect("call_type,setup,extensions,monthlycost,connectcost,includedseconds,cost,inc", "reseller_pricing", array("note" => $didinfo['number'], 'reseller_id'=>$accountinfo['reseller_id']));
498 498
 				   $reseller_pricing_result = (array)$reseller_pricing_query->first_row();
499
-				   $didinfo['call_type']=$reseller_pricing_result['call_type'];
500
-				   $didinfo['extensions']=$reseller_pricing_result['extensions'];
501
-				   $didinfo['setup']=$reseller_pricing_result['setup'];
502
-				   $didinfo['monthlycost']=$reseller_pricing_result['monthlycost'];
503
-				   $didinfo['connectcost']=$reseller_pricing_result['connectcost'];
504
-				   $didinfo['includedseconds']=$reseller_pricing_result['includedseconds'];
505
-				   $didinfo['cost']=$reseller_pricing_result['cost'];
506
-				   $didinfo['inc']=$reseller_pricing_result['inc'];
499
+				   $didinfo['call_type'] = $reseller_pricing_result['call_type'];
500
+				   $didinfo['extensions'] = $reseller_pricing_result['extensions'];
501
+				   $didinfo['setup'] = $reseller_pricing_result['setup'];
502
+				   $didinfo['monthlycost'] = $reseller_pricing_result['monthlycost'];
503
+				   $didinfo['connectcost'] = $reseller_pricing_result['connectcost'];
504
+				   $didinfo['includedseconds'] = $reseller_pricing_result['includedseconds'];
505
+				   $didinfo['cost'] = $reseller_pricing_result['cost'];
506
+				   $didinfo['inc'] = $reseller_pricing_result['inc'];
507 507
 				}
508 508
 				$available_bal = $this->db_model->get_available_bal($accountinfo);
509 509
 				 $accountinfo['did_number'] = $didinfo['number'];
510 510
 		 $accountinfo['did_country_id'] = $didinfo['country_id'];
511
-		 $accountinfo['did_setup'] = $this->common_model->calculate_currency($didinfo['setup'],'',$currency_name,true,true);
512
-		 $accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($didinfo['monthlycost'],'',$currency_name,true,true);
511
+		 $accountinfo['did_setup'] = $this->common_model->calculate_currency($didinfo['setup'], '', $currency_name, true, true);
512
+		 $accountinfo['did_monthlycost'] = $this->common_model->calculate_currency($didinfo['monthlycost'], '', $currency_name, true, true);
513 513
 		 $accountinfo['did_maxchannels'] = $didinfo['maxchannels'];
514 514
 				if ($available_bal >= $didinfo["setup"]) {
515 515
 					$available_bal = $this->db_model->update_balance($didinfo['setup'], $accountinfo['id'], "debit");
516
-					$this->db_model->update("dids", array('parent_id' => $accountinfo['id'],"assign_date"=>gmdate("Y-m-d H:i:s")), array("id" => $didinfo['id']));
516
+					$this->db_model->update("dids", array('parent_id' => $accountinfo['id'], "assign_date"=>gmdate("Y-m-d H:i:s")), array("id" => $didinfo['id']));
517 517
 					$this->did_model->insert_reseller_pricing($accountinfo, $didinfo);
518
-					$this->common->add_invoice_details($accountinfo,"DIDCHRG",$didinfo['setup'],$didinfo['number']);
519
-					$this->common->mail_to_users('email_add_did', $accountinfo,"",$didinfo['number']);
518
+					$this->common->add_invoice_details($accountinfo, "DIDCHRG", $didinfo['setup'], $didinfo['number']);
519
+					$this->common->mail_to_users('email_add_did', $accountinfo, "", $didinfo['number']);
520 520
 					$this->session->set_flashdata('astpp_errormsg', 'DID Purchased Successfully.');
521 521
 				} else {
522 522
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 				$this->session->set_flashdata('astpp_notification', 'Please Select DID.');
526 526
 			}
527 527
 		}
528
-		redirect(base_url() . 'did/did_list/');
528
+		redirect(base_url().'did/did_list/');
529 529
 		exit;
530 530
 	}
531 531
 
@@ -547,8 +547,8 @@  discard block
 block discarded – undo
547 547
 
548 548
 	function did_download_sample_file($file_name) {
549 549
 		$this->load->helper('download');
550
-		$full_path = base_url() . "assets/Rates_File/" . $file_name . ".csv";
551
-		$arrContextOptions=array(
550
+		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
551
+		$arrContextOptions = array(
552 552
 			"ssl"=>array(
553 553
 			"verify_peer"=>false,
554 554
 			"verify_peer_name"=>false,
@@ -567,28 +567,28 @@  discard block
 block discarded – undo
567 567
 		$this->session->set_userdata('import_did_rate_csv', "");
568 568
 		$error_data = $this->session->userdata('import_did_csv_error');
569 569
 		$full_path = $this->config->item('rates-file-path');
570
-		if (file_exists($full_path . $error_data) && $error_data != "") {
571
-			unlink($full_path . $error_data);
570
+		if (file_exists($full_path.$error_data) && $error_data != "") {
571
+			unlink($full_path.$error_data);
572 572
 			$this->session->set_userdata('import_did_csv_error', "");
573 573
 		}
574
-		$accountinfo=$this->session->userdata('accountinfo');
575
-		$this->db->where('id',$accountinfo['currency_id']);
574
+		$accountinfo = $this->session->userdata('accountinfo');
575
+		$this->db->where('id', $accountinfo['currency_id']);
576 576
 		$this->db->select('currency');
577
-		$currency_info=(array)$this->db->get('currency')->first_row();
578
-		$data['fields']="DID,Country,Account,Per Minute Cost(".$currency_info['currency']."),Initial Increment,Increment,Setup Fee(".$currency_info['currency']."),Monthly Fee(".$currency_info['currency']."),Call Type,Destination,Status";
577
+		$currency_info = (array)$this->db->get('currency')->first_row();
578
+		$data['fields'] = "DID,Country,Account,Per Minute Cost(".$currency_info['currency']."),Initial Increment,Increment,Setup Fee(".$currency_info['currency']."),Monthly Fee(".$currency_info['currency']."),Call Type,Destination,Status";
579 579
 		$this->load->view('view_import_did', $data);
580 580
 	}
581 581
 
582 582
 	function did_preview_file() {
583 583
 		$data['page_title'] = 'Import DIDs';
584 584
 		$config_did_array = $this->config->item('DID-rates-field');
585
-		$accountinfo=$this->session->userdata('accountinfo');
586
-		$this->db->where('id',$accountinfo['currency_id']);
585
+		$accountinfo = $this->session->userdata('accountinfo');
586
+		$this->db->where('id', $accountinfo['currency_id']);
587 587
 		$this->db->select('currency');
588
-		$currency_info=(array)$this->db->get('currency')->first_row();
589
-		foreach($config_did_array as $key=>$value){
588
+		$currency_info = (array)$this->db->get('currency')->first_row();
589
+		foreach ($config_did_array as $key=>$value) {
590 590
 		 $key = str_replace('CURRENCY', $currency_info['currency'], $key);
591
-		 $did_fields_array[$key]=$value;
591
+		 $did_fields_array[$key] = $value;
592 592
 		}
593 593
 		$check_header = $this->input->post('check_header', true);
594 594
 		$invalid_flag = false;
@@ -599,10 +599,10 @@  discard block
 block discarded – undo
599 599
 				if ($error == 0) {
600 600
 					$uploadedFile = $_FILES["didimport"]["tmp_name"];
601 601
 					$full_path = $this->config->item('rates-file-path');
602
-					$actual_file_name = "ASTPP-DIDs-" . date("Y-m-d H:i:s") . "." . $ext;
603
-					if (move_uploaded_file($uploadedFile, $full_path . $actual_file_name)) {
602
+					$actual_file_name = "ASTPP-DIDs-".date("Y-m-d H:i:s").".".$ext;
603
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
604 604
 						$data['page_title'] = 'Import DIDs Preview';
605
-						$data['csv_tmp_data'] = $this->csvreader->parse_file($full_path . $actual_file_name, $did_fields_array, $check_header);
605
+						$data['csv_tmp_data'] = $this->csvreader->parse_file($full_path.$actual_file_name, $did_fields_array, $check_header);
606 606
 						$data['provider_id'] = $_POST['provider_id'];
607 607
 						$data['check_header'] = $check_header;
608 608
 						$this->session->set_userdata('import_did_rate_csv', $actual_file_name);
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
 		if ($invalid_flag) {
620 620
 			$str = '';
621 621
 			if (empty($_FILES['didimport']['name'])) {
622
-				$str.= '<br/>Please Select  File.';
622
+				$str .= '<br/>Please Select  File.';
623 623
 			}
624 624
 			$data['error'] = $str;
625 625
 		}
@@ -630,32 +630,32 @@  discard block
 block discarded – undo
630 630
 		$new_final_arr = array();
631 631
 		$invalid_array = array();
632 632
 		$new_final_arr_key = $this->config->item('DID-rates-field');
633
-		$accountinfo=$this->session->userdata('accountinfo');
634
-		$reseller_id = $accountinfo['type']==1 ? $accountinfo['id']: 0;
633
+		$accountinfo = $this->session->userdata('accountinfo');
634
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
635 635
 	
636 636
 		$full_path = $this->config->item('rates-file-path');
637 637
 		$did_file_name = $this->session->userdata('import_did_rate_csv');
638
-		$csv_tmp_data = $this->csvreader->parse_file($full_path . $did_file_name, $new_final_arr_key, $check_header);
638
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$did_file_name, $new_final_arr_key, $check_header);
639 639
 		$flag = false;
640 640
 		$i = 0;
641 641
 		$number_arr = array();
642
-		$reseller_array=array();
643
-		$final_reseller_array=array();
642
+		$reseller_array = array();
643
+		$final_reseller_array = array();
644 644
 		foreach ($csv_tmp_data as $key => $csv_data) {
645 645
         
646 646
 			if (isset($csv_data['number']) && $csv_data['number'] != '' && $i != 0) {
647 647
 				$str = null;
648
-				if(isset($csv_data['call_type'])){
649
-					if(strtolower($csv_data['call_type']) == 'sip-did'){
648
+				if (isset($csv_data['call_type'])) {
649
+					if (strtolower($csv_data['call_type']) == 'sip-did') {
650 650
 						$call_type = '3';
651
-					} else if(strtolower($csv_data['call_type']) == 'did-local'){
651
+					} else if (strtolower($csv_data['call_type']) == 'did-local') {
652 652
 						$call_type = '1';
653
-					} else if(strtolower($csv_data['call_type']) == 'other'){
653
+					} else if (strtolower($csv_data['call_type']) == 'other') {
654 654
 						$call_type = '2';
655 655
 					} else {
656 656
 						$call_type = '0';
657 657
 					}
658
-				} else{
658
+				} else {
659 659
 					$call_type = '0';
660 660
 				}
661 661
 				$csv_data['accountid'] = isset($csv_data['accountid']) ? $csv_data['accountid'] : 0;
@@ -664,77 +664,77 @@  discard block
 block discarded – undo
664 664
 				$csv_data['call_type'] = $call_type;
665 665
 				$csv_data['extensions'] = isset($csv_data['extensions']) ? $csv_data['extensions'] : '';
666 666
 				$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
667
-				$csv_data['cost'] = !empty($csv_data['cost']) && is_numeric($csv_data['cost']) && $csv_data['cost'] ? $csv_data['cost'] : 0;
668
-				$csv_data['setup'] = !empty($csv_data['setup']) && is_numeric($csv_data['setup']) && $csv_data['setup'] > 0 ? $csv_data['setup'] : 0;
669
-				$csv_data['monthlycost'] = !empty($csv_data['monthlycost']) && is_numeric($csv_data['monthlycost']) && $csv_data['monthlycost'] > 0 ? $csv_data['monthlycost'] : 0;
670
-				$csv_data['connectcost'] = !empty($csv_data['connectcost']) && is_numeric($csv_data['connectcost']) && $csv_data['connectcost'] > 0 ? $csv_data['connectcost'] : 0;
667
+				$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) && $csv_data['cost'] ? $csv_data['cost'] : 0;
668
+				$csv_data['setup'] = ! empty($csv_data['setup']) && is_numeric($csv_data['setup']) && $csv_data['setup'] > 0 ? $csv_data['setup'] : 0;
669
+				$csv_data['monthlycost'] = ! empty($csv_data['monthlycost']) && is_numeric($csv_data['monthlycost']) && $csv_data['monthlycost'] > 0 ? $csv_data['monthlycost'] : 0;
670
+				$csv_data['connectcost'] = ! empty($csv_data['connectcost']) && is_numeric($csv_data['connectcost']) && $csv_data['connectcost'] > 0 ? $csv_data['connectcost'] : 0;
671 671
 				$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
672 672
 				$str = $this->data_validate($csv_data);
673 673
 				if ($str != "") {
674 674
 					$invalid_array[$i] = $csv_data;
675 675
 					$invalid_array[$i]['error'] = $str;
676 676
 				} else {
677
-					if (!in_array($csv_data['number'], $number_arr)) {
677
+					if ( ! in_array($csv_data['number'], $number_arr)) {
678 678
 						$number_count = $this->db_model->countQuery('id', 'dids', array('number' => $csv_data['number']));
679 679
 						if ($number_count > 0) {
680 680
 							$invalid_array[$i] = $csv_data;
681 681
 							$invalid_array[$i]['error'] = 'Duplicate DID found from database';
682 682
 						} else {
683
-							if($csv_data['accountid'] > 0 && $csv_data['setup'] > 0){
683
+							if ($csv_data['accountid'] > 0 && $csv_data['setup'] > 0) {
684 684
 						  $this->db->where('type IN(0,1,3)');
685
-						  $this->db->where('reseller_id',0);
686
-						  $this->db->where('deleted',0);
687
-						  $this->db->where('status',0);
688
-				  $account_info=(array)$this->db->get_where('accounts',array("number"=>$csv_data['accountid']))->first_row();
689
-				  if($account_info){
690
-					  $account_balance=$this->db_model->get_available_bal($account_info);
685
+						  $this->db->where('reseller_id', 0);
686
+						  $this->db->where('deleted', 0);
687
+						  $this->db->where('status', 0);
688
+				  $account_info = (array)$this->db->get_where('accounts', array("number"=>$csv_data['accountid']))->first_row();
689
+				  if ($account_info) {
690
+					  $account_balance = $this->db_model->get_available_bal($account_info);
691 691
 					  $setup = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
692
-					  if($account_balance >= $setup){
693
-						$field_name=$account_info['type']==1 ? 'parent_id':'accountid';
694
-						$currency_name=$this->common->get_field_name('currency',"currency",array('id'=>$account_info['currency_id']));
692
+					  if ($account_balance >= $setup) {
693
+						$field_name = $account_info['type'] == 1 ? 'parent_id' : 'accountid';
694
+						$currency_name = $this->common->get_field_name('currency', "currency", array('id'=>$account_info['currency_id']));
695 695
 					$csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
696 696
 					$csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);
697 697
 					$csv_data['connectcost'] = $this->common_model->add_calculate_currency($csv_data['connectcost'], '', '', false, false);
698
-					$csv_data['setup']=$setup;
699
-					$csv_data[$field_name]=$account_info['id'];
700
-					$csv_data['status']=$this->common->get_import_status($csv_data['status']);
701
-					$available_bal = $this->db_model->update_balance($csv_data["setup"],$account_info['id'], "debit");
698
+					$csv_data['setup'] = $setup;
699
+					$csv_data[$field_name] = $account_info['id'];
700
+					$csv_data['status'] = $this->common->get_import_status($csv_data['status']);
701
+					$available_bal = $this->db_model->update_balance($csv_data["setup"], $account_info['id'], "debit");
702 702
 					$account_info['did_number'] = $csv_data['number'];
703 703
 					$account_info['did_country_id'] = $csv_data['country_id'];
704
-					$account_info['did_setup'] = $this->common_model->calculate_currency($csv_data['setup'],'',$currency_name,true,true);
705
-					$account_info['did_monthlycost'] = $this->common_model->calculate_currency($csv_data['monthlycost'],'',$currency_name,true,true);
704
+					$account_info['did_setup'] = $this->common_model->calculate_currency($csv_data['setup'], '', $currency_name, true, true);
705
+					$account_info['did_monthlycost'] = $this->common_model->calculate_currency($csv_data['monthlycost'], '', $currency_name, true, true);
706 706
 					$account_info['did_maxchannels'] = "0";
707
-					$csv_data['country_id']=$this->common->get_field_name('id','countrycode',array("country"=>$csv_data['country_id']));
708
-					if($account_info['type']==1){
709
-					 $reseller_array=$csv_data;
710
-					 $reseller_array['note']=$csv_data['number'];
711
-					 $reseller_array['reseller_id']=$account_info['id'];
712
-					 $reseller_array['parent_id']=$account_info['reseller_id'];
713
-					 $reseller_array['assign_date']=gmdate("Y-m-d H:i:s");
714
-					 unset($reseller_array['number'],$csv_data['accountid'],$reseller_array['accountid'],$reseller_array['country_id'],$reseller_array['init_inc']);
715
-					 $csv_data['accountid']=0;
716
-					 $final_reseller_array[$i]=$reseller_array;
717
-					}else{
718
-					  $csv_data['parent_id']=0;
707
+					$csv_data['country_id'] = $this->common->get_field_name('id', 'countrycode', array("country"=>$csv_data['country_id']));
708
+					if ($account_info['type'] == 1) {
709
+					 $reseller_array = $csv_data;
710
+					 $reseller_array['note'] = $csv_data['number'];
711
+					 $reseller_array['reseller_id'] = $account_info['id'];
712
+					 $reseller_array['parent_id'] = $account_info['reseller_id'];
713
+					 $reseller_array['assign_date'] = gmdate("Y-m-d H:i:s");
714
+					 unset($reseller_array['number'], $csv_data['accountid'], $reseller_array['accountid'], $reseller_array['country_id'], $reseller_array['init_inc']);
715
+					 $csv_data['accountid'] = 0;
716
+					 $final_reseller_array[$i] = $reseller_array;
717
+					} else {
718
+					  $csv_data['parent_id'] = 0;
719 719
 					}
720
-					$csv_data['assign_date']=gmdate("Y-m-d H:i:s");
720
+					$csv_data['assign_date'] = gmdate("Y-m-d H:i:s");
721 721
 					$new_final_arr[$i] = $csv_data;
722 722
 					$this->common->mail_to_users('email_add_did', $account_info);
723
-					  }else{
723
+					  } else {
724 724
 					$invalid_array[$i] = $csv_data;
725 725
 					$invalid_array[$i]['error'] = 'Account have not sufficient amount to purchase this DID.';
726 726
 					  }
727
-				  }else{
727
+				  } else {
728 728
 				$invalid_array[$i] = $csv_data;
729 729
 				$invalid_array[$i]['error'] = 'Account not found or assign to invalid account';
730 730
 				  }
731
-							}else{
731
+							} else {
732 732
 				  $csv_data['setup'] = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
733 733
 				  $csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
734 734
 				  $csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);
735 735
 				  $csv_data['connectcost'] = $this->common_model->add_calculate_currency($csv_data['connectcost'], '', '', false, false);
736
-				  $csv_data['accountid']=0;
737
-				  $csv_data['country_id']=$this->common->get_field_name('id','countrycode',array("country"=>$csv_data['country_id']));
736
+				  $csv_data['accountid'] = 0;
737
+				  $csv_data['country_id'] = $this->common->get_field_name('id', 'countrycode', array("country"=>$csv_data['country_id']));
738 738
 				  $new_final_arr[$i] = $csv_data;
739 739
 							}
740 740
 						}
@@ -747,17 +747,17 @@  discard block
 block discarded – undo
747 747
 			}
748 748
 			$i++;
749 749
 		}
750
-		if (!empty($new_final_arr)) {
750
+		if ( ! empty($new_final_arr)) {
751 751
 		   $result = $this->did_model->bulk_insert_dids($new_final_arr);
752 752
 		}
753
-		if(!empty($final_reseller_array)){
753
+		if ( ! empty($final_reseller_array)) {
754 754
 			$this->db->insert_batch('reseller_pricing', $final_reseller_array);
755 755
 		}
756 756
 	unlink($full_path.$did_file_name);
757 757
 		$count = count($invalid_array);
758 758
 		if ($count > 0) {
759 759
 			$session_id = "-1";
760
-			$fp = fopen($full_path . $session_id . '.csv', 'w');
760
+			$fp = fopen($full_path.$session_id.'.csv', 'w');
761 761
 			foreach ($new_final_arr_key as $key => $value) {
762 762
 				$custom_array[0][$key] = ucfirst($key);
763 763
 			}
@@ -767,16 +767,16 @@  discard block
 block discarded – undo
767 767
 				fputcsv($fp, $err_data);
768 768
 			}
769 769
 			fclose($fp);
770
-			$this->session->set_userdata('import_did_csv_error', $session_id . ".csv");
770
+			$this->session->set_userdata('import_did_csv_error', $session_id.".csv");
771 771
 			$data["error"] = $invalid_array;
772 772
 			$data['provider_id'] = $provider_id;
773
-			$data['import_record_count'] = count($new_final_arr)+count($reseller_array);
773
+			$data['import_record_count'] = count($new_final_arr) + count($reseller_array);
774 774
 			$data['failure_count'] = count($invalid_array) - 1;
775 775
 			$data['page_title'] = 'DID Import Error';
776 776
 			$this->load->view('view_import_error', $data);
777 777
 		} else {
778
-			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' DIDs Imported Successfully!');
779
-			redirect(base_url() . "did/did_list/");
778
+			$this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' DIDs Imported Successfully!');
779
+			redirect(base_url()."did/did_list/");
780 780
 		}
781 781
 	}
782 782
 
@@ -785,17 +785,17 @@  discard block
 block discarded – undo
785 785
 		$alpha_regex = "/^[a-z ,.'-]+$/i";
786 786
 		$alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
787 787
 		$email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/";
788
-		$str.= $csvdata['number'] != '' ? null : 'Number,';
788
+		$str .= $csvdata['number'] != '' ? null : 'Number,';
789 789
 		$str = rtrim($str, ',');
790
-		if (!$str) {
791
-			$str.= is_numeric($csvdata['number']) ? null : 'Number,';
792
-			$str.=!empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : ( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
793
-			$str.=!empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : ( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
790
+		if ( ! $str) {
791
+			$str .= is_numeric($csvdata['number']) ? null : 'Number,';
792
+			$str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
793
+			$str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
794 794
 			if ($str) {
795 795
 				$str = rtrim($str, ',');
796 796
 				$error_field = explode(',', $str);
797 797
 				$count = count($error_field);
798
-				$str.= $count > 1 ? ' are not valid' : ' is not Valid';
798
+				$str .= $count > 1 ? ' are not valid' : ' is not Valid';
799 799
 				return $str;
800 800
 			} else {
801 801
 				return false;
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 			$str = rtrim($str, ',');
805 805
 			$error_field = explode(',', $str);
806 806
 			$count = count($error_field);
807
-			$str.= $count > 1 ? ' are required' : ' is Required';
807
+			$str .= $count > 1 ? ' are required' : ' is Required';
808 808
 			return $str;
809 809
 		}
810 810
 	}
@@ -813,38 +813,38 @@  discard block
 block discarded – undo
813 813
 		$this->load->helper('download');
814 814
 		$error_data = $this->session->userdata('import_did_csv_error');
815 815
 		$full_path = $this->config->item('rates-file-path');
816
-		$data = file_get_contents($full_path . $error_data);
816
+		$data = file_get_contents($full_path.$error_data);
817 817
 		force_download("error_did_rates.csv", $data);
818 818
 	}
819 819
 
820 820
 	function did_export_data_xls() {
821 821
 	$account_info = $accountinfo = $this->session->userdata('accountinfo');
822
-	$currency_id=$account_info['currency_id'];
823
-	$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
822
+	$currency_id = $account_info['currency_id'];
823
+	$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
824 824
 	$query = $this->did_model->getdid_list(true, '0', '10000000');
825 825
 	ob_clean();
826
-	$outbound_array[] = array("DID", "Country", "Account","Per Minute Cost($currency)","Initial Increment","Increment","Setup Fee($currency)","Monthly Fee($currency)","Call Type","Destination","Status","Modified Date","Is Purchased");
826
+	$outbound_array[] = array("DID", "Country", "Account", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Setup Fee($currency)", "Monthly Fee($currency)", "Call Type", "Destination", "Status", "Modified Date", "Is Purchased");
827 827
 	if ($query->num_rows() > 0) {
828 828
 	  foreach ($query->result_array() as $row) {
829 829
 		$outbound_array[] = array(
830 830
 		$row['number'],
831 831
 		$this->common->get_field_name("country", "countrycode", $row['country_id']),
832 832
 		$this->common->get_field_name("number", "accounts", $row['accountid']),
833
-		$this->common_model->calculate_currency($row['cost'], '', '',true, false),
833
+		$this->common_model->calculate_currency($row['cost'], '', '', true, false),
834 834
 		$row['init_inc'],
835 835
 		$row['inc'],
836
-		$this->common_model->calculate_currency($row['setup'], '', '',true, false),
837
-		$this->common_model->calculate_currency($row['monthlycost'], '', '',true, false),
838
-		$this->common->get_call_type("","",$row['call_type']),
836
+		$this->common_model->calculate_currency($row['setup'], '', '', true, false),
837
+		$this->common_model->calculate_currency($row['monthlycost'], '', '', true, false),
838
+		$this->common->get_call_type("", "", $row['call_type']),
839 839
 		$row['extensions'],
840
-		$this->common->get_status('export','',$row['status']),
840
+		$this->common->get_status('export', '', $row['status']),
841 841
 		$row['last_modified_date'],
842 842
 		$this->common->check_did_avl_export($row['number'])
843 843
 		);
844 844
 	  }
845 845
 	}
846 846
 		$this->load->helper('csv');
847
-		array_to_csv($outbound_array, 'DIDs_' . date("Y-m-d") . '.csv');
847
+		array_to_csv($outbound_array, 'DIDs_'.date("Y-m-d").'.csv');
848 848
 	}
849 849
 
850 850
 }
Please login to merge, or discard this patch.
Braces   +22 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,8 +34,9 @@  discard block
 block discarded – undo
34 34
 		$this->load->model('did_model');
35 35
 		$this->load->library('csvreader');
36 36
 
37
-		if ($this->session->userdata('user_login') == FALSE)
38
-			redirect(base_url() . '/astpp/login');
37
+		if ($this->session->userdata('user_login') == FALSE) {
38
+					redirect(base_url() . '/astpp/login');
39
+		}
39 40
 	}
40 41
 
41 42
 	function did_add() {
@@ -163,7 +164,7 @@  discard block
 block discarded – undo
163 164
 		$this->db->where('note',$did_info['number']);
164 165
 		$this->db->delete("reseller_pricing");
165 166
 	  }
166
-	  }else{
167
+	  } else{
167 168
 	  $reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
168 169
 	  $reseller_ids=rtrim($reseller_ids,",");
169 170
 	  $where="parent_id IN ($reseller_ids)";
@@ -172,7 +173,7 @@  discard block
 block discarded – undo
172 173
 	  }
173 174
 	  if($accountinfo['type']==1){
174 175
 		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
175
-	  }else{
176
+	  } else{
176 177
     	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"),'call_type'=>'-1','extensions'=>'');
177 178
 	  }
178 179
 	  $where = array('id' => $id);
@@ -181,7 +182,7 @@  discard block
 block discarded – undo
181 182
 	  $accountid=$did_info['accountid'] > 0 ? $did_info['accountid']:0;
182 183
 	  if($did_info['accountid'] > 0 ){
183 184
 	   $email_user_id=$did_info['accountid'];
184
-	  }elseif($did_info['parent_id'] > 0){
185
+	  } elseif($did_info['parent_id'] > 0){
185 186
 	$email_user_id=$did_info['parent_id'];
186 187
 	  }
187 188
 	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$email_user_id))->first_row();
@@ -208,7 +209,7 @@  discard block
 block discarded – undo
208 209
 		$accountinfo = $this->session->userdata('accountinfo');
209 210
 		if($accountinfo['reseller_id'] > 0){
210 211
 		  $dids_array=$this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
211
-			}else{
212
+			} else{
212 213
 			  $this->db->select('id,monthlycost,setup,number');
213 214
 			  $this->db->where('accountid',0);
214 215
 			  $this->db->where('parent_id',0);
@@ -332,8 +333,9 @@  discard block
 block discarded – undo
332 333
 					OR  a.connectcost like '%$instant_search%'
333 334
 					    )" :null;
334 335
 		if ($account_arr['reseller_id'] != 0) {
335
-		if(!empty($like_str))
336
-			$this->db->where($like_str);
336
+		if(!empty($like_str)) {
337
+					$this->db->where($like_str);
338
+		}
337 339
 			if($accounttype=='reseller'){
338 340
 		  $this->db->where('a.note','b.number',false);
339 341
 		  $this->db->where('a.reseller_id',$account_arr['id']);
@@ -348,13 +350,13 @@  discard block
 block discarded – undo
348 350
 		  $this->db->select('a . * , b.id, a.reseller_id AS accountid,a.note as number,b.country_id as country_id');
349 351
 		  $this->db->limit($paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
350 352
 		  $query=$this->db->get('reseller_pricing as a,dids as b');
351
-		  }else{
353
+		  } else{
352 354
 		  $count_result=(array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
353 355
 			  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
354 356
 		  $json_data = $paging_data["json_paging"];
355 357
 			  $query=$this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
356 358
 		  }
357
-		}else{
359
+		} else{
358 360
 						$like_str=!empty($instant_search) ? 
359 361
 												"(dids.number like '%$instant_search%'
360 362
                                                     OR dids.inc like '%$instant_search%'
@@ -364,14 +366,16 @@  discard block
 block discarded – undo
364 366
                                                     OR dids.monthlycost like '%$instant_search%'
365 367
                                                     OR dids.connectcost like '%$instant_search%'
366 368
                                                         )" :null;
367
-			if(!empty($like_str))
368
-			$this->db->where($like_str);
369
+			if(!empty($like_str)) {
370
+						$this->db->where($like_str);
371
+			}
369 372
 			$where = array($field_name => $accountid);
370 373
 			$count_all = $this->db_model->countQuery("*", "dids", $where);
371 374
 			$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
372 375
 			$json_data = $paging_data["json_paging"];
373
-			if(!empty($like_str))
374
-			$this->db->where($like_str);
376
+			if(!empty($like_str)) {
377
+						$this->db->where($like_str);
378
+			}
375 379
 			$query = $this->db_model->select("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
376 380
 		}
377 381
 		$did_grid_fields = json_decode($this->did_form->build_did_list_for_customer($accountid, $accounttype));
@@ -714,21 +718,21 @@  discard block
 block discarded – undo
714 718
 					 unset($reseller_array['number'],$csv_data['accountid'],$reseller_array['accountid'],$reseller_array['country_id'],$reseller_array['init_inc']);
715 719
 					 $csv_data['accountid']=0;
716 720
 					 $final_reseller_array[$i]=$reseller_array;
717
-					}else{
721
+					} else{
718 722
 					  $csv_data['parent_id']=0;
719 723
 					}
720 724
 					$csv_data['assign_date']=gmdate("Y-m-d H:i:s");
721 725
 					$new_final_arr[$i] = $csv_data;
722 726
 					$this->common->mail_to_users('email_add_did', $account_info);
723
-					  }else{
727
+					  } else{
724 728
 					$invalid_array[$i] = $csv_data;
725 729
 					$invalid_array[$i]['error'] = 'Account have not sufficient amount to purchase this DID.';
726 730
 					  }
727
-				  }else{
731
+				  } else{
728 732
 				$invalid_array[$i] = $csv_data;
729 733
 				$invalid_array[$i]['error'] = 'Account not found or assign to invalid account';
730 734
 				  }
731
-							}else{
735
+							} else{
732 736
 				  $csv_data['setup'] = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
733 737
 				  $csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
734 738
 				  $csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/dashboard/controllers/dashboard.php 2 patches
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 
38 38
 	function index() 
39 39
 	{
40
-		if ($this->session->userdata('user_login') == FALSE) 
41
-			redirect(base_url() . 'login/login');
40
+		if ($this->session->userdata('user_login') == FALSE) {
41
+					redirect(base_url() . 'login/login');
42
+		}
42 43
 			$data['page_title'] = 'Dashboard';
43 44
 		if ($this->session->userdata('logintype') == 0) 
44 45
 	{
@@ -153,7 +154,7 @@  discard block
 block discarded – undo
153 154
 			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
154 155
 			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
155 156
 			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
156
-	  }else{
157
+	  } else{
157 158
 		$acc_arr[$data['day']]=$data;
158 159
 	  }
159 160
 		$reseller_total_result['sum'] += $acc_arr[$data['day']]['sum'];
@@ -181,7 +182,7 @@  discard block
 block discarded – undo
181 182
 				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
182 183
 				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
183 184
 				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
184
-		}else{
185
+		} else{
185 186
 		  $json_data['total'][]=  array($date->format("d"), 0);
186 187
 		  $json_data['answered'][]=  array($date->format("d"), 0);
187 188
 		  $json_data['failed'][]=  array($date->format("d"), 0);
@@ -192,8 +193,7 @@  discard block
 block discarded – undo
192 193
 		}
193 194
 		
194 195
 		}
195
-	}
196
-	else{
196
+	} else{
197 197
 	foreach($daterange as $date){
198 198
 		$json_data['date'][]=$date->format("d");
199 199
 		$day = (int) $date->format("d");
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 			$json_data[$i][]= round($data['billseconds']/60,0);
252 252
 			$i++;
253 253
 		   } 
254
-		}else{
254
+		} else{
255 255
 	  $json_data[] = array();
256 256
 	  	}
257 257
 	 	echo json_encode($json_data);
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 				$i++;
291 291
 			}
292 292
     	    
293
-		}else{
293
+		} else{
294 294
 				$json_data[] = array();
295 295
 	 		 }
296 296
 	echo json_encode($json_data);
Please login to merge, or discard this patch.
Spacing   +139 added lines, -139 removed lines patch added patch discarded remove patch
@@ -38,70 +38,70 @@  discard block
 block discarded – undo
38 38
 	function index() 
39 39
 	{
40 40
 		if ($this->session->userdata('user_login') == FALSE) 
41
-			redirect(base_url() . 'login/login');
41
+			redirect(base_url().'login/login');
42 42
 			$data['page_title'] = 'Dashboard';
43 43
 		if ($this->session->userdata('logintype') == 0) 
44 44
 	{
45 45
 			$this->load->view('view_user_dashboard', $data);
46 46
 		} else {
47
-		$gmtoffset=$this->common->get_timezone_offset();	    
47
+		$gmtoffset = $this->common->get_timezone_offset();	    
48 48
 			$this->load->view('view_dashboard', $data);
49 49
 		}
50 50
 	}
51
-	function user_recent_payments(){
51
+	function user_recent_payments() {
52 52
 	  $this->customerReport_recent_payments();
53 53
 	}     
54 54
 	function customerReport_recent_payments() 
55 55
 	{
56
-	$accountinfo=$this->session->userdata('accountinfo');
57
-	$currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
56
+	$accountinfo = $this->session->userdata('accountinfo');
57
+	$currency = $this->common->get_field_name('currency', 'currency', array("id"=>$accountinfo['currency_id']));
58 58
 		$json_data = array();
59
-	$i=1;
59
+	$i = 1;
60 60
 	$result = $this->dashboard_model->get_recent_recharge();
61
-	$gmtoffset=$this->common->get_timezone_offset();
62
-		if($result->num_rows() > 0)
61
+	$gmtoffset = $this->common->get_timezone_offset();
62
+		if ($result->num_rows() > 0)
63 63
 	{
64
-		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
65
-		 $json_data[0]['accountid']='Accounts';
66
-		 $json_data[0]['credit']='Amount('.$currency.")";
67
-		 $json_data[0]['payment_date']='Date';
68
-		 foreach($result->result_array() as $key=>$data){
69
-			  $current_timestamp=strtotime($data['payment_date']);
70
-			  $modified_date=$current_timestamp+$gmtoffset;
71
-		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
72
-			  $json_data[$i]['accountid']=$data['accountid'];
73
-			  $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
74
-			  $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
64
+		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', '');
65
+		 $json_data[0]['accountid'] = 'Accounts';
66
+		 $json_data[0]['credit'] = 'Amount('.$currency.")";
67
+		 $json_data[0]['payment_date'] = 'Date';
68
+		 foreach ($result->result_array() as $key=>$data) {
69
+			  $current_timestamp = strtotime($data['payment_date']);
70
+			  $modified_date = $current_timestamp + $gmtoffset;
71
+		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
72
+			  $json_data[$i]['accountid'] = $data['accountid'];
73
+			  $json_data[$i]['credit'] = $this->common_model->calculate_currency($data['credit'], '', '', true, false);
74
+			  $json_data[$i]['payment_date'] = date('Y-m-d H:i:s', strtotime($data['payment_date']) + $gmtoffset);
75 75
 			  $i++;
76 76
 		  	}
77 77
 		  }
78 78
 		 echo json_encode($json_data); 
79 79
 	}
80
-	function  user_call_statistics_with_profit(){
80
+	function  user_call_statistics_with_profit() {
81 81
 	  $this->customerReport_call_statistics_with_profit();
82 82
 	 }
83 83
 	function customerReport_call_statistics_with_profit() {
84
-		$post=$this->input->post();
85
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
86
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
84
+		$post = $this->input->post();
85
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
86
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
87 87
 		$json_data = array();
88
-		$start_date=date($year.'-'.$month.'-01');
89
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
90
-		$gmtoffset=$this->common->get_timezone_offset();
91
-		$end_date=date($year."-".$month."-".$end_day.' H:i:s');
92
-		$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
93
-		$current_date=(int)date("d");
94
-		$count=0;
95
-		$i=0;
88
+		$start_date = date($year.'-'.$month.'-01');
89
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
90
+		$gmtoffset = $this->common->get_timezone_offset();
91
+		$end_date = date($year."-".$month."-".$end_day.' H:i:s');
92
+		$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
93
+		$current_date = (int)date("d");
94
+		$count = 0;
95
+		$i = 0;
96 96
 		$begin = new DateTime($start_date);
97 97
 		$end = new DateTime($end_date);
98
-		$end=$end->modify('+1 day');
98
+		$end = $end->modify('+1 day');
99 99
 		$daterange = new DatePeriod($begin, new DateInterval('P1D'), $end);
100
-		$records_date=array();
101
-		$accountinfo=$this->session->userdata('accountinfo');
102
-		$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
103
-		$customerresult = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date);
104
-		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date);
100
+		$records_date = array();
101
+		$accountinfo = $this->session->userdata('accountinfo');
102
+		$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
103
+		$customerresult = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date);
104
+		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date);
105 105
 		$acc_arr = array();
106 106
 /*Date: 08-Mar-2017
107 107
 Reason: Improvement of Dashboard Performance*/
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		  $acc_arr[$data['day']] = $data;
133 133
 		  $customer_total_result['sum'] += $data['sum'];
134 134
 		  $customer_total_result['answered'] += $data['answered'];
135
-		  if($data['mcd'] > $mcd){
135
+		  if ($data['mcd'] > $mcd) {
136 136
 			  $mcd = $data['mcd'];
137 137
 		  }
138 138
 		  $customer_total_result['mcd'] = $mcd;
@@ -143,22 +143,22 @@  discard block
 block discarded – undo
143 143
 		  $customer_total_result['cost'] += $data['cost'];
144 144
 		  $customer_total_result['completed'] += $data['completed'];
145 145
 		}
146
-	foreach($resellerresult->result_array() as $data){
147
-	  $reseller_arr[$data['day']]=$data;
148
-	  if(isset($acc_arr[$data['day']])){
149
-		$acc_arr[$data['day']]['sum']= $data['sum']+$acc_arr[$data['day']]['sum'];
150
-		$acc_arr[$data['day']]['answered']= $data['answered']+$acc_arr[$data['day']]['answered'];
151
-		$acc_arr[$data['day']]['failed']= $data['failed']+$acc_arr[$data['day']]['failed'];
152
-		$acc_arr[$data['day']]['profit']= $data['profit']+$acc_arr[$data['day']]['profit'];
153
-			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
154
-			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
155
-			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
156
-	  }else{
157
-		$acc_arr[$data['day']]=$data;
146
+	foreach ($resellerresult->result_array() as $data) {
147
+	  $reseller_arr[$data['day']] = $data;
148
+	  if (isset($acc_arr[$data['day']])) {
149
+		$acc_arr[$data['day']]['sum'] = $data['sum'] + $acc_arr[$data['day']]['sum'];
150
+		$acc_arr[$data['day']]['answered'] = $data['answered'] + $acc_arr[$data['day']]['answered'];
151
+		$acc_arr[$data['day']]['failed'] = $data['failed'] + $acc_arr[$data['day']]['failed'];
152
+		$acc_arr[$data['day']]['profit'] = $data['profit'] + $acc_arr[$data['day']]['profit'];
153
+			$acc_arr[$data['day']]['completed'] = $data['completed'] + $acc_arr[$data['day']]['completed'];
154
+			$acc_arr[$data['day']]['duration'] = $data['duration'] + $acc_arr[$data['day']]['duration'];
155
+			$acc_arr[$data['day']]['mcd'] = $data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd'] : $acc_arr[$data['day']]['mcd'];
156
+	  } else {
157
+		$acc_arr[$data['day']] = $data;
158 158
 	  }
159 159
 		$reseller_total_result['sum'] += $acc_arr[$data['day']]['sum'];
160 160
 		$reseller_total_result['answered'] += $acc_arr[$data['day']]['answered'];
161
-		if($data['mcd'] > $res_mcd){
161
+		if ($data['mcd'] > $res_mcd) {
162 162
 		  $res_mcd = $data['mcd'];
163 163
 		}
164 164
 		$reseller_total_result['mcd'] = $res_mcd;
@@ -167,130 +167,130 @@  discard block
 block discarded – undo
167 167
 		$reseller_total_result['profit'] += $acc_arr[$data['day']]['profit'];
168 168
 		$reseller_total_result['completed'] += $acc_arr[$data['day']]['completed'];
169 169
 	}
170
-	if(!empty($acc_arr)){
171
-		foreach($daterange as $date){
172
-		$json_data['date'][]=$date->format("d");
173
-		$day = (int) $date->format("d");
174
-		if(isset($acc_arr[$day])){
175
-				  $asr= ($acc_arr[$day]['sum'] > 0 ) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100,2)) : 0;
176
-				  $acd= ($acc_arr[$day]['completed'] > 0 ) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'],2) : 0;
177
-		  $json_data['total'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['sum']);
178
-		  $json_data['answered'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['answered']);
179
-		  $json_data['failed'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['failed']);
180
-		  $json_data['profit'][]=  array((string)$acc_arr[$day]['day'],(float)  str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
181
-				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
182
-				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
183
-				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
184
-		}else{
185
-		  $json_data['total'][]=  array($date->format("d"), 0);
186
-		  $json_data['answered'][]=  array($date->format("d"), 0);
187
-		  $json_data['failed'][]=  array($date->format("d"), 0);
188
-		  $json_data['profit'][]=  array($date->format("d"), 0);
189
-				  $json_data['acd'][]=array($date->format("d"), 0);
190
-				  $json_data['mcd'][]=array($date->format("d"), 0);
191
-				  $json_data['asr'][]=array($date->format("d"),0);
170
+	if ( ! empty($acc_arr)) {
171
+		foreach ($daterange as $date) {
172
+		$json_data['date'][] = $date->format("d");
173
+		$day = (int)$date->format("d");
174
+		if (isset($acc_arr[$day])) {
175
+				  $asr = ($acc_arr[$day]['sum'] > 0) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100, 2)) : 0;
176
+				  $acd = ($acc_arr[$day]['completed'] > 0) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'], 2) : 0;
177
+		  $json_data['total'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['sum']);
178
+		  $json_data['answered'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['answered']);
179
+		  $json_data['failed'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['failed']);
180
+		  $json_data['profit'][] = array((string)$acc_arr[$day]['day'], (float)str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
181
+				  $json_data['acd'][] = array((string)$acc_arr[$day]['day'], (float)$acd);
182
+				  $json_data['mcd'][] = array((string)$acc_arr[$day]['day'], (float)$acc_arr[$day]['mcd']);
183
+				  $json_data['asr'][] = array((string)$acc_arr[$day]['day'], (float)$asr);
184
+		} else {
185
+		  $json_data['total'][] = array($date->format("d"), 0);
186
+		  $json_data['answered'][] = array($date->format("d"), 0);
187
+		  $json_data['failed'][] = array($date->format("d"), 0);
188
+		  $json_data['profit'][] = array($date->format("d"), 0);
189
+				  $json_data['acd'][] = array($date->format("d"), 0);
190
+				  $json_data['mcd'][] = array($date->format("d"), 0);
191
+				  $json_data['asr'][] = array($date->format("d"), 0);
192 192
 		}
193 193
 		
194 194
 		}
195 195
 	}
196
-	else{
197
-	foreach($daterange as $date){
198
-		$json_data['date'][]=$date->format("d");
199
-		$day = (int) $date->format("d");
200
-		$json_data['total'][]=  array($date->format("d"), 0);
201
-		$json_data['answered'][]=  array($date->format("d"), 0);
202
-		$json_data['failed'][]=  array($date->format("d"), 0);
203
-		$json_data['profit'][]=  array($date->format("d"), 0);
204
-		$json_data['acd'][]=array($date->format("d"), 0);
205
-		$json_data['mcd'][]=array($date->format("d"), 0);
206
-		$json_data['asr'][]=array($date->format("d"), 0);
196
+	else {
197
+	foreach ($daterange as $date) {
198
+		$json_data['date'][] = $date->format("d");
199
+		$day = (int)$date->format("d");
200
+		$json_data['total'][] = array($date->format("d"), 0);
201
+		$json_data['answered'][] = array($date->format("d"), 0);
202
+		$json_data['failed'][] = array($date->format("d"), 0);
203
+		$json_data['profit'][] = array($date->format("d"), 0);
204
+		$json_data['acd'][] = array($date->format("d"), 0);
205
+		$json_data['mcd'][] = array($date->format("d"), 0);
206
+		$json_data['asr'][] = array($date->format("d"), 0);
207 207
 	}
208 208
 	}
209 209
 		
210
-		$json_data['total_count']['sum']=$reseller_total_result['sum']+$customer_total_result['sum'];
211
-		$json_data['total_count']['debit']=$this->common_model->to_calculate_currency($reseller_total_result['debit']+$customer_total_result['debit'],'','',true,true);
212
-		$json_data['total_count']['cost']=$this->common_model->to_calculate_currency($reseller_total_result['cost']+$customer_total_result['cost'],'','',true,true);
213
-		$json_data['total_count']['profit']=$this->common_model->to_calculate_currency($reseller_total_result['profit']+$customer_total_result['profit'],'','',true,true);
214
-		$json_data['total_count']['completed']=$reseller_total_result['completed']+$customer_total_result['completed'];
215
-		$json_data['total_count']['duration']=$reseller_total_result['duration']+$customer_total_result['duration'];
216
-		$json_data['total_count']['acd']=$json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration']/$json_data['total_count']['completed'],2):0;
217
-		$json_data['total_count']['mcd']=($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0 ) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd']:$reseller_total_result['mcd']) : 0;
218
-		$json_data['total_count']['asr']=($json_data['total_count']['sum'] > 0 ) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100,2)) : 0;
219
-		$json_data['total_count']['asr']=$this->common_model->format_currency($json_data['total_count']['asr']);
210
+		$json_data['total_count']['sum'] = $reseller_total_result['sum'] + $customer_total_result['sum'];
211
+		$json_data['total_count']['debit'] = $this->common_model->to_calculate_currency($reseller_total_result['debit'] + $customer_total_result['debit'], '', '', true, true);
212
+		$json_data['total_count']['cost'] = $this->common_model->to_calculate_currency($reseller_total_result['cost'] + $customer_total_result['cost'], '', '', true, true);
213
+		$json_data['total_count']['profit'] = $this->common_model->to_calculate_currency($reseller_total_result['profit'] + $customer_total_result['profit'], '', '', true, true);
214
+		$json_data['total_count']['completed'] = $reseller_total_result['completed'] + $customer_total_result['completed'];
215
+		$json_data['total_count']['duration'] = $reseller_total_result['duration'] + $customer_total_result['duration'];
216
+		$json_data['total_count']['acd'] = $json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration'] / $json_data['total_count']['completed'], 2) : 0;
217
+		$json_data['total_count']['mcd'] = ($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd'] : $reseller_total_result['mcd']) : 0;
218
+		$json_data['total_count']['asr'] = ($json_data['total_count']['sum'] > 0) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100, 2)) : 0;
219
+		$json_data['total_count']['asr'] = $this->common_model->format_currency($json_data['total_count']['asr']);
220 220
 		echo json_encode($json_data);
221 221
 }
222 222
 
223
-	 function user_maximum_callminutes(){
223
+	 function user_maximum_callminutes() {
224 224
 	  $this->customerReport_maximum_callminutes();
225 225
 	}
226 226
 	 function customerReport_maximum_callminutes()
227 227
 	 {
228
-		$post=$this->input->post();
229
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
230
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
231
-	$start_date=date($year.'-'.$month.'-01');
232
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
233
-	$gmtoffset=$this->common->get_timezone_offset();
234
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
235
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
228
+		$post = $this->input->post();
229
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
230
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
231
+	$start_date = date($year.'-'.$month.'-01');
232
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
233
+	$gmtoffset = $this->common->get_timezone_offset();
234
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
235
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
236 236
 	 	$json_data = array();
237
- 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date,$end_date);
238
-	$i=0;
239
-	$accountinfo=$this->session->userdata('accountinfo');
240
-	$reseller_id=($accountinfo['type']== -1 OR $accountinfo['type']== 2) ? 0 : $accountinfo['id'];
241
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
242
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
243
-	} else{
244
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
237
+ 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date, $end_date);
238
+	$i = 0;
239
+	$accountinfo = $this->session->userdata('accountinfo');
240
+	$reseller_id = ($accountinfo['type'] == -1 OR $accountinfo['type'] == 2) ? 0 : $accountinfo['id'];
241
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
242
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
243
+	} else {
244
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
245 245
 	}
246
-		if($result->num_rows() > 0 )
246
+		if ($result->num_rows() > 0)
247 247
 	{	
248
-		   foreach ($result->result_array() as $data){
249
-			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
250
-			$json_data[$i][]= $data['accountid'];
251
-			$json_data[$i][]= round($data['billseconds']/60,0);
248
+		   foreach ($result->result_array() as $data) {
249
+			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
250
+			$json_data[$i][] = $data['accountid'];
251
+			$json_data[$i][] = round($data['billseconds'] / 60, 0);
252 252
 			$i++;
253 253
 		   } 
254
-		}else{
254
+		} else {
255 255
 	  $json_data[] = array();
256 256
 	  	}
257 257
 	 	echo json_encode($json_data);
258 258
 	 }
259 259
 
260
-	 function user_maximum_callcount(){
260
+	 function user_maximum_callcount() {
261 261
 	   $this->customerReport_maximum_callcount();
262 262
 	 }
263 263
 	 function customerReport_maximum_callcount()
264 264
 	 {
265
-	 	$post=$this->input->post();
266
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
267
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
268
-	$start_date=date($year.'-'.$month.'-01');
269
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
270
-	$gmtoffset=$this->common->get_timezone_offset();
271
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
272
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
265
+	 	$post = $this->input->post();
266
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
267
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
268
+	$start_date = date($year.'-'.$month.'-01');
269
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
270
+	$gmtoffset = $this->common->get_timezone_offset();
271
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
272
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
273 273
 	 	$json_data = array();
274
-	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date,$end_date);
275
-	$accountinfo=$this->session->userdata('accountinfo');
276
-	$reseller_id=($accountinfo['type']== -1 OR $accountinfo['type']== 2) ? 0 : $accountinfo['id'];
277
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
278
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
279
-	} else{
280
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
274
+	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date, $end_date);
275
+	$accountinfo = $this->session->userdata('accountinfo');
276
+	$reseller_id = ($accountinfo['type'] == -1 OR $accountinfo['type'] == 2) ? 0 : $accountinfo['id'];
277
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
278
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
279
+	} else {
280
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
281 281
 	}
282
-	$i=0;
283
-		if($result->num_rows() > 0 )
282
+	$i = 0;
283
+		if ($result->num_rows() > 0)
284 284
 	{
285 285
 		foreach ($result->result_array() as $data) 
286 286
 		{
287
-				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
288
-				$json_data[$i][]= $data['accountid'];
289
-				$json_data[$i][]= (int)$data['call_count'];
287
+				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
288
+				$json_data[$i][] = $data['accountid'];
289
+				$json_data[$i][] = (int)$data['call_count'];
290 290
 				$i++;
291 291
 			}
292 292
     	    
293
-		}else{
293
+		} else {
294 294
 				$json_data[] = array();
295 295
 	 		 }
296 296
 	echo json_encode($json_data);
Please login to merge, or discard this patch.