@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $this->session->set_userdata('mode_cur', 'user'); |
121 | 121 | if($result['type'] == 1){ |
122 | 122 | redirect(base_url() . 'dashboard/'); |
123 | - }else{ |
|
123 | + } else{ |
|
124 | 124 | redirect(base_url() . 'user/user/'); |
125 | 125 | } |
126 | 126 | } else { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $this->session->set_userdata('user_login', FALSE); |
152 | 152 | $data['app_name'] = 'ASTPP - Open Source Billing Solution'; |
153 | 153 | $this->load->view('view_login', $data); |
154 | - }else { |
|
154 | + } else { |
|
155 | 155 | /* |
156 | 156 | * |
157 | 157 | * Purpose : Display logo based on domain name |
@@ -113,8 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | $this->db->limit($limit, $start); |
115 | 115 | $query=$this->db->query("SELECT a.note AS number,a.*,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND a.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = a.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=a.note)) AS accountid FROM reseller_pricing AS a where a.reseller_id=".$accountinfo['id']." AND a.parent_id =".$accountinfo['reseller_id'].$search_string); |
116 | - } |
|
117 | - else{ |
|
116 | + } else{ |
|
118 | 117 | $this->db_model->build_search('did_list_search'); |
119 | 118 | $query = $this->db_model->select("*,note as number,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND reseller_pricing.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = reseller_pricing.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=reseller_pricing.note)) AS accountid", "reseller_pricing", $where, "note", "desc", $limit, $start); |
120 | 119 | } |
@@ -123,8 +122,7 @@ discard block |
||
123 | 122 | $query = $this->db_model->countQuery("*", "reseller_pricing", $where); |
124 | 123 | } |
125 | 124 | |
126 | - } |
|
127 | - else |
|
125 | + } else |
|
128 | 126 | { |
129 | 127 | $this->db_model->build_search('did_list_search'); |
130 | 128 | if ($flag) { |
@@ -175,10 +173,11 @@ discard block |
||
175 | 173 | $this->db->where("country", ucfirst($field_value)); |
176 | 174 | $query = $this->db->get('countrycode'); |
177 | 175 | $data = $query->result(); |
178 | - if ($query->num_rows > 0) |
|
179 | - return $data[0]->id; |
|
180 | - else |
|
181 | - return ''; |
|
176 | + if ($query->num_rows > 0) { |
|
177 | + return $data[0]->id; |
|
178 | + } else { |
|
179 | + return ''; |
|
180 | + } |
|
182 | 181 | } |
183 | 182 | |
184 | 183 | function bulk_insert_dids($field_value) { |
@@ -250,10 +249,11 @@ discard block |
||
250 | 249 | $this->db->where("id", $number); |
251 | 250 | $this->db->or_where("number", $number); |
252 | 251 | $query = $this->db->get("dids"); |
253 | - if ($query->num_rows() > 0) |
|
254 | - return $query->row_array(); |
|
255 | - else |
|
256 | - return false; |
|
252 | + if ($query->num_rows() > 0) { |
|
253 | + return $query->row_array(); |
|
254 | + } else { |
|
255 | + return false; |
|
256 | + } |
|
257 | 257 | } |
258 | 258 | function edit_did_reseller($did_id,$post) { |
259 | 259 | $accountinfo = $this->session->userdata('accountinfo'); |
@@ -34,8 +34,9 @@ discard block |
||
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 |
||
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 |
||
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")); |
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")); |
177 | 178 | } |
178 | 179 | $where = array('id' => $id); |
@@ -181,7 +182,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
23 | 23 | ############################################################################### |
24 | 24 | |
25 | -if (!defined('BASEPATH')) |
|
26 | - exit('No direct script access allowed'); |
|
25 | +if (!defined('BASEPATH')) { |
|
26 | + exit('No direct script access allowed'); |
|
27 | +} |
|
27 | 28 | |
28 | 29 | class did_form { |
29 | 30 | |
@@ -35,11 +36,10 @@ discard block |
||
35 | 36 | if ($id != 0){ |
36 | 37 | if($parent_id > 0){ |
37 | 38 | $account_dropdown = array('Reseller', array('name' => 'parent_id', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"1", "deleted" => "0","status" => "0")); |
38 | - }else{ |
|
39 | + } else{ |
|
39 | 40 | if($account_id > 0){ |
40 | 41 | $account_dropdown = array('Account ', array('name' => 'accountid', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0,3", "deleted" => "0","status" => "0")); |
41 | - } |
|
42 | - else{ |
|
42 | + } else{ |
|
43 | 43 | $account_dropdown = array('Account', 'accountid', 'SELECT', '',array("name"=>"accountid","rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3","deleted" => "0","status" => "0" )); |
44 | 44 | } |
45 | 45 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | if($csv_key == 0){ |
102 | 102 | $cnt++; |
103 | 103 | echo "<th>".ucfirst($field_name)."</th>"; |
104 | - }else{ |
|
104 | + } else{ |
|
105 | 105 | echo "<td class='portlet-content'>".$field_val."</td>"; |
106 | 106 | } |
107 | 107 | } |
@@ -46,14 +46,15 @@ discard block |
||
46 | 46 | $this->db->where($where); |
47 | 47 | if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){ |
48 | 48 | $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']); |
49 | - }else{ |
|
49 | + } else{ |
|
50 | 50 | $this->db->order_by("callstart desc"); |
51 | 51 | } |
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 | $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid'); |
56 | - }else { |
|
57 | + } else { |
|
57 | 58 | $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids'); |
58 | 59 | } |
59 | 60 | $result = $this->db->get('cdrs'); |
@@ -74,12 +75,13 @@ discard block |
||
74 | 75 | $this->db->where($where); |
75 | 76 | if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){ |
76 | 77 | $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']); |
77 | - }else{ |
|
78 | + } else{ |
|
78 | 79 | $this->db->order_by("callstart desc"); |
79 | 80 | } |
80 | 81 | if ($flag) { |
81 | - if (!$export) |
|
82 | - $this->db->limit($limit, $start); |
|
82 | + if (!$export) { |
|
83 | + $this->db->limit($limit, $start); |
|
84 | + } |
|
83 | 85 | $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype'); |
84 | 86 | } else { |
85 | 87 | $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids'); |
@@ -105,14 +107,15 @@ discard block |
||
105 | 107 | $this->db->where($where); |
106 | 108 | if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){ |
107 | 109 | $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']); |
108 | - }else{ |
|
110 | + } else{ |
|
109 | 111 | $this->db->order_by("callstart desc"); |
110 | 112 | } |
111 | 113 | if ($flag) { |
112 | - if (!$export) |
|
113 | - $this->db->limit($limit, $start); |
|
114 | + if (!$export) { |
|
115 | + $this->db->limit($limit, $start); |
|
116 | + } |
|
114 | 117 | $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost'); |
115 | - }else { |
|
118 | + } else { |
|
116 | 119 | $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost'); |
117 | 120 | } |
118 | 121 | $result = $this->db->get('cdrs'); |
@@ -159,10 +162,11 @@ discard block |
||
159 | 162 | $accountinfo = $this->session->userdata('accountinfo'); |
160 | 163 | $where['payment_by']=$accountinfo['type']==1 ? $accountinfo['id']:-1; |
161 | 164 | if ($flag) { |
162 | - if($export) |
|
163 | - $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","",""); |
|
164 | - else |
|
165 | - $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start); |
|
165 | + if($export) { |
|
166 | + $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","",""); |
|
167 | + } else { |
|
168 | + $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start); |
|
169 | + } |
|
166 | 170 | } else { |
167 | 171 | $query = $this->db_model->countQuery("*", "payments", $where); |
168 | 172 | } |
@@ -38,8 +38,9 @@ discard block |
||
38 | 38 | $this->fpdf = new PDF('P', 'pt'); |
39 | 39 | $this->fpdf->initialize('P', 'mm', 'A4'); |
40 | 40 | |
41 | - if ($this->session->userdata('user_login') == FALSE) |
|
42 | - redirect(base_url() . '/astpp/login'); |
|
41 | + if ($this->session->userdata('user_login') == FALSE) { |
|
42 | + redirect(base_url() . '/astpp/login'); |
|
43 | + } |
|
43 | 44 | } |
44 | 45 | |
45 | 46 | function customerReport() { |
@@ -272,7 +273,7 @@ discard block |
||
272 | 273 | "", |
273 | 274 | "", |
274 | 275 | ); |
275 | - }else{ |
|
276 | + } else{ |
|
276 | 277 | $customer_array[] = array("Date", "CallerID", "Called Number", "Code", "Destination", "Duration", "Debit($currency)", "Cost($currency)", "Disposition", "Account","Rate Group", "Call Type"); |
277 | 278 | foreach ($query->result_array() as $value) { |
278 | 279 | $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ? |
@@ -642,13 +643,15 @@ discard block |
||
642 | 643 | :null; |
643 | 644 | |
644 | 645 | $json_data = array(); |
645 | - if(!empty($like_str)) |
|
646 | - $this->db->where($like_str); |
|
646 | + if(!empty($like_str)) { |
|
647 | + $this->db->where($like_str); |
|
648 | + } |
|
647 | 649 | $count_all = $this->reports_model->users_cdrs_list(false, $accountid, $accounttype, "", ""); |
648 | 650 | $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']); |
649 | 651 | $json_data = $paging_data["json_paging"]; |
650 | - if(!empty($like_str)) |
|
651 | - $this->db->where($like_str); |
|
652 | + if(!empty($like_str)) { |
|
653 | + $this->db->where($like_str); |
|
654 | + } |
|
652 | 655 | $query = $this->reports_model->users_cdrs_list(true, $accountid, $accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]); |
653 | 656 | $grid_fields = json_decode($this->reports_form->build_report_list_for_user($accounttype)); |
654 | 657 | $json_data['rows'] = $this->form->build_grid($query, $grid_fields); |
@@ -806,7 +809,7 @@ discard block |
||
806 | 809 | $after_balance, |
807 | 810 | $description, |
808 | 811 | )); |
809 | - }else{ |
|
812 | + } else{ |
|
810 | 813 | $json_data['rows'][] = array('cell' => array( |
811 | 814 | $date, |
812 | 815 | $invoice_num, |
@@ -833,7 +836,7 @@ discard block |
||
833 | 836 | } |
834 | 837 | if ($this->session->userdata('logintype') == 1) { |
835 | 838 | $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-'); |
836 | - }else{ |
|
839 | + } else{ |
|
837 | 840 | $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-'); |
838 | 841 | |
839 | 842 | } |
@@ -870,14 +873,16 @@ discard block |
||
870 | 873 | OR 'credit' like '%$instant_search%' |
871 | 874 | OR 'description' like '%$instant_search%')" |
872 | 875 | :null; |
873 | - if(!empty($like_str)) |
|
874 | - $this->db->where($like_str); |
|
876 | + if(!empty($like_str)) { |
|
877 | + $this->db->where($like_str); |
|
878 | + } |
|
875 | 879 | $count_all = $this->reports_model->get_customer_charge_list(false,$accountid); |
876 | 880 | |
877 | 881 | $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']); |
878 | 882 | $json_data = $paging_data["json_paging"]; |
879 | - if(!empty($like_str)) |
|
880 | - $this->db->where($like_str); |
|
883 | + if(!empty($like_str)) { |
|
884 | + $this->db->where($like_str); |
|
885 | + } |
|
881 | 886 | $query = $this->reports_model->get_customer_charge_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]); |
882 | 887 | $result= $query->result_array(); |
883 | 888 | $query1 = $this->reports_model->get_customer_charge_list(true,$accountid,'',''); |
@@ -929,7 +934,7 @@ discard block |
||
929 | 934 | $after_balance, |
930 | 935 | $description, |
931 | 936 | )); |
932 | - }else{ |
|
937 | + } else{ |
|
933 | 938 | $json_data['rows'][] = array('cell' => array( |
934 | 939 | $date, |
935 | 940 | $invoice_num, |
@@ -955,7 +960,7 @@ discard block |
||
955 | 960 | } |
956 | 961 | if ($this->session->userdata('logintype') == 1) { |
957 | 962 | $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-'); |
958 | - }else{ |
|
963 | + } else{ |
|
959 | 964 | $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-'); |
960 | 965 | |
961 | 966 | } |
@@ -971,13 +976,15 @@ discard block |
||
971 | 976 | OR notes like '%$instant_search%' |
972 | 977 | )" |
973 | 978 | :null; |
974 | - if(!empty($like_str)) |
|
975 | - $this->db->where($like_str); |
|
979 | + if(!empty($like_str)) { |
|
980 | + $this->db->where($like_str); |
|
981 | + } |
|
976 | 982 | $count_all = $this->reports_model->get_customer_refillreport(false,$accountid); |
977 | 983 | $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']); |
978 | 984 | $json_data = $paging_data["json_paging"]; |
979 | - if(!empty($like_str)) |
|
980 | - $this->db->where($like_str); |
|
985 | + if(!empty($like_str)) { |
|
986 | + $this->db->where($like_str); |
|
987 | + } |
|
981 | 988 | $query = $this->reports_model->get_customer_refillreport(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]); |
982 | 989 | $grid_fields = json_decode($this->reports_form->build_refillreport_for_customer()); |
983 | 990 | $json_data['rows'] = $this->form->build_grid($query, $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 Reports_form { |
27 | 28 | function __construct() { |
@@ -56,8 +57,7 @@ discard block |
||
56 | 57 | array('Call Type', 'calltype', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_calltype'), |
57 | 58 | array('', 'HIDDEN', 'ajax_search', '1', '', '', ''), |
58 | 59 | array('', 'HIDDEN', 'advance_search', '1', '', '', '')); |
59 | - } |
|
60 | - else |
|
60 | + } else |
|
61 | 61 | { |
62 | 62 | $form['forms'] = array("", array('id' => "cdr_customer_search")); |
63 | 63 | $form['Search'] = array( |
@@ -190,8 +190,7 @@ discard block |
||
190 | 190 | $recording, |
191 | 191 | )); |
192 | 192 | |
193 | - } |
|
194 | - else{ |
|
193 | + } else{ |
|
195 | 194 | $account_info = $accountinfo = $this->CI->session->userdata('accountinfo'); |
196 | 195 | $currency_id=$account_info['currency_id']; |
197 | 196 | $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id); |
@@ -348,7 +347,7 @@ discard block |
||
348 | 347 | $account_data = $this->CI->session->userdata("accountinfo"); |
349 | 348 | $loginid = $account_data['id']; |
350 | 349 | |
351 | - }else{ |
|
350 | + } else{ |
|
352 | 351 | $loginid = "0"; |
353 | 352 | } |
354 | 353 | if($logintype==0 || $logintype==3){ |
@@ -535,7 +534,7 @@ discard block |
||
535 | 534 | array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"), |
536 | 535 | array(gettext("Description"), "300", "description", "", "", "","","true","center"), |
537 | 536 | )); |
538 | - }else{ |
|
537 | + } else{ |
|
539 | 538 | $grid_field_arr = json_encode(array( |
540 | 539 | array("Created Date", "120", "created_date", "", "", "","","true","center"), |
541 | 540 | array("Invoice Number", "120", "created_date", "", "", "","","true","center"), |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $this->opensips_db->limit($limit,$start); |
39 | 39 | if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){ |
40 | 40 | $this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']); |
41 | - }else{ |
|
41 | + } else{ |
|
42 | 42 | $this->opensips_db->order_by('username','asc'); |
43 | 43 | } |
44 | 44 | $query = $this->opensips_db->get("subscriber"); |
@@ -62,8 +62,9 @@ discard block |
||
62 | 62 | OR effective_caller_id_number like '%$instant_search%' |
63 | 63 | )" |
64 | 64 | :null; |
65 | - if(!empty($like_str)) |
|
66 | - $this->opensips_db->where($like_str); |
|
65 | + if(!empty($like_str)) { |
|
66 | + $this->opensips_db->where($like_str); |
|
67 | + } |
|
67 | 68 | $this->opensips_db->where($where); |
68 | 69 | if ($flag) { |
69 | 70 | $this->opensips_db->limit($limit,$start); |
@@ -72,15 +73,13 @@ discard block |
||
72 | 73 | if($result->num_rows() > 0){ |
73 | 74 | if($flag){ |
74 | 75 | return $result; |
75 | - } |
|
76 | - else{ |
|
76 | + } else{ |
|
77 | 77 | return $result->num_rows(); |
78 | 78 | } |
79 | - }else{ |
|
79 | + } else{ |
|
80 | 80 | if($flag){ |
81 | 81 | $result=(object)array('num_rows'=>0); |
82 | - } |
|
83 | - else{ |
|
82 | + } else{ |
|
84 | 83 | $result=0; |
85 | 84 | } |
86 | 85 | return $result; |
@@ -93,7 +92,7 @@ discard block |
||
93 | 92 | $this->opensips_db->limit( $limit,$start); |
94 | 93 | if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){ |
95 | 94 | $this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']); |
96 | - }else{ |
|
95 | + } else{ |
|
97 | 96 | $this->opensips_db->order_by('setid','asc'); |
98 | 97 | } |
99 | 98 | $query = $this->opensips_db->get("dispatcher"); |