iNextrix / ASTPP

web_interface/astpp/application/modules/user/models/user_model.php

Braces +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
 		if ($flag) {
 		   if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 			$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		   }else{
+		   } else{
 			$this->db->order_by('invoice_date', 'desc');
 		   }
 		}
@@ -307,10 +307,11 @@ 
 		$this->db->where($where);
 		$this->db->order_by("callstart desc");
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$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');
 		}
 		$result = $this->db->get($table_name);
@@ -387,15 +388,13 @@ 
 		if($result->num_rows() > 0){
 	  if($flag){
 		return $result;
-	  }
-	  else{
+	  } else{
 		return $result->num_rows();
 	  }
-		}else{
+		} else{
 		 if($flag){
 		  $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $result=0;
 	  }
 	  return $result;
@@ -452,7 +451,7 @@ 
 		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-		}else{
+		} else{
 	   		 $where=array('id'=> $accountid);
 	}      
 		$query = $this->db_model->getSelect("*","invoice_conf",$where);
@@ -475,10 +474,11 @@ 
 		$this->db->where($where);
 		$this->db->order_by("callstart","desc");
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
 		}
 		$result = $this->db->get('cdrs');

web_interface/astpp/application/modules/user/controllers/payment.php

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	   if($system_config["paypal_mode"]==0){
 		   $data["paypal_url"] = $system_config["paypal_url"];
 		   $data["paypal_email_id"] = $system_config["paypal_id"];
-	   }else{
+	   } else{
 		   $data["paypal_url"] = $system_config["paypal_sandbox_url"];
 		   $data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
 	   }

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

Braces +33 added lines, -41 removed lines

@@ -36,8 +36,9 @@ 
 	}
 
 	function index() {
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . 'login/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . 'login/login');
+		}
 		$data['page_title'] = 'Dashboard';
 		$this->load->view('view_user_dashboard', $data);
 	}
@@ -266,7 +267,7 @@ 
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
 					redirect(base_url() . "user/user_didlist/");
 				}
-		}else{
+		} else{
 				$this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
 				redirect(base_url() . "user/user_didlist/");
 		}
@@ -298,7 +299,7 @@ 
 			$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
 			redirect(base_url() . "user/user_didlist/");
 		}
-		}else{
+		} else{
 	  $this->session->set_flashdata('astpp_notification', 'DID not found.');
 	  redirect(base_url() . "user/user_didlist/");
 		}
@@ -355,8 +356,9 @@ 
 				$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
 				$markup = ($markup > 0)?$markup:1;
 				$action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-				if($account_data['type']!=3)
-					$action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+				if($account_data['type']!=3) {
+									$action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+				}
 			}
 			$this->session->set_userdata('user_rates_list_search', $action);
 		}
@@ -695,7 +697,7 @@ 
 					$this->session->set_userdata('accountinfo', $result[0]);
 					$this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
 					redirect(base_url() . 'user/user_myprofile/');
-				}else{
+				} else{
 					$this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
 				}
 			}
@@ -729,7 +731,7 @@ 
 				$this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
 				redirect(base_url() . 'user/user_change_password/');
 			}
-		}else{
+		} else{
 			$data_array['id']=$accountinfo['id'];
 			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
 		}
@@ -745,7 +747,7 @@ 
 		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
 		if($accountinfo['type'] == 1){
 			$this->load->view('view_reseller_refill_report', $data);
-		}else{
+		} else{
 			$this->load->view('view_user_refill_report', $data);
 		}
 	}
@@ -829,19 +831,18 @@ 
 			} else {
 				$payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
 			}
-	   }else{
+	   } else{
 				$payment = '';
 	   }
 			if($value['generate_type'] == 1){
 		$invoice_type='Manually';
-	   }else{
+	   } else{
 		$invoice_type='Automatically';
 	   } 
 	   
 	   if($value['type'] == 'R'){
 		$icon = '<div class="flx_font flx_magenta">R</div>';
-		}
-		else
+		} else
 		{		
 			$icon = '<div class="flx_font flx_drk_pink">I</div>';
 			
@@ -904,7 +905,7 @@ 
 			$amount = $this->input->post("value",true);
 	   $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
 	   echo number_format($amount,2);
-		}else{
+		} else{
 			$this->payment->index();
 		}
 	}
@@ -1092,7 +1093,7 @@ 
 	  $this->db->where('reseller_pricing.note','dids.number',false);
 	  $this->db->where('reseller_pricing.reseller_id',$accountinfo['reseller_id']);
 	  $this->db->from('dids,reseller_pricing');
-		}else{
+		} else{
 	  $this->db->where('parent_id',0);
 	  $this->db->where('accountid',0);
 	  $this->db->select('id,number,setup,monthlycost');
@@ -1393,7 +1394,7 @@ 
 									);
 				$this->db->insert("ani_map", $insert_arr);
 				$this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
-				}else{
+				} else{
 					 $this->session->set_flashdata('astpp_notification', 'Please Enter Caller ID value.');
 				}
 			} else {
@@ -1538,7 +1539,7 @@ 
 		if($action=="GET_AMT"){
 			$amount = $this->input->post("value",true);
 			$this->payment->convert_amount($amount);
-		}else{
+		} else{
 			$this->payment->index();
 		}
 	}
@@ -1573,34 +1574,25 @@ 
 				$minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
 				if ($post_array['toaccountid'] == $account_info['number']) {
 					$this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
-				}
-				elseif ($reseller_id != $account_info['reseller_id']) {
+				} elseif ($reseller_id != $account_info['reseller_id']) {
 					$this->session->set_flashdata('astpp_notification', 'You can only transfer fund in same level account.');
-				}
-				elseif ($post_array['toaccountid'] == '') {
+				} elseif ($post_array['toaccountid'] == '') {
 					$this->session->set_flashdata('astpp_notification', 'Please enter To account number.');
-				}
-				elseif (empty($post_array['credit'])) {
+				} elseif (empty($post_array['credit'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter a amount.');
-				}
-				elseif ($post_array['credit'] > $balance) {
+				} elseif ($post_array['credit'] > $balance) {
 					$this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
-				}
-				elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
+				} elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
-				}
-				elseif ($post_array['credit'] < 0) {
+				} elseif ($post_array['credit'] < 0) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
-				}
-				elseif ($minimum_fund['value'] >= $post_array['credit']) {
+				} elseif ($minimum_fund['value'] >= $post_array['credit']) {
 					$this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
-				}
-				elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
+				} elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
-				}
-				elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
+				} elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
-				}else{
+				} else{
 					$from['id'] = $post_array['id'];
 					$from['account_currency'] = $post_array['account_currency'];
 					$from['accountid'] = $post_array['fromaccountid'];
@@ -1635,7 +1627,7 @@ 
 						$this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
 					}
 				}
-			}else{
+			} else{
 		$this->session->set_flashdata('astpp_notification', 'Account number not found.');
 			}
 			} else {
@@ -1727,7 +1719,7 @@ 
 						$this->user_model->user_opensips_edit($add_array, $add_array['id']);
 						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 					   exit;
 				}
@@ -1744,7 +1736,7 @@ 
 						$this->user_model->user_opensips_add($add_array);
 						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 						exit;
 				}
@@ -1765,10 +1757,10 @@ 
 				$auth_flag = $auth_flag->num_rows();
 				if($auth_flag == 0){
 					return "TRUE";
-				}else{
+				} else{
 					return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
 				}
-		}else{
+		} else{
 		  return array("username_error"=>"User name is required field.");
 		}
 		return "0";

web_interface/astpp/application/modules/user/libraries/user_form.php

Braces +5 added lines, -4 removed lines

@@ -78,10 +78,11 @@
 	}
    
 	function get_userprofile_form_fields($dataArr = false) {
-		if ($dataArr['id'] > 0)
-			$val = 'accounts.email.' . $dataArr['id'];
-		else
-			$val = 'accounts.email';
+		if ($dataArr['id'] > 0) {
+					$val = 'accounts.email.' . $dataArr['id'];
+		} else {
+					$val = 'accounts.email';
+		}
 			$uname = $this->CI->common->find_uniq_rendno(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
 			$password = $this->CI->common->generate_password();
 			$logintype=$this->CI->session->userdata('logintype');

web_interface/astpp/application/modules/dashboard/models/dashboard_model.php

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
 		$this->db->where('callstart >=',$start_date." 00:00:00");
 		$this->db->where('callstart <=',$end_date." 23:59:59");
 		$this->db->where('reseller_id',$parent_id);
-		if($group_flag)
-		$this->db->group_by("DAY(callstart)");
+		if($group_flag) {
+				$this->db->group_by("DAY(callstart)");
+		}
 		$result=$this->db->get($table);
 	return $result;
 	}

web_interface/astpp/application/modules/invoices/models/invoices_model.php

Braces +10 added lines, -14 removed lines

@@ -50,8 +50,7 @@ 
 		$this->db->where_in('accountid',$acc_arr);
 		if($flag){
 		  $this->db->select('*');
-		}
-		else{
+		} else{
 		  $this->db->select('count(id) as count');
 		}
 		if($flag){
@@ -63,21 +62,20 @@ 
  		//echo $this->db->last_query();exit;    
 		if($flag){
 		  return $result;
-		}else{
+		} else{
 		  $result=$result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
+	  } else{
 		  if($flag){
 		  $query=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $query=0;
 	  }
  	  
 	  return $query;
 		}
-	}else{
+	} else{
           
 		 if($result->num_rows() >0){
 /****
@@ -93,8 +91,7 @@ 
          
 		 if($flag){
 	  $this->db->select('*');
-		 }
-		 else{
+		 } else{
 		  $this->db->select('count(id) as count');
 		 }
 		 if($flag){
@@ -107,18 +104,17 @@ 
 		  if($flag){
 	        
 		return $result;
-		  }else{
+		  } else{
 		$result=$result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
+		 } else{
 		  if($flag){
 	          
 		  $query=(object)array('num_rows'=>0);
 		 // echo '<pre>'; print_r($query); 	
-		  }
-		  else{
+		  } else{
 		  $query=0;
 		  }
 	return $query;
@@ -193,7 +189,7 @@ 
 		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-		}else{
+		} else{
 	   		 $where=array('id'=> $accountid);
 	}      
 		$query = $this->db_model->getSelect("*","invoice_conf",$where);

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

Braces +76 added lines, -68 removed lines

@@ -37,8 +37,9 @@ 
 		$this->load->library('fpdf');
 		$this->load->library('pdf');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 
@@ -66,7 +67,7 @@ 
 		 $result_query = $this->invoices_model->get_invoice_list(true,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 	  if($logintype == -1){
 		 $currency_id = Common_model::$global_config['system_config']['base_currency'];
-	  }else{
+	  } else{
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $login_info["currency_id"]);
 		 $currency_id = $accountdata["currency_id"];
 	  }
@@ -85,7 +86,7 @@ 
 		  $duedate = strtotime($value['due_date']);
 		  if($value['type'] == 'I'){
 		  $due_date =date("Y-m-d",$duedate);
-		  }else{
+		  } else{
 		  $due_date='';
 		  }
 		  $outstanding = $value['amount'];
@@ -97,7 +98,7 @@ 
 			//echo '<pre>'; print_r($invoice_total_query); 
 			if($value['type'] == 'I'){
 			$outstanding -= $this->common->currency_decimal($invoice_total_query[0]['credit']);
-			}else{
+			} else{
 			$outstanding='';
 			}
 			$last_payment_date = $invoice_total_query[0]['created_date'];
@@ -105,10 +106,10 @@ 
 			if($last_payment_date ){
 			$payment_date=strtotime( $last_payment_date);
 			$payment_last=date("Y-m-d",$payment_date);
-			}else{
+			} else{
 			 $payment_last='';
 			}
-		 }else{
+		 } else{
 		  $payment_last='';
 		  }
             
@@ -119,7 +120,7 @@ 
 		  $id=$accountinfo['id'];
 		  if($accountinfo['type'] == 1){
 		  $query ="select sum(amount) as grand_total from invoices where reseller_id='$id'";
-		  }else{
+		  } else{
 		  $query ="select sum(amount) as grand_total from invoices where reseller_id='0'";
 		  }
 		  $ext_query=$this->db->query($query);
@@ -132,7 +133,7 @@ 
           
 		  if($accountinfo['type'] == 1){
 		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where reseller_id='$id'";
-		  }else{
+		  } else{
 		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where reseller_id='0'";
 		  }
 		  $credit_query=$this->db->query($invoice_query);
@@ -147,28 +148,28 @@ 
 		if($value['confirm'] ==0){
 			if($value['generate_type'] ==1){
 					  $payment = '<a href="'. base_url() .'invoices/invoice_manually_edit/' . $value['id'] . '" class="btn btn-royelblue btn-sm"  title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>';
-			}else{
+			} else{
 					  $payment = '<a href="'. base_url() .'invoices/invoice_automatically_edit/' . $value['id'] . '" class="btn btn-royelblue btn-sm"  title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>';
 			}
   				$id=$value['id'];       
 				$delete_button="<a onclick='invoice_delete($id)' class='btn btn-royelblue btn-sm'  title='Delete' ><i class='fa fa-trash fa-fw'></i></a>&nbsp";
 
-		}else{
+		} else{
 					 if($outstanding > 0){
 				$payment = '<a style="padding: 0 8px;" href="'. base_url() .'invoices/invoice_summary/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</i></a>';
-					 }else{
+					 } else{
 				$payment = '<button style="padding: 0 17px;" type="button"  class="btn btn-success">Paid</button>';
 					 }
 				 $delete_button="&nbsp";
   		   }		
-			 }else{
+			 } else{
 			   $payment = '';
 		   }
 		   $account_arr = $this->db_model->getSelect('first_name,number,last_name','accounts', array('id'=>$value['accountid']));
 		   $account_array = $account_arr->result_array();
 			if($value['generate_type'] == 1){
 		$invoice_type='Manually';
-	   }else{
+	   } else{
 		$invoice_type='Automatically';
 	   }    
 	   if($value['deleted'] == 1){
@@ -236,7 +237,7 @@ 
 		if($value['item_type'] == 'TAX'){
 			$data['total_tax_dis'][$taxi]=$value['debit'];
 			$taxi++;
-		}else{
+		} else{
 			 if($i >= 5){
 	   			 $data['row_count']=$i+1;
 			 }
@@ -285,7 +286,7 @@ 
 		if($system_config["paypal_mode"]==0){
 			$data["paypal_url"] = $system_config["paypal_url"];
 			$data["paypal_email_id"] = $system_config["paypal_id"];
-		}else{
+		} else{
 			$data["paypal_url"] = $system_config["paypal_sandbox_url"];
 			$data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
 		 }
@@ -419,7 +420,7 @@ 
 		if($system_config["paypal_mode"]==0){
 			$data["paypal_url"] = $system_config["paypal_url"];
 			$data["paypal_email_id"] = $system_config["paypal_id"];
-		}else{
+		} else{
 			$data["paypal_url"] = $system_config["paypal_sandbox_url"];
 			$data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
 		 }
@@ -432,10 +433,10 @@ 
 	if($account_data['type'] == -1){
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		  $data["to_currency"] = $accountdata["currency_id"];
-	}elseif($account_data['type'] == 1){
+	} elseif($account_data['type'] == 1){
 		$accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		$data["to_currency"] = $accountdata["currency_id"];
-	}else{
+	} else{
 		$accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		$data["to_currency"] = $accountdata["currency_id"];
 	} 
@@ -739,7 +740,7 @@ 
 		if($system_config["paypal_mode"]==0){
 			$data["paypal_url"] = $system_config["paypal_url"];
 			$data["paypal_email_id"] = $system_config["paypal_id"];
-		}else{
+		} else{
 			$data["paypal_url"] = $system_config["paypal_sandbox_url"];
 			$data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
 		 }
@@ -751,10 +752,10 @@ 
 	  if($account_data['type'] == -1){
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		  $data["to_currency"] = $accountdata["currency_id"];
-	  }elseif($account_data['type'] == 1){
+	  } elseif($account_data['type'] == 1){
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		  $data["to_currency"] = $accountdata["currency_id"];
-	  }else{
+	  } else{
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		  $data["to_currency"] = $accountdata["currency_id"];
 	  }
@@ -778,13 +779,13 @@ 
 			$data['notify_url'] = base_url() . "invoices/invoice_list_get_data/";
 			if($account_data['type'] =='1'){
 			$data['response_url'] = base_url() . "invoices/invoice_list_responce/";
-			}else{
+			} else{
 			$data['response_url'] = base_url() . "user/user_list_responce/";
 			}
 			$data['sucess_url'] = base_url() . "invoices/invoice_list_sucess/";
 	  	}
       	
-	  	}else{
+	  	} else{
       	
 	  	redirect(base_url() . 'dashboard/');
 	  	}
@@ -847,7 +848,7 @@ 
 		  $data = array('status' => '0');
 		  $this->db->update("invoices", $data);
 		 // echo $this->db->last_query(); exit;
-		  }else{
+		  } else{
 		  $this->db->where("id", $invoice_id);        
 		  $data = array('status' => '2');
 		  $this->db->update("invoices", $data);
@@ -894,7 +895,7 @@ 
 );        // echo '<pre>'; print_r( $tax_array); exit;
 	   	 $this->db->insert("invoice_details",$tax_array);
          
-		 }else{
+		 } else{
          
 		//  echo 'else'; exit;
 		 $actual_amount=$debit-$amount;
@@ -902,11 +903,11 @@ 
        
 			 $this->db->insert("invoice_details",$tax_array);
 		 }
-	 }else{
+	 } else{
 	  if($logintype = 0){
 		  $this->session->set_flashdata('astpp_notification', 'Invoice payment amount should be higher then the invoice amount.');
 		  redirect(base_url().'user/user_invoice_payment/'.$invoice_id);
-		  }else{
+		  } else{
 		  $this->session->set_flashdata('astpp_notification', 'Invoice payment amount should be higher then the invoice amount.');
 		  redirect(base_url().'invoices/invoice_summary/'.$invoice_id);
 		  }
@@ -928,7 +929,7 @@ 
 	 if($logintype = '1'){
 		 $this->session->set_flashdata('astpp_errormsg', 'Invoice payment done successfully!');
 	   redirect(base_url() . 'invoices/invoice_list/');
-	   }else{
+	   } else{
 		$this->session->set_flashdata('astpp_errormsg', 'Invoice payment done successfully!');
 	   redirect(base_url() . 'user/user_invoices_list/');
 	   }
@@ -969,7 +970,7 @@ 
 		  $data = array('status' => '0');
 		  $this->db->update("invoices", $data);
 		 // echo $this->db->last_query(); exit;
-		  }else{
+		  } else{
 		  $this->db->where("id", $invoice_id);        
 		  $data = array('status' => '2');
 		  $this->db->update("invoices", $data);
@@ -988,7 +989,7 @@ 
 		$this->db->insert("invoice_details",$tax_array);
      
       
-		 }else{
+		 } else{
          
 		  $this->session->set_flashdata('astpp_notification', 'Invoice payment amount should be higher then the invoice amount.');
 		  redirect(base_url().'invoices/invoice_summary/'.$invoice_id);
@@ -1136,7 +1137,7 @@ 
 			if($last_payment_date ){
 			$payment_date=strtotime( $last_payment_date);
 			$payment_last=date("d/m/Y",$payment_date);
-			}else{
+			} else{
 			 $payment_last='';
 			}
          
@@ -1169,10 +1170,10 @@ 
 		if($value['type'] == 'R'){
 		$payment ='';	
 		$outstanding=0;	
-		}else{
+		} else{
 			if($outstanding > 0){
 			  $payment = '<a style="padding: 0 8px;" href="'. base_url() .'invoices/invoice_summary/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</i></a>';
-			}else{
+			} else{
 			  $payment = ' <button style="padding: 0 8px;" type="button"  class="btn btn-success">Paid</button>';
 			}
 			}
@@ -1244,7 +1245,7 @@ 
 			if($last_payment_date ){
 			$payment_date=strtotime( $last_payment_date);
 			$payment_last=date("d/m/Y",$payment_date);
-			}else{
+			} else{
 			 $payment_last='';
 			}
          
@@ -1277,7 +1278,7 @@ 
 		 $download='<a href="'. base_url() .'/user/user_invoice_download/' . $value['id'].'/00'.$value['invoice_prefix'].$value['invoiceid'].'" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp';
 		 if($outstanding > 0){
 		 $payment = ' <a style="padding: 0 8px;" href="'. base_url() .'user/user_invoice_payment/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</a>';
-}else{
+} else{
 
 $payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
 }          $account_arr = $this->db_model->getSelect('first_name,number,last_name','accounts', array('id'=>$value['accountid']));
@@ -1384,7 +1385,7 @@ 
 	  if($type=='R'){
 		   $this->receipt_download($invoiceid);
 	  }
-	 }else{
+	 } else{
 	  redirect(base_url() . 'invoices/invoice_list/');
 	 }
 	}
@@ -1410,7 +1411,7 @@ 
  		 	 if( $to_date > $feture_date){
  		 	 $this->session->set_flashdata('astpp_notification', 'To date should not be greater than current date.');  
 			 redirect(base_url()."invoices/invoice_list/");
- 		 	 }else{
+ 		 	 } else{
 			 $todate=$data['todate'].' '.'23:59:59';
 			 $from_date=$data['fromdate'].' '.'00:00:01';
 			 $accountid=$data['accountid'];
@@ -1440,18 +1441,18 @@ 
 		$last_invoice_ID = $this->get_invoice_date("invoiceid");
 		if($last_invoice_ID && $last_invoice_ID > 0){
 			$last_invoice_ID = ($last_invoice_ID+1);
-		}else{
+		} else{
 			$last_invoice_ID = $invoice_conf['invoice_start_from'];
 		}
 		$last_invoice_ID =str_pad($last_invoice_ID,(strlen($last_invoice_ID)+4),'0',STR_PAD_LEFT);
 		if($accountdata['posttoexternal'] == 1){
 	   			$balance = ($accountdata['credit_limit']-$accountdata['balance']);
-		}else{
+		} else{
 	   			$balance = $accountdata['balance'];
 		}
 		if($accountdata['invoice_interval'] > 0){
 			$due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$accountdata['invoice_interval']." days"));
-		}else{
+		} else{
 			$due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
 		}	
 		$invoice_data = array("accountid"=>$accountdata['id'],"invoice_prefix" =>$invoice_conf['invoice_prefix'],"invoiceid"=>$last_invoice_ID,"reseller_id"=>   
@@ -1585,13 +1586,13 @@ 
 			  $data['description']=$value['description'];
 			  if($value['item_type'] == 'Refill'){
 				  $data['debit']=$value['credit'];
-			  }else{
+			  } else{
 				  $data['debit']=$value['debit'];
 			  }	   
 			  $created_date=$value['created_date'];
 			  $invoicedata['invoiceid']=$value['invoiceid'];
 		  }
-		  }else{
+		  } else{
 		$query="select item_type,description,created_date,invoiceid,debit,credit from invoice_details where invoiceid = ".$invoiceid." And item_type='SUBCHRG' Group By item_type"; 	
 		$invoice_total_query=$this->db->query($query);
 		if($invoice_total_query ->num_rows() > 0) {
@@ -1611,15 +1612,16 @@ 
 	  }
 		  $data['accountinfo'] = $accountdata;
 		 //Get invoice header information
-		if($accountdata['reseller_id']=='0')
-		  $accountid = '1';
-		else
-			$accountid = $accountdata['reseller_id'];
+		if($accountdata['reseller_id']=='0') {
+				  $accountid = '1';
+		} else {
+					$accountid = $accountdata['reseller_id'];
+		}
 			$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
 			$invoiceconf = $invoiceconf->result_array();
 			if(!empty($invoiceconf)){
 				$data['invoiceconf'] = $invoiceconf[0];
-			}else{
+			} else{
 			$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> "1"));
 			$invoiceconf = $invoiceconf->result_array();
 			$data['invoiceconf'] = $invoiceconf[0];
@@ -1630,20 +1632,26 @@ 
 	  // echo '<pre>'; print_r($accountdata); exit;
 		//FOR the Customer Address
 		$customer_address="<div style='font-size:12px;' >";
-		if ( $accountdata['company_name'] != "")
-			$customer_address .= $accountdata['company_name'] . "<br/>";
-		if ( $accountdata['address_1'] != "")
-			$customer_address .= $accountdata['address_1'] . "," .$accountdata['address_2'] .",". "<br/>";
-		if ( $accountdata['city'] != "")
-			$customer_address .= $accountdata['city'] . "<br/>";
-		if ( $accountdata['province'] != "")
-			$customer_address .= $accountdata['province']."<br/>";
-		if ( $accountdata['country_id'] != "")
-			$customer_address .= $this->common->get_field_name('country', 'countrycode', $accountdata['country_id'])."<br/>";            
-		if ( $accountdata['postal_code'] != "")
-			$customer_address .= "Pincode - " . $accountdata['postal_code'] . "<br/>";
-		else
-			$customer_address .= "\n";
+		if ( $accountdata['company_name'] != "") {
+					$customer_address .= $accountdata['company_name'] . "<br/>";
+		}
+		if ( $accountdata['address_1'] != "") {
+					$customer_address .= $accountdata['address_1'] . "," .$accountdata['address_2'] .",". "<br/>";
+		}
+		if ( $accountdata['city'] != "") {
+					$customer_address .= $accountdata['city'] . "<br/>";
+		}
+		if ( $accountdata['province'] != "") {
+					$customer_address .= $accountdata['province']."<br/>";
+		}
+		if ( $accountdata['country_id'] != "") {
+					$customer_address .= $this->common->get_field_name('country', 'countrycode', $accountdata['country_id'])."<br/>";
+		}
+		if ( $accountdata['postal_code'] != "") {
+					$customer_address .= "Pincode - " . $accountdata['postal_code'] . "<br/>";
+		} else {
+					$customer_address .= "\n";
+		}
 		   // $customer_address .= "Date of Invoice: " .date('d/m/Y', strtotime($invoicedata['invoice_date']))."<br/>";
 $customer_address .= "</div>";
 
@@ -1657,7 +1665,7 @@ 
 		if($logo != ''){
 		$src=$path;
 		$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
-		}else{
+		} else{
 		$path = getcwd()."/assets/images/logo.png";
 		$src=$path;
 		$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
@@ -1753,8 +1761,7 @@ 
 		if($to_currency->num_rows() > 0){
 			$to_currency_arr = $to_currency->result_array();
 			$to_currency = $to_currency_arr[0]["currencyrate"];
-		}
-		else{
+		} else{
 			$to_currency= $from_currency;
 		}
 
@@ -1773,8 +1780,9 @@ 
 	function date_diff_custom($end='2020-06-09 10:30:00', $out_in_array=false){
 		$intervalo = date_diff(date_create(), date_create($end));
 		$out = $intervalo->format("Years:%Y,Months:%M,Days:%d,Hours:%H,Minutes:%i,Seconds:%s");
-		if(!$out_in_array)
-			return $out;
+		if(!$out_in_array) {
+					return $out;
+		}
 		$a_out = array();
 		array_walk(explode(',',$out),
 		function($val,$key) use(&$a_out){
@@ -1833,7 +1841,7 @@ 
 					$tax_value=$tax_value[0];
 				 if($tax_value["taxes_priority"] == ""){
 					 $tax_priority = $tax_value["taxes_priority"];
-				 }else if($tax_value["taxes_priority"] > $tax_priority){
+				 } else if($tax_value["taxes_priority"] > $tax_priority){
 					 $query = $this->db_model->getSelect("SUM(value) as total", "invoices_total", array("invoiceid"=> $invoiceid));
 					 $query =  $query->result_array();
 					 $sub_total = $query["0"]["total"];

web_interface/astpp/application/modules/invoices/libraries/invoices_form.php

Braces +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
 	 if(!empty($invoiceconf)){

 	if($invoiceconf['logo'] != ''){

 		 $logo=$invoiceconf['file'];

-	}else{

+	} else{

 		 $logo=$invoiceconf['logo'];

 	}

 	 $accountid=$invoiceconf['accountid'];  

@@ -137,13 +137,13 @@ 
 			 $file_name= base_url()."upload/$logo";

 			 $image_path= array('Existing Image', 'IMAGE', array('type'=>'image','name' => 'image' ,'style'=>'width:100%;margin-top:20px;','src'=> $file_name), '', 'tOOL TIP', '');

 			  $delete_logo=array('Delete logo', 'DEL_BUTTON', array('value'=>'ankit','style'=>'margin-top:20px;','name' => 'button','id'=>'logo_delete','size' => '20', 'class' => "btn btn-line-parrot"), '', 'tOOL TIP', 'Please Enter account number');

-			 }else{

+			 } else{

 			  $image_path= array('Existing Image', 'HIDDEN', array('type'=>'','name' => '' ,'style'=>'width:250px;'), '', 'tOOL TIP', '');

 			  $delete_logo= array('Delete logo', 'HIDDEN', array('value'=>'ankit','style'=>'margin-top:0px;','name' => 'button','id'=>'logo_delete','size' => '20', 'maxlength' => '100', 'class' => "btn btn-line-parrot"), '', 'tOOL TIP', 'Please Enter account number');

 			 // $image_path=array();

 			 }

              

-			 }else{

+			 } else{

 			 $logo = '';

 			 $file_name = '';

 			 $accountid=0;

web_interface/astpp/application/modules/invoices/views/view_invoice_payment.php

Braces +1 added lines, -1 removed lines

@@ -298,7 +298,7 @@
 		</td>
 	     </tr>
 	</table>
-<?php }elseif ($logintype == 1) {?>
+<?php } elseif ($logintype == 1) {?>
 	  <table class="invoice_table1  pull-right">
 	    <tr style="border-bottom:2px solid #dfdfe1; color:#474747;"><th colspan="2">Payment Amount :</th></tr>
 	      <tr>