@@ -21,8 +21,9 @@ discard block |
||
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 | class Accounts_form { |
28 | 29 | function __construct($library_name = '') { |
@@ -279,8 +280,7 @@ discard block |
||
279 | 280 | array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, 'reseller_id' => $loginid), 'multi'), |
280 | 281 | ); |
281 | 282 | |
282 | -} |
|
283 | -else{ |
|
283 | +} else{ |
|
284 | 284 | $form[gettext('Billing Information')] = array( |
285 | 285 | array(gettext('Rate Group'), 'pricelist_id', 'SELECT', '', array("name" => "pricelist_id", 'rules' => 'required'), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")), |
286 | 286 | |
@@ -442,8 +442,7 @@ discard block |
||
442 | 442 | array('', 'HIDDEN', 'advance_search', '1', '', '', '') |
443 | 443 | ); |
444 | 444 | |
445 | - } |
|
446 | - else |
|
445 | + } else |
|
447 | 446 | { |
448 | 447 | |
449 | 448 | $form['forms'] = array("", array('id' => "account_search")); |
@@ -603,8 +602,9 @@ discard block |
||
603 | 602 | function build_grid_buttons_customer() { |
604 | 603 | $logintype = $this->CI->session->userdata('userlevel_logintype'); |
605 | 604 | $provider = null; |
606 | - if ($logintype != 1) |
|
607 | - $provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/"); |
|
605 | + if ($logintype != 1) { |
|
606 | + $provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/"); |
|
607 | + } |
|
608 | 608 | // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name); |
609 | 609 | $buttons_json = json_encode(array( |
610 | 610 | array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"), |
@@ -59,8 +59,9 @@ |
||
59 | 59 | if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) { |
60 | 60 | echo "<table>"; |
61 | 61 | foreach ($taxesList as $values) { |
62 | - if ($i == 1) |
|
63 | - echo"<tr>"; |
|
62 | + if ($i == 1) { |
|
63 | + echo"<tr>"; |
|
64 | + } |
|
64 | 65 | ?> |
65 | 66 | <td style="padding-left: 10px;"> |
66 | 67 | <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) { |
@@ -60,11 +60,12 @@ |
||
60 | 60 | $validation_array=json_decode($validation_errors); |
61 | 61 | if(is_object($validation_array)){ |
62 | 62 | $validation_array = get_object_vars($validation_array); |
63 | - foreach($validation_array as $key=>$value) |
|
64 | - echo $value."<br/>"; |
|
63 | + foreach($validation_array as $key=>$value) { |
|
64 | + echo $value."<br/>"; |
|
65 | + } |
|
66 | + } else { |
|
67 | + echo $validation_errors; |
|
65 | 68 | } |
66 | - else |
|
67 | - echo $validation_errors; |
|
68 | 69 | |
69 | 70 | } |
70 | 71 | ?> |
@@ -50,10 +50,11 @@ discard block |
||
50 | 50 | $this->db_model->build_search('termination_rates_list_search'); |
51 | 51 | $this->db->from('outbound_routes'); |
52 | 52 | if ($flag) { |
53 | - if ($export) |
|
54 | - $this->db->limit($limit, $start); |
|
53 | + if ($export) { |
|
54 | + $this->db->limit($limit, $start); |
|
55 | + } |
|
55 | 56 | $result = $this->db->get(); |
56 | - }else { |
|
57 | + } else { |
|
57 | 58 | $result = $this->db->count_all_results(); |
58 | 59 | } |
59 | 60 | return $result; |
@@ -71,10 +72,11 @@ discard block |
||
71 | 72 | |
72 | 73 | $this->db_model->build_search('origination_rate_list_search'); |
73 | 74 | if ($flag) { |
74 | - if ($export) |
|
75 | - $this->db->limit($limit, $start); |
|
75 | + if ($export) { |
|
76 | + $this->db->limit($limit, $start); |
|
77 | + } |
|
76 | 78 | $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start); |
77 | - }else { |
|
79 | + } else { |
|
78 | 80 | $result = $this->db_model->countQuery("*", "routes", $where); |
79 | 81 | } |
80 | 82 | // echo "<pre>";print_r($result->result());exit; |
@@ -90,10 +92,11 @@ discard block |
||
90 | 92 | |
91 | 93 | $this->db_model->build_search('origination_rate_list_search'); |
92 | 94 | if ($flag) { |
93 | - if ($export) |
|
94 | - $this->db->limit($limit, $start); |
|
95 | + if ($export) { |
|
96 | + $this->db->limit($limit, $start); |
|
97 | + } |
|
95 | 98 | $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start); |
96 | - }else { |
|
99 | + } else { |
|
97 | 100 | $result = $this->db_model->countQuery("*", "routes", $where); |
98 | 101 | } |
99 | 102 | return $result; |
@@ -301,10 +304,11 @@ discard block |
||
301 | 304 | } |
302 | 305 | |
303 | 306 | $updateflg = $this->db_model->build_batch_update_array($update_array); |
304 | - if ($updateflg) |
|
305 | - return $this->db->update("outbound_routes"); |
|
306 | - else |
|
307 | - return false; |
|
307 | + if ($updateflg) { |
|
308 | + return $this->db->update("outbound_routes"); |
|
309 | + } else { |
|
310 | + return false; |
|
311 | + } |
|
308 | 312 | } |
309 | 313 | function origination_rate_batch_update($update_array) { |
310 | 314 | $this->db_model->build_search('origination_rate_list_search'); |
@@ -313,10 +317,11 @@ discard block |
||
313 | 317 | $this->db->where("reseller_id", $account_data['id']); |
314 | 318 | } |
315 | 319 | $updateflg = $this->db_model->build_batch_update_array($update_array); |
316 | - if ($updateflg) |
|
317 | - return $this->db->update("routes"); |
|
318 | - else |
|
319 | - return false; |
|
320 | + if ($updateflg) { |
|
321 | + return $this->db->update("routes"); |
|
322 | + } else { |
|
323 | + return false; |
|
324 | + } |
|
320 | 325 | } |
321 | 326 | function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) { |
322 | 327 | $this->db_model->build_search('resellerrates_list_search'); |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | $this->load->library('csvreader'); |
35 | 35 | ini_set("memory_limit","2048M"); |
36 | 36 | ini_set("max_execution_time","259200"); |
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 termination_rates_list() { |
@@ -109,18 +110,17 @@ discard block |
||
109 | 110 | $data['check_header']=$check_header; |
110 | 111 | $data['page_title'] = 'Termination Rates Preview'; |
111 | 112 | $this->session->set_userdata('import_termination_rate_csv',$actual_file_name); |
112 | - }else{ |
|
113 | + } else{ |
|
113 | 114 | $data['error'] = "File Uploading Fail Please Try Again"; |
114 | 115 | } |
115 | 116 | } |
116 | - } |
|
117 | - else{ |
|
117 | + } else{ |
|
118 | 118 | $data['error']=="File Uploading Fail Please Try Again"; |
119 | 119 | } |
120 | - }else { |
|
120 | + } else { |
|
121 | 121 | $data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)"; |
122 | 122 | } |
123 | - }else{ |
|
123 | + } else{ |
|
124 | 124 | $invalid_flag=true; |
125 | 125 | } |
126 | 126 | if ($invalid_flag) { |
@@ -163,8 +163,7 @@ discard block |
||
163 | 163 | if($str != ""){ |
164 | 164 | $invalid_array[$i]=$csv_data; |
165 | 165 | $invalid_array[$i]['error'] = $str; |
166 | - } |
|
167 | - else{ |
|
166 | + } else{ |
|
168 | 167 | $csv_data['trunk_id']=$trunkID; |
169 | 168 | $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*"; |
170 | 169 | $new_final_arr[$i]=$csv_data; |
@@ -252,19 +251,17 @@ discard block |
||
252 | 251 | $data['page_title'] = "Origination Rates Preview"; |
253 | 252 | $data['check_header']=$check_header; |
254 | 253 | $this->session->set_userdata('import_origination_rate_csv',$actual_file_name); |
255 | - }else{ |
|
254 | + } else{ |
|
256 | 255 | $data['error'] = "File Uploading Fail Please Try Again"; |
257 | 256 | } |
258 | 257 | } |
259 | - } |
|
260 | - else{ |
|
258 | + } else{ |
|
261 | 259 | $data['error']=="File Uploading Fail Please Try Again"; |
262 | 260 | } |
263 | - } |
|
264 | - else { |
|
261 | + } else { |
|
265 | 262 | $data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)"; |
266 | 263 | } |
267 | - }else{ |
|
264 | + } else{ |
|
268 | 265 | $invalid_flag=true; |
269 | 266 | } |
270 | 267 | if ($invalid_flag) { |
@@ -308,8 +305,7 @@ discard block |
||
308 | 305 | if($str != ""){ |
309 | 306 | $invalid_array[$i]=$csv_data; |
310 | 307 | $invalid_array[$i]['error'] = $str; |
311 | - } |
|
312 | - else{ |
|
308 | + } else{ |
|
313 | 309 | $csv_data['pricelist_id']=$pricelistID; |
314 | 310 | $csv_data['trunk_id']=$trunkid; |
315 | 311 | $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*"; |
@@ -371,12 +367,10 @@ discard block |
||
371 | 367 | $count = count($error_field); |
372 | 368 | $str.= $count > 1 ? ' are not valid' : ' is not Valid'; |
373 | 369 | return $str; |
374 | - } |
|
375 | - else{ |
|
370 | + } else{ |
|
376 | 371 | return false; |
377 | 372 | } |
378 | - } |
|
379 | - else{ |
|
373 | + } else{ |
|
380 | 374 | $str=rtrim($str,','); |
381 | 375 | $error_field=explode(',',$str); |
382 | 376 | $count = count($error_field); |
@@ -617,13 +611,15 @@ discard block |
||
617 | 611 | $where = array('accountid' => $accountid); |
618 | 612 | $instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); |
619 | 613 | $like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%' OR destination like '%$instant_search%' )" :null; |
620 | - if(!empty($like_str)) |
|
621 | - $this->db->where($like_str); |
|
614 | + if(!empty($like_str)) { |
|
615 | + $this->db->where($like_str); |
|
616 | + } |
|
622 | 617 | $count_all = $this->db_model->countQuery("*", "block_patterns", $where); |
623 | 618 | $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']); |
624 | 619 | $json_data = $paging_data["json_paging"]; |
625 | - if(!empty($like_str)) |
|
626 | - $this->db->where($like_str); |
|
620 | + if(!empty($like_str)) { |
|
621 | + $this->db->where($like_str); |
|
622 | + } |
|
627 | 623 | $pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]); |
628 | 624 | $grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype)); |
629 | 625 | $json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields); |
@@ -20,8 +20,9 @@ discard block |
||
20 | 20 | # You should have received a copy of the GNU Affero General Public License |
21 | 21 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
22 | 22 | ############################################################################### |
23 | -if (!defined('BASEPATH')) |
|
24 | - exit('No direct script access allowed'); |
|
23 | +if (!defined('BASEPATH')) { |
|
24 | + exit('No direct script access allowed'); |
|
25 | +} |
|
25 | 26 | |
26 | 27 | class rates_form { |
27 | 28 | function __construct($library_name = '') { |
@@ -62,8 +63,9 @@ discard block |
||
62 | 63 | function get_origination_rate_form_fields() { |
63 | 64 | $logintype=$this->CI->session->userdata('userlevel_logintype'); |
64 | 65 | $trunk=null; |
65 | - if($logintype !=1) |
|
66 | - $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")); |
|
66 | + if($logintype !=1) { |
|
67 | + $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")); |
|
68 | + } |
|
67 | 69 | $form['forms'] = array(base_url() . 'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form')); |
68 | 70 | $form['Rate Information'] = array( |
69 | 71 | array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''), |
@@ -165,8 +167,9 @@ discard block |
||
165 | 167 | function origination_rate_batch_update_form() { |
166 | 168 | $logintype=$this->CI->session->userdata('userlevel_logintype'); |
167 | 169 | $trunk=null; |
168 | - if($logintype !=1) |
|
169 | - $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type'); |
|
170 | + if($logintype !=1) { |
|
171 | + $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type'); |
|
172 | + } |
|
170 | 173 | $form['forms'] = array("rates/origination_rate_batch_update/",array('id' => "origination_rate_batch_update")); |
171 | 174 | $form['Batch Update'] = array( |
172 | 175 | array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''), |
@@ -104,7 +104,7 @@ |
||
104 | 104 | foreach($csv_value as $field_name => $field_val){ |
105 | 105 | if($csv_key == 0){ |
106 | 106 | echo "<th>".ucfirst($field_name)."</th>"; |
107 | - }else{ |
|
107 | + } else{ |
|
108 | 108 | echo "<td class='portlet-content'>".$field_val."</td>"; |
109 | 109 | } |
110 | 110 | } |
@@ -116,7 +116,7 @@ |
||
116 | 116 | foreach($csv_value as $field_name => $field_val){ |
117 | 117 | if($csv_key == 0){ |
118 | 118 | echo "<th>".ucfirst($field_name)."</th>"; |
119 | - }else{ |
|
119 | + } else{ |
|
120 | 120 | echo "<td class='portlet-content'>".$field_val."</td>"; |
121 | 121 | } |
122 | 122 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | "status"=>0, |
81 | 81 | "assign_date"=>date('Y-m-d H:i:s') |
82 | 82 | ); |
83 | - }else{ |
|
83 | + } else{ |
|
84 | 84 | $charge_res=$charge_res->result_array(); |
85 | 85 | //echo "<pre>"; print_r($charge_res); exit; |
86 | 86 | $charge_acc_arr = array("charge_id"=>'id', |