iNextrix / ASTPP

web_interface/astpp/application/modules/user/views/view_user_invoices_list.php

Spacing +7 added lines, -7 removed lines

@@ -52,24 +52,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                    <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                    <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Billing</a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                            <a href="<?= base_url() . "user/user_invoices_list/"; ?>">Invoices </a>
+                            <a href="<?= base_url()."user/user_invoices_list/"; ?>">Invoices </a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/modules/user/views/view_user_charges_list.php

Spacing +7 added lines, -7 removed lines

@@ -42,22 +42,22 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                    <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                    <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Billing</a></li>
                           <?php } ?>
 			  <li class='active'>
-                            <a href="<?= base_url() . "user/user_charges_history/"; ?>">Charges History </a>
+                            <a href="<?= base_url()."user/user_charges_history/"; ?>">Charges History </a>
                           </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

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

Spacing +34 added lines, -34 removed lines

@@ -31,23 +31,23 @@ 
 
 	function get_recent_recharge()
 	{
-	$accountinfo=$this->session->userdata('accountinfo');
-	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
+	$accountinfo = $this->session->userdata('accountinfo');
+	$userlevel_logintype = $this->session->userdata('userlevel_logintype');
 	
-	$where_arr=array('payment_by'=>-1);
-	if($userlevel_logintype == 1){
-	  $where_arr=array('payment_by'=>$accountinfo['id']);
+	$where_arr = array('payment_by'=>-1);
+	if ($userlevel_logintype == 1) {
+	  $where_arr = array('payment_by'=>$accountinfo['id']);
 	}
-	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
-	  $where_arr=array('accountid'=>$accountinfo['id']);
+	if ($userlevel_logintype == 0 || $userlevel_logintype == 3) {
+	  $where_arr = array('accountid'=>$accountinfo['id']);
 	}
 		$this->db->where($where_arr);
 		$this->db->select('id,accountid,credit,payment_date');
 		$this->db->limit(12);
-		$this->db->order_by('payment_date','desc');
+		$this->db->order_by('payment_date', 'desc');
 	return $this->db->get('payments');
 	}
-	 function get_call_statistics($table,$parent_id,$start_date='',$end_date='',$group_flag=true) 
+	 function get_call_statistics($table, $parent_id, $start_date = '', $end_date = '', $group_flag = true) 
 	{
 		$this->db->select("count(uniqueid) as sum,
                            count(CASE WHEN billseconds > 0 THEN 1 END) as answered,
@@ -59,46 +59,46 @@ 
                            sum(cost) as cost,
                            SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,
                            DAY(callstart) as day",false);
-		$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->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)");
-		$result=$this->db->get($table);
+		$result = $this->db->get($table);
 	return $result;
 	}
-	function get_customer_maximum_callminutes($start_date,$end_date)
+	function get_customer_maximum_callminutes($start_date, $end_date)
 	{
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3) {
-		 $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+		 $where = "reseller_id ='$parent_id'";
 	} else {
-		 $where ="accountid ='$parent_id'";
+		 $where = "accountid ='$parent_id'";
 	}
-	$where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	$select_query= "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
+	$where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	$select_query = "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
 			union
 			(SELECT sum( billseconds ) AS billseconds,accountid FROM (reseller_cdrs) WHERE $where 
 			group by accountid order by sum(billseconds) desc limit 10 ) ORDER BY billseconds DESC LIMIT 10 ";
 	return $this->db->query($select_query);
 	}
 
-	function get_customer_maximum_callcount($start_date,$end_date)
+	function get_customer_maximum_callcount($start_date, $end_date)
 	{
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	  if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3) {
-	  	  $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	  if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  	  $where = "reseller_id ='$parent_id'";
 	  } else {
-		  $where ="accountid ='$parent_id'";
+		  $where = "accountid ='$parent_id'";
 	}
-	  $where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	  $select_query="(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
+	  $where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	  $select_query = "(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  UNION
 	  (SELECT count(uniqueid) as call_count,accountid FROM (reseller_cdrs) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  ORDER BY call_count desc limit 10";

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/dashboard/controllers/dashboard.php

Spacing +141 added lines, -141 removed lines

@@ -38,215 +38,215 @@
 	function index() 
 	{
 		if ($this->session->userdata('user_login') == FALSE) 
-			redirect(base_url() . 'login/login');
+			redirect(base_url().'login/login');
 			$data['page_title'] = 'Dashboard';
 		if ($this->session->userdata('logintype') == 0) 
 	{
 			$this->load->view('view_user_dashboard', $data);
 		} else {
-		$gmtoffset=$this->common->get_timezone_offset();	    
+		$gmtoffset = $this->common->get_timezone_offset();	    
 			$this->load->view('view_dashboard', $data);
 		}
 	}
-	function user_recent_payments(){
+	function user_recent_payments() {
 	  $this->customerReport_recent_payments();
 	}     
 	function customerReport_recent_payments() 
 	{
-	$accountinfo=$this->session->userdata('accountinfo');
-	$currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
+	$accountinfo = $this->session->userdata('accountinfo');
+	$currency = $this->common->get_field_name('currency', 'currency', array("id"=>$accountinfo['currency_id']));
 		$json_data = array();
-	$i=1;
+	$i = 1;
 	$result = $this->dashboard_model->get_recent_recharge();
-	$gmtoffset=$this->common->get_timezone_offset();
-		if($result->num_rows() > 0)
+	$gmtoffset = $this->common->get_timezone_offset();
+		if ($result->num_rows() > 0)
 	{
-		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
-		 $json_data[0]['accountid']='Accounts';
-		 $json_data[0]['credit']='Amount('.$currency.")";
-		 $json_data[0]['payment_date']='Date';
-		 foreach($result->result_array() as $key=>$data){
-			  $current_timestamp=strtotime($data['payment_date']);
-			  $modified_date=$current_timestamp+$gmtoffset;
-		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-			  $json_data[$i]['accountid']=$data['accountid'];
-			  $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
-			  $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
+		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', '');
+		 $json_data[0]['accountid'] = 'Accounts';
+		 $json_data[0]['credit'] = 'Amount('.$currency.")";
+		 $json_data[0]['payment_date'] = 'Date';
+		 foreach ($result->result_array() as $key=>$data) {
+			  $current_timestamp = strtotime($data['payment_date']);
+			  $modified_date = $current_timestamp + $gmtoffset;
+		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+			  $json_data[$i]['accountid'] = $data['accountid'];
+			  $json_data[$i]['credit'] = $this->common_model->calculate_currency($data['credit'], '', '', true, false);
+			  $json_data[$i]['payment_date'] = date('Y-m-d H:i:s', strtotime($data['payment_date']) + $gmtoffset);
 			  $i++;
 		  	}
 		  }
 		 echo json_encode($json_data); 
 	}
-	function  user_call_statistics_with_profit(){
+	function  user_call_statistics_with_profit() {
 	  $this->customerReport_call_statistics_with_profit();
 	 }
 	function customerReport_call_statistics_with_profit() {
-		$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
+		$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
 	$json_data = array();
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
-	$current_date=(int)date("d");
-		$count=0;
-		$i=0;
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
+	$current_date = (int)date("d");
+		$count = 0;
+		$i = 0;
 		$begin = new DateTime($start_date);
 	$end = new DateTime($end_date);
-	$end=$end->modify('+1 day');
+	$end = $end->modify('+1 day');
 	$daterange = new DatePeriod($begin, new DateInterval('P1D'), $end);
-	$records_date=array();
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
-		$customerresult = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date);
-		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date);
+	$records_date = array();
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+		$customerresult = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date);
+		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date);
 		$acc_arr = array();
 	foreach ($customerresult->result_array() as $data) {
 	  $acc_arr[$data['day']] = $data;
 	}
-	foreach($resellerresult->result_array() as $data){
-	  $reseller_arr[$data['day']]=$data;
-	  if(isset($acc_arr[$data['day']])){
-		$acc_arr[$data['day']]['sum']= $data['sum']+$acc_arr[$data['day']]['sum'];
-		$acc_arr[$data['day']]['answered']= $data['answered']+$acc_arr[$data['day']]['answered'];
-		$acc_arr[$data['day']]['failed']= $data['failed']+$acc_arr[$data['day']]['failed'];
-		$acc_arr[$data['day']]['profit']= $data['profit']+$acc_arr[$data['day']]['profit'];
-			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
-			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
-			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
-	  }else{
-		$acc_arr[$data['day']]=$data;
+	foreach ($resellerresult->result_array() as $data) {
+	  $reseller_arr[$data['day']] = $data;
+	  if (isset($acc_arr[$data['day']])) {
+		$acc_arr[$data['day']]['sum'] = $data['sum'] + $acc_arr[$data['day']]['sum'];
+		$acc_arr[$data['day']]['answered'] = $data['answered'] + $acc_arr[$data['day']]['answered'];
+		$acc_arr[$data['day']]['failed'] = $data['failed'] + $acc_arr[$data['day']]['failed'];
+		$acc_arr[$data['day']]['profit'] = $data['profit'] + $acc_arr[$data['day']]['profit'];
+			$acc_arr[$data['day']]['completed'] = $data['completed'] + $acc_arr[$data['day']]['completed'];
+			$acc_arr[$data['day']]['duration'] = $data['duration'] + $acc_arr[$data['day']]['duration'];
+			$acc_arr[$data['day']]['mcd'] = $data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd'] : $acc_arr[$data['day']]['mcd'];
+	  } else {
+		$acc_arr[$data['day']] = $data;
 	  }
 	}
-	if(!empty($acc_arr)){
-		foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		if(isset($acc_arr[$day])){
-				  $asr= ($acc_arr[$day]['sum'] > 0 ) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100,2)) : 0;
-				  $acd= ($acc_arr[$day]['completed'] > 0 ) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'],2) : 0;
-		  $json_data['total'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['sum']);
-		  $json_data['answered'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['answered']);
-		  $json_data['failed'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['failed']);
-		  $json_data['profit'][]=  array((string)$acc_arr[$day]['day'],(float)  str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
-				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
-				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
-				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
-		}else{
-		  $json_data['total'][]=  array($date->format("d"), 0);
-		  $json_data['answered'][]=  array($date->format("d"), 0);
-		  $json_data['failed'][]=  array($date->format("d"), 0);
-		  $json_data['profit'][]=  array($date->format("d"), 0);
-				  $json_data['acd'][]=array($date->format("d"), 0);
-				  $json_data['mcd'][]=array($date->format("d"), 0);
-				  $json_data['asr'][]=array($date->format("d"),0);
+	if ( ! empty($acc_arr)) {
+		foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		if (isset($acc_arr[$day])) {
+				  $asr = ($acc_arr[$day]['sum'] > 0) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100, 2)) : 0;
+				  $acd = ($acc_arr[$day]['completed'] > 0) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'], 2) : 0;
+		  $json_data['total'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['sum']);
+		  $json_data['answered'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['answered']);
+		  $json_data['failed'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['failed']);
+		  $json_data['profit'][] = array((string)$acc_arr[$day]['day'], (float)str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
+				  $json_data['acd'][] = array((string)$acc_arr[$day]['day'], (float)$acd);
+				  $json_data['mcd'][] = array((string)$acc_arr[$day]['day'], (float)$acc_arr[$day]['mcd']);
+				  $json_data['asr'][] = array((string)$acc_arr[$day]['day'], (float)$asr);
+		} else {
+		  $json_data['total'][] = array($date->format("d"), 0);
+		  $json_data['answered'][] = array($date->format("d"), 0);
+		  $json_data['failed'][] = array($date->format("d"), 0);
+		  $json_data['profit'][] = array($date->format("d"), 0);
+				  $json_data['acd'][] = array($date->format("d"), 0);
+				  $json_data['mcd'][] = array($date->format("d"), 0);
+				  $json_data['asr'][] = array($date->format("d"), 0);
 		}
 		
 		}
 	}
-	else{
-	foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		$json_data['total'][]=  array($date->format("d"), 0);
-		$json_data['answered'][]=  array($date->format("d"), 0);
-		$json_data['failed'][]=  array($date->format("d"), 0);
-		$json_data['profit'][]=  array($date->format("d"), 0);
-				$json_data['acd'][]=array($date->format("d"), 0);
-				$json_data['mcd'][]=array($date->format("d"), 0);
-				$json_data['asr'][]=array($date->format("d"), 0);
+	else {
+	foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		$json_data['total'][] = array($date->format("d"), 0);
+		$json_data['answered'][] = array($date->format("d"), 0);
+		$json_data['failed'][] = array($date->format("d"), 0);
+		$json_data['profit'][] = array($date->format("d"), 0);
+				$json_data['acd'][] = array($date->format("d"), 0);
+				$json_data['mcd'][] = array($date->format("d"), 0);
+				$json_data['asr'][] = array($date->format("d"), 0);
 	}
 	}
-		$customer_total_result = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date,false);
-		$reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date,false);
-		$customer_total_result=(array)$customer_total_result->first_row();
-		$reseller_total_result=(array)$reseller_total_result->first_row();
-	$json_data['total_count']['sum']=$reseller_total_result['sum']+$customer_total_result['sum'];
-		$json_data['total_count']['debit']=$this->common_model->to_calculate_currency($reseller_total_result['debit']+$customer_total_result['debit'],'','',true,true);
-		$json_data['total_count']['cost']=$this->common_model->to_calculate_currency($reseller_total_result['cost']+$customer_total_result['cost'],'','',true,true);
-		$json_data['total_count']['profit']=$this->common_model->to_calculate_currency($reseller_total_result['profit']+$customer_total_result['profit'],'','',true,true);
-		$json_data['total_count']['completed']=$reseller_total_result['completed']+$customer_total_result['completed'];
-		$json_data['total_count']['duration']=$reseller_total_result['duration']+$customer_total_result['duration'];
-		$json_data['total_count']['acd']=$json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration']/$json_data['total_count']['completed'],2):0;
-		$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;
-		$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;
-		$json_data['total_count']['asr']=$this->common_model->format_currency($json_data['total_count']['asr']);
+		$customer_total_result = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date, false);
+		$reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date, false);
+		$customer_total_result = (array)$customer_total_result->first_row();
+		$reseller_total_result = (array)$reseller_total_result->first_row();
+	$json_data['total_count']['sum'] = $reseller_total_result['sum'] + $customer_total_result['sum'];
+		$json_data['total_count']['debit'] = $this->common_model->to_calculate_currency($reseller_total_result['debit'] + $customer_total_result['debit'], '', '', true, true);
+		$json_data['total_count']['cost'] = $this->common_model->to_calculate_currency($reseller_total_result['cost'] + $customer_total_result['cost'], '', '', true, true);
+		$json_data['total_count']['profit'] = $this->common_model->to_calculate_currency($reseller_total_result['profit'] + $customer_total_result['profit'], '', '', true, true);
+		$json_data['total_count']['completed'] = $reseller_total_result['completed'] + $customer_total_result['completed'];
+		$json_data['total_count']['duration'] = $reseller_total_result['duration'] + $customer_total_result['duration'];
+		$json_data['total_count']['acd'] = $json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration'] / $json_data['total_count']['completed'], 2) : 0;
+		$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;
+		$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;
+		$json_data['total_count']['asr'] = $this->common_model->format_currency($json_data['total_count']['asr']);
 	echo json_encode($json_data);
 }
 
-	 function user_maximum_callminutes(){
+	 function user_maximum_callminutes() {
 	  $this->customerReport_maximum_callminutes();
 	}
 	 function customerReport_maximum_callminutes()
 	 {
-		$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+		$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
 	 	$json_data = array();
- 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date,$end_date);
-	$i=0;
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
-	} else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+ 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date, $end_date);
+	$i = 0;
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
+	} else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-		if($result->num_rows() > 0 )
+		if ($result->num_rows() > 0)
 	{	
-		   foreach ($result->result_array() as $data){
-			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-			$json_data[$i][]= $data['accountid'];
-			$json_data[$i][]= round($data['billseconds']/60,0);
+		   foreach ($result->result_array() as $data) {
+			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+			$json_data[$i][] = $data['accountid'];
+			$json_data[$i][] = round($data['billseconds'] / 60, 0);
 			$i++;
 		   } 
-		}else{
+		} else {
 	  $json_data[] = array();
 	  	}
 	 	echo json_encode($json_data);
 	 }
 
-	 function user_maximum_callcount(){
+	 function user_maximum_callcount() {
 	   $this->customerReport_maximum_callcount();
 	 }
 	 function customerReport_maximum_callcount()
 	 {
-	 	$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+	 	$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
 	 	$json_data = array();
-	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date,$end_date);
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
-	} else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date, $end_date);
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
+	} else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-	$i=0;
-		if($result->num_rows() > 0 )
+	$i = 0;
+		if ($result->num_rows() > 0)
 	{
 		foreach ($result->result_array() as $data) 
 		{
-				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-				$json_data[$i][]= $data['accountid'];
-				$json_data[$i][]= (int)$data['call_count'];
+				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+				$json_data[$i][] = $data['accountid'];
+				$json_data[$i][] = (int)$data['call_count'];
 				$i++;
 			}
     	    
-		}else{
+		} else {
 				$json_data[] = array();
 	 		 }
 	echo json_encode($json_data);

Braces +8 added lines, -8 removed lines

@@ -37,8 +37,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';
 		if ($this->session->userdata('logintype') == 0) 
 	{
@@ -116,7 +117,7 @@ 
 			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
 			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
 			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
-	  }else{
+	  } else{
 		$acc_arr[$data['day']]=$data;
 	  }
 	}
@@ -134,7 +135,7 @@ 
 				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
 				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
 				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
-		}else{
+		} else{
 		  $json_data['total'][]=  array($date->format("d"), 0);
 		  $json_data['answered'][]=  array($date->format("d"), 0);
 		  $json_data['failed'][]=  array($date->format("d"), 0);
@@ -145,8 +146,7 @@ 
 		}
 		
 		}
-	}
-	else{
+	} else{
 	foreach($daterange as $date){
 		$json_data['date'][]=$date->format("d");
 		$day = (int) $date->format("d");
@@ -207,7 +207,7 @@ 
 			$json_data[$i][]= round($data['billseconds']/60,0);
 			$i++;
 		   } 
-		}else{
+		} else{
 	  $json_data[] = array();
 	  	}
 	 	echo json_encode($json_data);
@@ -246,7 +246,7 @@ 
 				$i++;
 			}
     	    
-		}else{
+		} else{
 				$json_data[] = array();
 	 		 }
 	echo json_encode($json_data);

web_interface/astpp/application/modules/dashboard/views/view_dashboard.php

Spacing +2 added lines, -2 removed lines

@@ -375,7 +375,7 @@ 
 											$yearArray = range($start_year, $end_year);

 											foreach ($yearArray as $year) {

 												$selected = ($year == $currentyear) ? 'selected' : '';

-												echo '<option ' . $selected . ' value="' . $year . '">' . $year . '</option>';

+												echo '<option '.$selected.' value="'.$year.'">'.$year.'</option>';

 											}

 											?>

                                         </select>

@@ -388,7 +388,7 @@ 
 												$monthPadding = str_pad($month, 2, "0", STR_PAD_LEFT);

 												$fdate = date("F", strtotime($monthPadding));

 												$selected = (date("m") == $monthPadding) ? 'selected' : null;

-												echo '<option value="' . $monthPadding . '" ' . $selected . '>' . date("F", mktime(null, null, null, $monthPadding, 1)) . '</option>';

+												echo '<option value="'.$monthPadding.'" '.$selected.'>'.date("F", mktime(null, null, null, $monthPadding, 1)).'</option>';

 											}

 											?>

                                         </select>

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

Spacing +59 added lines, -59 removed lines

@@ -40,86 +40,86 @@ 
 Invoice manually
 **/
 
-	if($this->session->userdata('advance_search')!= 1){
-	  if($result->num_rows() >0){
-	  $acc_arr=array();
-	  $result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+	if ($this->session->userdata('advance_search') != 1) {
+	  if ($result->num_rows() > 0) {
+	  $acc_arr = array();
+	  $result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
-		if($flag){
+		$this->db->where_in('accountid', $acc_arr);
+		if ($flag) {
 		  $this->db->select('*');
 		}
-		else{
+		else {
 		  $this->db->select('count(id) as count');
 		}
-		if($flag){
-		  $this->db->where('deleted',0);
-		  $this->db->order_by('invoice_date','desc');
+		if ($flag) {
+		  $this->db->where('deleted', 0);
+		  $this->db->order_by('invoice_date', 'desc');
 		  $this->db->limit($limit, $start);
 		}
-		$result=$this->db->get('invoices');
+		$result = $this->db->get('invoices');
  		//echo $this->db->last_query();exit;    
-		if($flag){
+		if ($flag) {
 		  return $result;
-		}else{
-		  $result=$result->result_array();
+		} else {
+		  $result = $result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
-		  if($flag){
-		  $query=(object)array('num_rows'=>0);
+	  } else {
+		  if ($flag) {
+		  $query = (object)array('num_rows'=>0);
 	  }
-	  else{
-		  $query=0;
+	  else {
+		  $query = 0;
 	  }
  	  
 	  return $query;
 		}
-	}else{
+	} else {
           
-		 if($result->num_rows() >0){
+		 if ($result->num_rows() > 0) {
 /****
 Invoice manually
 **/
-		$acc_arr=array();
-		$result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+		$acc_arr = array();
+		$result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
+		$this->db->where_in('accountid', $acc_arr);
 	}
          
-		 if($flag){
+		 if ($flag) {
 	  $this->db->select('*');
 		 }
-		 else{
+		 else {
 		  $this->db->select('count(id) as count');
 		 }
-		 if($flag){
-	  $this->db->order_by('invoice_date','desc');
+		 if ($flag) {
+	  $this->db->order_by('invoice_date', 'desc');
 	  $this->db->limit($limit, $start);
 		 }
-		 $result=$this->db->get('invoices');
+		 $result = $this->db->get('invoices');
   //	echo $this->db->last_query();exit;              
-		 if($result->num_rows() > 0){
-		  if($flag){
+		 if ($result->num_rows() > 0) {
+		  if ($flag) {
 	        
 		return $result;
-		  }else{
-		$result=$result->result_array();
+		  } else {
+		$result = $result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
-		  if($flag){
+		 } else {
+		  if ($flag) {
 	          
-		  $query=(object)array('num_rows'=>0);
+		  $query = (object)array('num_rows'=>0);
 		 // echo '<pre>'; print_r($query); 	
 		  }
-		  else{
-		  $query=0;
+		  else {
+		  $query = 0;
 		  }
 	return $query;
 	}
@@ -152,13 +152,13 @@ 
 
 		return NULL;
 	}
-	function get_user_invoice_list($flag, $start = 0, $limit = 0){
+	function get_user_invoice_list($flag, $start = 0, $limit = 0) {
 	$this->db_model->build_search('invoice_list_search');
-	$accountinfo=$this->session->userdata('accountinfo');
+	$accountinfo = $this->session->userdata('accountinfo');
 /****
 Invoice manually
 **/
-		$where = array("accountid" => $accountinfo['id'],'confirm'=>1);
+		$where = array("accountid" => $accountinfo['id'], 'confirm'=>1);
 		if ($flag) {
 			$query = $this->db_model->select("*", "invoices", $where, "invoice_date", "desc", $limit, $start);
             
@@ -188,42 +188,42 @@ 
 		return $query;
 	}
 	function get_invoiceconf($accountid) {
-		$return_array=array();
+		$return_array = array();
  	$logintype = $this->session->userdata('logintype');
 		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-		}else{
-	   		 $where=array('id'=> $accountid);
+		} else {
+	   		 $where = array('id'=> $accountid);
 	}      
-		$query = $this->db_model->getSelect("*","invoice_conf",$where);
-		foreach($query->result_array() as $key => $value)
+		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
+		foreach ($query->result_array() as $key => $value)
 		{
-			$return_array=$value;
+			$return_array = $value;
 		}       
 		 return $return_array;
 	} 
 
 
-	function save_invoiceconf($post_array){
-	$where_arr=array('id'=>$post_array['id']);
+	function save_invoiceconf($post_array) {
+	$where_arr = array('id'=>$post_array['id']);
 	unset($post_array['action']);
-	if($post_array['id'] != "" ){
+	if ($post_array['id'] != "") {
 		$this->db->where($where_arr);
 		unset($post_array['accountid']);
 		unset($post_array['logo_main']);
-		$this->db->update('invoice_conf',$post_array);
-	} else{
+		$this->db->update('invoice_conf', $post_array);
+	} else {
 		unset($post_array['logo_main']);
 		$logintype = $this->session->userdata('logintype');
 		if ($logintype == 1 || $logintype == 5) {
 			$accountdata = $this->session->userdata('accountinfo');
 			$post_array['accountid'] = $accountdata['id'];
 		}
-		if($post_array['accountid'] == 0){
-			$post_array['accountid']=1;
+		if ($post_array['accountid'] == 0) {
+			$post_array['accountid'] = 1;
 		}
-		$this->db->insert('invoice_conf',$post_array);
+		$this->db->insert('invoice_conf', $post_array);
 	}
 	return true;
 	}

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

Indentation +84 added lines, -84 removed lines

@@ -666,18 +666,18 @@ 
 		$this->invoice_send_notification($response_arr['invoiceid'],$account_data[0],'auto');
 /***** ***/
 	}
-        $this->session->set_flashdata('astpp_errormsg', 'Invoice updated successfully!'); 
+		$this->session->set_flashdata('astpp_errormsg', 'Invoice updated successfully!'); 
   	redirect(base_url() . 'invoices/invoice_list/');
-    }   
+	}   
 
-    /**
-     * @param string $inv_flag
-     */
-    function invoice_send_notification($invoice_id,$accountdata,$inv_flag){
+	/**
+	 * @param string $inv_flag
+	 */
+	function invoice_send_notification($invoice_id,$accountdata,$inv_flag){
 		$invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoice_id));
 		$invoicedata = $invoicedata->result_array();
 		$invoicedata =$invoicedata[0];
-         	//$res = $this->common->get_invoice_template($invoicedata,$accountdata,"False");
+		 	//$res = $this->common->get_invoice_template($invoicedata,$accountdata,"False");
 		$invoice_conf =  array();
 		if($accountdata['reseller_id'] == 0){
 			$where = array("accountid"=> 1);
@@ -1478,104 +1478,104 @@ 
 	   $this->session->set_flashdata('astpp_notification', 'Permission Denied.');
 	   redirect(base_url()."invoices/invoice_list/");
 	}          
-    }
+	}
 
-     /**
-      * @param string $select
-      */
-     function get_invoice_date($select,$accountid=false){
+	 /**
+	  * @param string $select
+	  */
+	 function get_invoice_date($select,$accountid=false){
 	if($accountid){
-	        $where = array('type'=>"I","accountid"=>$accountid);
-        $query = $this->db_model->select($select, "invoices", $where,"to_date","DESC","1","0");
+			$where = array('type'=>"I","accountid"=>$accountid);
+		$query = $this->db_model->select($select, "invoices", $where,"to_date","DESC","1","0");
 	} else{
 		 $where = array('type'=>"I");
-        $query = $this->db_model->select($select, "invoices", $where,"id","DESC","1","0");
+		$query = $this->db_model->select($select, "invoices", $where,"id","DESC","1","0");
 	}
-        if($query->num_rows >0){
-            $invoiceid = $query->result_array();
-            $invoice_date=$invoiceid[0][$select];
-            return  $invoice_date;
-        }
-        return false;
-    }   
-     function invoice_main_download($invoiceid) {
+		if($query->num_rows >0){
+			$invoiceid = $query->result_array();
+			$invoice_date=$invoiceid[0][$select];
+			return  $invoice_date;
+		}
+		return false;
+	}   
+	 function invoice_main_download($invoiceid) {
 
-        $invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
-        $invoicedata = $invoicedata->result_array();
-        $invoicedata=$invoicedata[0];
+		$invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
+		$invoicedata = $invoicedata->result_array();
+		$invoicedata=$invoicedata[0];
 	$invoice_path='';
-        $accountid = $invoicedata['accountid'];
-        $acc_file=$invoice_path.$accountid.'/'.$invoiceid;  
-        $accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
-        $accountdata =  $accountdata->result_array();
-        $accountdata = $accountdata[0];
+		$accountid = $invoicedata['accountid'];
+		$acc_file=$invoice_path.$accountid.'/'.$invoiceid;  
+		$accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
+		$accountdata =  $accountdata->result_array();
+		$accountdata = $accountdata[0];
 
-        $login_type = $this->session->userdata['userlevel_logintype'];
-        $query="select item_type,credit from invoice_details where invoiceid = ".$invoicedata['id']." and item_type='INVPAY' Group By id order by item_type desc"; 
-            // echo  $query; exit;
-        $invoice_total_query=$this->db->query($query);
-         if($invoice_total_query->num_rows() > 0){
-        $total=$invoice_total_query->result_array();
-        foreach($total as $key => $value){
-        $debit=$value['credit'];
-        }
-         if($debit){
-       // echo 'debit'; exit;
-           $invoice_path=$this->config->item('invoices_path');
-           $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
-           unlink($download_path);
-           $res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
-          }
-          }
-         $invoice_path=$this->config->item('invoices_path');
-         $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
-        $res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
-    }
+		$login_type = $this->session->userdata['userlevel_logintype'];
+		$query="select item_type,credit from invoice_details where invoiceid = ".$invoicedata['id']." and item_type='INVPAY' Group By id order by item_type desc"; 
+			// echo  $query; exit;
+		$invoice_total_query=$this->db->query($query);
+		 if($invoice_total_query->num_rows() > 0){
+		$total=$invoice_total_query->result_array();
+		foreach($total as $key => $value){
+		$debit=$value['credit'];
+		}
+		 if($debit){
+	   // echo 'debit'; exit;
+		   $invoice_path=$this->config->item('invoices_path');
+		   $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
+		   unlink($download_path);
+		   $res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
+		  }
+		  }
+		 $invoice_path=$this->config->item('invoices_path');
+		 $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
+		$res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
+	}
   function Sec2Minutes( $seconds )
   {
-      return sprintf( "%02.2d:%02.2d", floor( $seconds / 60 ), $seconds % 60 );
+	  return sprintf( "%02.2d:%02.2d", floor( $seconds / 60 ), $seconds % 60 );
   }
   function receipt_download($invoiceid) {
-        $login_info = $this->session->userdata('accountinfo');
-       ob_start();
-       $this->load->library('/html2pdf/html2pdf');
-       $template_config=$this->config->item('invoice_template');
-       include($template_config.'invoice_template_receipt.php');
-       $content = ob_get_clean();
-       ob_clean();
-        $accountid = $this->common->get_field_name('accountid', 'invoices', $invoiceid);	
-        $accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
-        $accountdata =  $accountdata->result_array();
-        $accountdata = $accountdata[0];
+		$login_info = $this->session->userdata('accountinfo');
+	   ob_start();
+	   $this->load->library('/html2pdf/html2pdf');
+	   $template_config=$this->config->item('invoice_template');
+	   include($template_config.'invoice_template_receipt.php');
+	   $content = ob_get_clean();
+	   ob_clean();
+		$accountid = $this->common->get_field_name('accountid', 'invoices', $invoiceid);	
+		$accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
+		$accountdata =  $accountdata->result_array();
+		$accountdata = $accountdata[0];
 //        $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $accountdata["currency_id"]);
 	//$currency = $accountdata["currency_id"];
-      if($login_info['type'] == -1){
+	  if($login_info['type'] == -1){
 	  $data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
-          $currency = $data["to_currency"];
-      } elseif($login_info['type'] == 1){
+		  $currency = $data["to_currency"];
+	  } elseif($login_info['type'] == 1){
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $login_info["currency_id"]);
-          $currency = $accountdata["currency_id"];
-      } else{
+		  $currency = $accountdata["currency_id"];
+	  } else{
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $login_info["currency_id"]);
-          $currency = $accountdata["currency_id"];
-      }
-        $invoice_cdr_list = array();
-        $invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
-        $invoicedata = $invoicedata->result_array();
-        $invoicedata=$invoicedata[0];
+		  $currency = $accountdata["currency_id"];
+	  }
+		$invoice_cdr_list = array();
+		$invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
+		$invoicedata = $invoicedata->result_array();
+		$invoicedata=$invoicedata[0];
        
-        $data['invoiceid'] = @$invoicedata[0]['id'];
-        $data['id']	 = @$invoicedata['invoiceid'];
+		$data['invoiceid'] = @$invoicedata[0]['id'];
+		$data['id']	 = @$invoicedata['invoiceid'];
         
-        $data['invoice_date'] = @$invoicedata[0]['invoice_date'];
-        $data['accountid'] = @$invoicedata[0]['accountid'];
+		$data['invoice_date'] = @$invoicedata[0]['invoice_date'];
+		$data['accountid'] = @$invoicedata[0]['accountid'];
 	$data['from_date'] = @$invoicedata[0]['from_date'];
 	$data['to_date'] = @$invoicedata[0]['to_date'];
-        $total_list = array();
-        $data['description']='';
-        $data['item_type']='';
-        $data['debit']='';
-        $invoice_total_list = array();
+		$total_list = array();
+		$data['description']='';
+		$data['item_type']='';
+		$data['debit']='';
+		$invoice_total_list = array();
 	$query="select item_type,description,created_date,invoiceid,debit,credit from invoice_details where invoiceid = ".$invoiceid." And ( item_type='POSTCHARG' Or item_type='Refill') Group By item_type"; 	
 	$invoice_total_query=$this->db->query($query);
 	if($invoice_total_query ->num_rows() > 0) {

Spacing +840 added lines, -840 removed lines

@@ -38,7 +38,7 @@ 
 		$this->load->library('pdf');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 
@@ -48,141 +48,141 @@ 
 		$data['page_title'] = 'Invoices';
 		$data['login_type'] = $this->session->userdata['userlevel_logintype'];
 		$data['search_flag'] = true;
-		$this->session->set_userdata('advance_search',0);
-		$data['grid_fields']= $this->invoices_form->build_invoices_list_for_admin();
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->invoices_form->build_invoices_list_for_admin();
 		$data["grid_buttons"] = $this->invoices_form->build_grid_buttons();
-		$data['form_search']=$this->form->build_serach_form($this->invoices_form->get_invoice_search_form());
-		 $account=$this->db_model->getSelect('id,first_name,last_name,number', 'accounts', array('status'=>0,'type'=>'0,3','deleted'=>0)) ;
-		$data['account_value']=$account->result_array();
-		$this->load->view('view_invoices_list',$data);
+		$data['form_search'] = $this->form->build_serach_form($this->invoices_form->get_invoice_search_form());
+		 $account = $this->db_model->getSelect('id,first_name,last_name,number', 'accounts', array('status'=>0, 'type'=>'0,3', 'deleted'=>0));
+		$data['account_value'] = $account->result_array();
+		$this->load->view('view_invoices_list', $data);
 	}
 	function invoice_list_json() {
 		$login_info = $this->session->userdata('accountinfo');
 		 $logintype = $this->session->userdata('logintype');
 		 $json_data = array();
 		 $count_all = $this->invoices_model->get_invoice_list(false);
-		 $paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		 $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		 $json_data = $paging_data["json_paging"];
-		 $result_query = $this->invoices_model->get_invoice_list(true,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-	  if($logintype == -1){
+		 $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"];
 	  }
-		 $grid_fields= json_decode($this->invoices_form->build_invoices_list_for_admin());
-		 $url= ($logintype==0 ||$logintype==3 ) ? "/user/user_invoice_download/":'/invoices/invoice_download/';
-		 if($result_query->num_rows > 0 ){
-			$query=$result_query->result_array();
+		 $grid_fields = json_decode($this->invoices_form->build_invoices_list_for_admin());
+		 $url = ($logintype == 0 || $logintype == 3) ? "/user/user_invoice_download/" : '/invoices/invoice_download/';
+		 if ($result_query->num_rows > 0) {
+			$query = $result_query->result_array();
 			$total_value = 0;
 			$ountstanding_value = 0;
 		 foreach ($query as $key => $value) {
-	  $delete_button='';
+	  $delete_button = '';
 		  $date = strtotime($value['invoice_date']);
-		  $invoice_date =date("Y-m-d",$date);
+		  $invoice_date = date("Y-m-d", $date);
 		  $fromdate = strtotime($value['from_date']);
-		  $from_date =date("Y-m-d",$fromdate);
+		  $from_date = date("Y-m-d", $fromdate);
 		  $duedate = strtotime($value['due_date']);
-		  if($value['type'] == 'I'){
-		  $due_date =date("Y-m-d",$duedate);
-		  }else{
-		  $due_date='';
+		  if ($value['type'] == 'I') {
+		  $due_date = date("Y-m-d", $duedate);
+		  } else {
+		  $due_date = '';
 		  }
 		  $outstanding = $value['amount'];
 			 $last_payment_date = '';
-			 $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'],"item_type"=>"INVPAY"),"created_date","DESC","1","0");
+			 $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'], "item_type"=>"INVPAY"), "created_date", "DESC", "1", "0");
 	   // echo $this->db->last_query(); exit;
-		  if ($invoice_total_query ->num_rows() > 0){
-			$invoice_total_query= $invoice_total_query->result_array();
+		  if ($invoice_total_query ->num_rows() > 0) {
+			$invoice_total_query = $invoice_total_query->result_array();
 			//echo '<pre>'; print_r($invoice_total_query); 
-			if($value['type'] == 'I'){
+			if ($value['type'] == 'I') {
 			$outstanding -= $this->common->currency_decimal($invoice_total_query[0]['credit']);
-			}else{
-			$outstanding='';
+			} else {
+			$outstanding = '';
 			}
 			$last_payment_date = $invoice_total_query[0]['created_date'];
-			if($value['type'] == 'I'){
-			if($last_payment_date ){
-			$payment_date=strtotime( $last_payment_date);
-			$payment_last=date("Y-m-d",$payment_date);
-			}else{
-			 $payment_last='';
+			if ($value['type'] == 'I') {
+			if ($last_payment_date) {
+			$payment_date = strtotime($last_payment_date);
+			$payment_last = date("Y-m-d", $payment_date);
+			} else {
+			 $payment_last = '';
 			}
-		 }else{
-		  $payment_last='';
+		 } else {
+		  $payment_last = '';
 		  }
             
 		  }
           
-		  $invoice_total='';
-		  $accountinfo=$this->session->userdata('accountinfo');
-		  $id=$accountinfo['id'];
-		  if($accountinfo['type'] == 1){
-		  $query ="select sum(amount) as grand_total from invoices where reseller_id='$id'";
-		  }else{
-		  $query ="select sum(amount) as grand_total from invoices where reseller_id='0'";
+		  $invoice_total = '';
+		  $accountinfo = $this->session->userdata('accountinfo');
+		  $id = $accountinfo['id'];
+		  if ($accountinfo['type'] == 1) {
+		  $query = "select sum(amount) as grand_total from invoices where reseller_id='$id'";
+		  } else {
+		  $query = "select sum(amount) as grand_total from invoices where reseller_id='0'";
 		  }
-		  $ext_query=$this->db->query($query);
-		  if($ext_query->num_rows() > 0){
-		  $result_total=$ext_query->result_array();
-		  $grandtotal=$result_total[0]['grand_total'];
-		  $grand_total=$this->common->currency_decimal($grandtotal).' '.$currency_id;
+		  $ext_query = $this->db->query($query);
+		  if ($ext_query->num_rows() > 0) {
+		  $result_total = $ext_query->result_array();
+		  $grandtotal = $result_total[0]['grand_total'];
+		  $grand_total = $this->common->currency_decimal($grandtotal).' '.$currency_id;
 		  }
           
           
-		  if($accountinfo['type'] == 1){
-		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where reseller_id='$id'";
-		  }else{
-		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where reseller_id='0'";
+		  if ($accountinfo['type'] == 1) {
+		  $invoice_query = "select sum(credit) as grand_credit from invoice_details where reseller_id='$id'";
+		  } else {
+		  $invoice_query = "select sum(credit) as grand_credit from invoice_details where reseller_id='0'";
 		  }
-		  $credit_query=$this->db->query($invoice_query);
-		  if($credit_query->num_rows() > 0){
-		  $credit_total=$credit_query->result_array();
-		  $grand_credit_total=$credit_total[0]['grand_credit'];
-		  $grandcredit=$grand_total-$grand_credit_total;
-		  $grand_credit=$this->common->currency_decimal($grandcredit).' '.$currency_id;
+		  $credit_query = $this->db->query($invoice_query);
+		  if ($credit_query->num_rows() > 0) {
+		  $credit_total = $credit_query->result_array();
+		  $grand_credit_total = $credit_total[0]['grand_credit'];
+		  $grandcredit = $grand_total - $grand_credit_total;
+		  $grand_credit = $this->common->currency_decimal($grandcredit).' '.$currency_id;
 		  }
-		  $download="<a  href=" . $url .$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($value['type'] == 'I'){
-		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{
-					  $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>';
+		  $download = "<a  href=".$url.$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 ($value['type'] == 'I') {
+		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 {
+					  $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";
+  				$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{
-					 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 {
+					 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 {
 				$payment = '<button style="padding: 0 17px;" type="button"  class="btn btn-success">Paid</button>';
 					 }
-				 $delete_button="&nbsp";
+				 $delete_button = "&nbsp";
   		   }		
-			 }else{
+			 } else {
 			   $payment = '';
 		   }
-		   $account_arr = $this->db_model->getSelect('first_name,number,last_name','accounts', array('id'=>$value['accountid']));
+		   $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{
-		$invoice_type='Automatically';
+			if ($value['generate_type'] == 1) {
+		$invoice_type = 'Manually';
+	   } else {
+		$invoice_type = 'Automatically';
 	   }    
-	   if($value['deleted'] == 1){
-		$download='';
-		$payment='<button style="padding: 0 17px;" type="button"  class="btn btn-line-sky">Deleted</button>';
-		$delete_button='';
+	   if ($value['deleted'] == 1) {
+		$download = '';
+		$payment = '<button style="padding: 0 17px;" type="button"  class="btn btn-line-sky">Deleted</button>';
+		$delete_button = '';
 	   }
 	   
-	   if($value['deleted'] == 1){
-		$download='';
-		$payment='<button style="padding: 0 17px;" type="button"  class="btn btn-line-sky">Deleted</button>';
-		$delete_button='';
+	   if ($value['deleted'] == 1) {
+		$download = '';
+		$payment = '<button style="padding: 0 17px;" type="button"  class="btn btn-line-sky">Deleted</button>';
+		$delete_button = '';
 	   }
-		if($value['type'] == 'R'){
+		if ($value['type'] == 'R') {
 		$icon = '<div class="flx_font flx_magenta">R</div>';
 		} else
 		{		
@@ -205,281 +205,281 @@ 
 				$download.''.$payment.' '.$delete_button,
 	
   			));
-		  $total_value=$total_value + $value['amount'];
-		  $ountstanding_value=$ountstanding_value + $outstanding;        
+		  $total_value = $total_value + $value['amount'];
+		  $ountstanding_value = $ountstanding_value + $outstanding;        
 		 }
 		 }  
 		echo json_encode($json_data);
   
 	}
-	function invoice_manually_edit($id){
+	function invoice_manually_edit($id) {
 		$confirm = $this->common->get_field_name('confirm', 'invoices', $id);	
 		$deleted = $this->common->get_field_name('deleted', 'invoices', $id);	
-	if($confirm == 1 || $deleted == 1){
-	  	  redirect(base_url() . 'invoices/invoice_list/');
+	if ($confirm == 1 || $deleted == 1) {
+	  	  redirect(base_url().'invoices/invoice_list/');
 	}
-	$data['total_tax_dis']=0;
-	$data['total_credit_dis']=0;
-		 $query="SELECT  * from invoice_details where generate_type=1 AND invoiceid='$id' ";     
-		  $invoice_total_query=$this->db->query($query);
-	  $data['count']=0;
-	  $data['row_count']=5;
+	$data['total_tax_dis'] = 0;
+	$data['total_credit_dis'] = 0;
+		 $query = "SELECT  * from invoice_details where generate_type=1 AND invoiceid='$id' ";     
+		  $invoice_total_query = $this->db->query($query);
+	  $data['count'] = 0;
+	  $data['row_count'] = 5;
 		  if ($invoice_total_query->num_rows() > 0) {
-		$count=$invoice_total_query ->num_rows();
- 		$data['count']=$count;
-		$invoice_total_query= $invoice_total_query->result_array();
-		$i=1;
-		$taxi=0;
-		$get_data=array();
-		$data['total_tax_dis']=array();
-	  		foreach($invoice_total_query as $value){
-		if($value['item_type'] == 'TAX'){
-			$data['total_tax_dis'][$taxi]=$value['debit'];
+		$count = $invoice_total_query ->num_rows();
+ 		$data['count'] = $count;
+		$invoice_total_query = $invoice_total_query->result_array();
+		$i = 1;
+		$taxi = 0;
+		$get_data = array();
+		$data['total_tax_dis'] = array();
+	  		foreach ($invoice_total_query as $value) {
+		if ($value['item_type'] == 'TAX') {
+			$data['total_tax_dis'][$taxi] = $value['debit'];
 			$taxi++;
-		}else{
-			 if($i >= 5){
-	   			 $data['row_count']=$i+1;
+		} else {
+			 if ($i >= 5) {
+	   			 $data['row_count'] = $i + 1;
 			 }
-			 $get_data['invoice_from_date_'.$i]=$value['created_date'];
-			 $get_data['invoice_description_'.$i]=$value['description'];
-			 $get_data['invoice_amount_'.$i]=$value['debit'];
+			 $get_data['invoice_from_date_'.$i] = $value['created_date'];
+			 $get_data['invoice_description_'.$i] = $value['description'];
+			 $get_data['invoice_amount_'.$i] = $value['debit'];
 			 $i++;
 			 $data['total_credit_dis'] += $value['debit'];	
 		}
 		}
-		$data['get_data']=$get_data;
+		$data['get_data'] = $get_data;
 	  }
 		 $account_data = $this->session->userdata("accountinfo");
 		 $logintype = $this->session->userdata('logintype');
-		 $invoice_total='';
-		 $query="SELECT  * from invoice_details where item_type='INVPAY' AND invoiceid='$id' ORDER BY created_date ASC";
+		 $invoice_total = '';
+		 $query = "SELECT  * from invoice_details where item_type='INVPAY' AND invoiceid='$id' ORDER BY created_date ASC";
 		 $invoice = $this->db_model->getSelect("*", "invoices", array("id"=> $id));
 		 if ($invoice ->num_rows() > 0) {
-			 $invoice= $invoice->result_array();
-			 $result=$invoice[0];
-			 $data['payment_due_date']=$result['due_date'];
+			 $invoice = $invoice->result_array();
+			 $result = $invoice[0];
+			 $data['payment_due_date'] = $result['due_date'];
 		  }
      
-			$accountdata = $this->db_model->getSelect("*","accounts",array("id"=> $result['accountid']));
+			$accountdata = $this->db_model->getSelect("*", "accounts", array("id"=> $result['accountid']));
 			if ($accountdata ->num_rows() > 0) {
-			   $accountdata =  $accountdata->result_array();
+			   $accountdata = $accountdata->result_array();
 			 	   $accountdata = $accountdata[0];
 			 }
-		$data['taxes_count']= 0;
-			$taxes = $this->db_model->getSelect("*","taxes_to_accounts",array("accountid"=> $result['accountid']));
-  			$total_tax=0;
-		$data['taxes_count']= $taxes->num_rows();
+		$data['taxes_count'] = 0;
+			$taxes = $this->db_model->getSelect("*", "taxes_to_accounts", array("accountid"=> $result['accountid']));
+  			$total_tax = 0;
+		$data['taxes_count'] = $taxes->num_rows();
 			if ($taxes ->num_rows() > 0) {
-			   $taxes =  $taxes->result_array();
-		   foreach($taxes as $tax_value){
-					  $taxe_res = $this->db_model->getSelect("*","taxes",array("id"=> $tax_value['taxes_id']));
-				  $taxe_res =  $taxe_res->result_array();
-			  foreach($taxe_res as $taxe_res_val){
-			  $data['taxes_to_accounts'][]= $taxe_res_val;
-				 $total_tax +=$taxe_res_val['taxes_rate'];
+			   $taxes = $taxes->result_array();
+		   foreach ($taxes as $tax_value) {
+					  $taxe_res = $this->db_model->getSelect("*", "taxes", array("id"=> $tax_value['taxes_id']));
+				  $taxe_res = $taxe_res->result_array();
+			  foreach ($taxe_res as $taxe_res_val) {
+			  $data['taxes_to_accounts'][] = $taxe_res_val;
+				 $total_tax += $taxe_res_val['taxes_rate'];
 			  }
 		   }
 			 }		
 
 		$system_config = common_model::$global_config['system_config'];
-		if($system_config["paypal_mode"]==0){
+		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"];
 		 }
 		$date = strtotime($result['invoice_date']);
-		$data['time'] = date("Y-m-d h:i:s ",$date);
+		$data['time'] = date("Y-m-d h:i:s ", $date);
 		$data["paypal_tax"] = $system_config["paypal_tax"];
 		$data["from_currency"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		$data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
-	if($account_data['type'] == -1){
+	if ($account_data['type'] == -1) {
 		$data["to_currency"] = $data["to_currency"];
-	} 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"];
 	} 
-	$data['total_tax']=$total_tax;
- 	$data['invoice_notes']=$result['notes'];
- 	$data['from_date']=$result['from_date'];
-	$data['to_date']=$result['to_date'];
-	$data['invoice_date']=$result['invoice_date'];
-	$data['amount'] =  $this->common_model->calculate_currency($result['amount'],'','','','');
-	$data['invoice_prefix'] =  $result['invoice_prefix'];
-	$data['page_title'] =  'Invoice Summary';
-	$data['invoice_date']=$result['invoice_date'];
-	$data['return'] =base_url() . "invoices/invoice_list_modified";
-	$data['cancel_return'] =base_url()."invoice/invoice_list_cancel";
+	$data['total_tax'] = $total_tax;
+ 	$data['invoice_notes'] = $result['notes'];
+ 	$data['from_date'] = $result['from_date'];
+	$data['to_date'] = $result['to_date'];
+	$data['invoice_date'] = $result['invoice_date'];
+	$data['amount'] = $this->common_model->calculate_currency($result['amount'], '', '', '', '');
+	$data['invoice_prefix'] = $result['invoice_prefix'];
+	$data['page_title'] = 'Invoice Summary';
+	$data['invoice_date'] = $result['invoice_date'];
+	$data['return'] = base_url()."invoices/invoice_list_modified";
+	$data['cancel_return'] = base_url()."invoice/invoice_list_cancel";
 	$data['paypal_mode'] = 1;
-	$data['prefix_id']=$result['invoiceid'];
-	$data['logintype']=$logintype;
+	$data['prefix_id'] = $result['invoiceid'];
+	$data['logintype'] = $logintype;
 	$data['accountdata'] = $accountdata;
-	$data['id']=$id;
-	$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{
-		$data['response_url'] = base_url() . "user/user_list_responce/";
+	$data['id'] = $id;
+	$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 {
+		$data['response_url'] = base_url()."user/user_list_responce/";
 	}
-	$data['sucess_url'] = base_url() . "invoices/invoice_list_sucess";
-	 	$this->load->view('view_invoice_edit_manually',$data);
+	$data['sucess_url'] = base_url()."invoices/invoice_list_sucess";
+	 	$this->load->view('view_invoice_edit_manually', $data);
 	}
-	function invoice_automatically_edit($id){
+	function invoice_automatically_edit($id) {
 		$confirm = $this->common->get_field_name('confirm', 'invoices', $id);	
 		$deleted = $this->common->get_field_name('deleted', 'invoices', $id);	
-	if($confirm == 1 || $deleted == 1){
-	  	  redirect(base_url() . 'invoices/invoice_list/');
+	if ($confirm == 1 || $deleted == 1) {
+	  	  redirect(base_url().'invoices/invoice_list/');
 	}
-	$data['total_tax_dis']=0;
-	$data['total_credit_dis']=0;
-		 $query="SELECT  * from invoice_details where invoiceid='$id' ";     
-		  $invoice_total_query=$this->db->query($query);
-	  $data['count']=0;
-	  $data['row_count']=5;
+	$data['total_tax_dis'] = 0;
+	$data['total_credit_dis'] = 0;
+		 $query = "SELECT  * from invoice_details where invoiceid='$id' ";     
+		  $invoice_total_query = $this->db->query($query);
+	  $data['count'] = 0;
+	  $data['row_count'] = 5;
 		  if ($invoice_total_query->num_rows() > 0) {
-		$count=$invoice_total_query ->num_rows();
- 		$data['count']=$count;
-		$invoice_total_query= $invoice_total_query->result_array();
-		$i=1;$taxi=0;
-		$get_data=array();
-		$data['total_tax_dis']=array();
-		$data['total_credit_sum']=0;
-	  		foreach($invoice_total_query as $value){
-		if($value['item_type'] == 'TAX'){
-			$data['total_tax_dis'][$taxi]=$value['debit'];
+		$count = $invoice_total_query ->num_rows();
+ 		$data['count'] = $count;
+		$invoice_total_query = $invoice_total_query->result_array();
+		$i = 1; $taxi = 0;
+		$get_data = array();
+		$data['total_tax_dis'] = array();
+		$data['total_credit_sum'] = 0;
+	  		foreach ($invoice_total_query as $value) {
+		if ($value['item_type'] == 'TAX') {
+			$data['total_tax_dis'][$taxi] = $value['debit'];
 			$taxi++;
-		} else{
-		   if($value['generate_type'] == 1){
-			 if($i >= 5){
-	   			 $data['row_count']=$i+1;
+		} else {
+		   if ($value['generate_type'] == 1) {
+			 if ($i >= 5) {
+	   			 $data['row_count'] = $i + 1;
 			 }
-			 $get_data['invoice_from_date_'.$i]=$value['created_date'];
-			 $get_data['invoice_description_'.$i]=$value['description'];
-			 $get_data['invoice_amount_'.$i]=$value['debit'];
+			 $get_data['invoice_from_date_'.$i] = $value['created_date'];
+			 $get_data['invoice_description_'.$i] = $value['description'];
+			 $get_data['invoice_amount_'.$i] = $value['debit'];
 			 $i++;	
 			 $data['total_credit_dis'] += $value['debit'];	
 		   }
 			 $data['total_credit_sum'] += $value['debit'];	
 		}
 		}
-		$data['get_data']=$get_data;
+		$data['get_data'] = $get_data;
 	  }
 		 $account_data = $this->session->userdata("accountinfo");
 		 $logintype = $this->session->userdata('logintype');
-		 $invoice_total='';
-		 $query="SELECT  * from invoice_details where invoiceid='$id' and generate_type=0 and item_type != 'TAX'  ORDER BY id ASC";
-		  $invoice_total_query=$this->db->query($query);
-	  $data['auto_count']=0;
+		 $invoice_total = '';
+		 $query = "SELECT  * from invoice_details where invoiceid='$id' and generate_type=0 and item_type != 'TAX'  ORDER BY id ASC";
+		  $invoice_total_query = $this->db->query($query);
+	  $data['auto_count'] = 0;
 		  if ($invoice_total_query ->num_rows() > 0) {
-	  $data['auto_count']=$invoice_total_query ->num_rows();		
-			$invoice_total_query= $invoice_total_query->result_array();
+	  $data['auto_count'] = $invoice_total_query ->num_rows();		
+			$invoice_total_query = $invoice_total_query->result_array();
          
-			$data['invoice_total_query']=$invoice_total_query;
+			$data['invoice_total_query'] = $invoice_total_query;
 		  }
 		 $invoice = $this->db_model->getSelect("*", "invoices", array("id"=> $id));
 		 if ($invoice ->num_rows() > 0) {
-			 $invoice= $invoice->result_array();
-			 $result=$invoice[0];
-			 $data['payment_due_date']=$result['due_date'];
+			 $invoice = $invoice->result_array();
+			 $result = $invoice[0];
+			 $data['payment_due_date'] = $result['due_date'];
 		  }
-		 $invoice_auto_res = $this->db_model->getSelect("sum(debit) as debit", "invoice_details", array("invoiceid"=> $id,'generate_type'=>0));
-	 $data['invoice_auto_res']=0;
+		 $invoice_auto_res = $this->db_model->getSelect("sum(debit) as debit", "invoice_details", array("invoiceid"=> $id, 'generate_type'=>0));
+	 $data['invoice_auto_res'] = 0;
 		 if ($invoice_auto_res ->num_rows() > 0) {
-			 $invoice_auto_res= $invoice_auto_res->result_array();
-			 $result_auto_res=$invoice_auto_res[0];
-		 $data['invoice_auto_res']	=$result_auto_res['debit'];
+			 $invoice_auto_res = $invoice_auto_res->result_array();
+			 $result_auto_res = $invoice_auto_res[0];
+		 $data['invoice_auto_res'] = $result_auto_res['debit'];
 		  }
      
-			$accountdata = $this->db_model->getSelect("*","accounts",array("id"=> $result['accountid']));
+			$accountdata = $this->db_model->getSelect("*", "accounts", array("id"=> $result['accountid']));
 			if ($accountdata ->num_rows() > 0) {
-			   $accountdata =  $accountdata->result_array();
+			   $accountdata = $accountdata->result_array();
 			 $accountdata = $accountdata[0];
 			 }
-		$data['taxes_count']= 0;
-			$taxes = $this->db_model->getSelect("*","taxes_to_accounts",array("accountid"=> $result['accountid']));
-		$data['taxes_count']= $taxes->num_rows();
- 			$total_tax=0;
+		$data['taxes_count'] = 0;
+			$taxes = $this->db_model->getSelect("*", "taxes_to_accounts", array("accountid"=> $result['accountid']));
+		$data['taxes_count'] = $taxes->num_rows();
+ 			$total_tax = 0;
 			if ($taxes ->num_rows() > 0) {
-			   $taxes =  $taxes->result_array();
-		   foreach($taxes as $tax_value){
-					  $taxe_res = $this->db_model->getSelect("*","taxes",array("id"=> $tax_value['taxes_id']));
-				  $taxe_res =  $taxe_res->result_array();
-			  foreach($taxe_res as $taxe_res_val){
-			  $data['taxes_to_accounts'][]= $taxe_res_val;
-				 $total_tax +=$taxe_res_val['taxes_rate'];
+			   $taxes = $taxes->result_array();
+		   foreach ($taxes as $tax_value) {
+					  $taxe_res = $this->db_model->getSelect("*", "taxes", array("id"=> $tax_value['taxes_id']));
+				  $taxe_res = $taxe_res->result_array();
+			  foreach ($taxe_res as $taxe_res_val) {
+			  $data['taxes_to_accounts'][] = $taxe_res_val;
+				 $total_tax += $taxe_res_val['taxes_rate'];
 			  }
 		   }
 			 }		
 
 		$system_config = common_model::$global_config['system_config'];
-		if($system_config["paypal_mode"]==0){
+		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"];
 		 }
 		$date = strtotime($result['invoice_date']);
- 	$data['total_tax']=$total_tax;
-		$data['time'] = date("Y-m-d h:i:s ",$date);
+ 	$data['total_tax'] = $total_tax;
+		$data['time'] = date("Y-m-d h:i:s ", $date);
 		$data["paypal_tax"] = $system_config["paypal_tax"];
 		$data["from_currency"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		$data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
-	if($account_data['type'] == -1){
+	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"];
 	} 
- 	$data['from_date']=$result['from_date'];
-	$data['to_date']=$result['to_date'];
- 	$data['invoice_notes']=$result['notes'];
-	$data['invoice_date']=$result['invoice_date'];
-	$data['amount'] =  $this->common_model->calculate_currency($result['amount'],'','','','');
-	$data['invoice_prefix'] =  $result['invoice_prefix'];
-	$data['page_title'] =  'Invoice Summary';
-	$data['invoice_date']=$result['invoice_date'];
-	$data['return'] =base_url() . "invoices/invoice_list_modified";
-	$data['cancel_return'] =base_url()."invoice/invoice_list_cancel";
+ 	$data['from_date'] = $result['from_date'];
+	$data['to_date'] = $result['to_date'];
+ 	$data['invoice_notes'] = $result['notes'];
+	$data['invoice_date'] = $result['invoice_date'];
+	$data['amount'] = $this->common_model->calculate_currency($result['amount'], '', '', '', '');
+	$data['invoice_prefix'] = $result['invoice_prefix'];
+	$data['page_title'] = 'Invoice Summary';
+	$data['invoice_date'] = $result['invoice_date'];
+	$data['return'] = base_url()."invoices/invoice_list_modified";
+	$data['cancel_return'] = base_url()."invoice/invoice_list_cancel";
 	$data['paypal_mode'] = 1;
-	$data['prefix_id']=$result['invoiceid'];
-	$data['logintype']=$logintype;
+	$data['prefix_id'] = $result['invoiceid'];
+	$data['logintype'] = $logintype;
 	$data['accountdata'] = $accountdata;
-	$data['id']=$id;
-	$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{
-		$data['response_url'] = base_url() . "user/user_list_responce/";
+	$data['id'] = $id;
+	$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 {
+		$data['response_url'] = base_url()."user/user_list_responce/";
 	}
-	$data['sucess_url'] = base_url() . "invoices/invoice_list_sucess";
+	$data['sucess_url'] = base_url()."invoices/invoice_list_sucess";
 
-	 	$this->load->view('view_invoice_edit_automatically',$data);
+	 	$this->load->view('view_invoice_edit_automatically', $data);
 	}
-	function invoice_manually_payment_edit_save(){
-	$response_arr=$_POST;
-	if(isset($response_arr['save'])){
-	   $confirm=0;
-	} else{
-	   $confirm=1;
+	function invoice_manually_payment_edit_save() {
+	$response_arr = $_POST;
+	if (isset($response_arr['save'])) {
+	   $confirm = 0;
+	} else {
+	   $confirm = 1;
 	}
-	$where=array('invoiceid'=>$response_arr['invoiceid'],'generate_type'=>1);
+	$where = array('invoiceid'=>$response_arr['invoiceid'], 'generate_type'=>1);
 		$this->db->where($where);
 		$this->db->delete("invoice_details");
-	$final_bal=0;	
-	$final_tax_bal=0;
+	$final_bal = 0;	
+	$final_tax_bal = 0;
 		$account_balance = $this->common->get_field_name('balance', 'accounts', $response_arr['accountid']);
-	if($response_arr['taxes_count'] > 0){	
-	for($a=0 ;$a < $response_arr['taxes_count'];$a++){
-		$add_arr=array(
+	if ($response_arr['taxes_count'] > 0) {	
+	for ($a = 0; $a < $response_arr['taxes_count']; $a++) {
+		$add_arr = array(
 			  'accountid'=>$response_arr['accountid'],
 			  'reseller_id'=>$response_arr['reseller_id'],
 			  'invoiceid'=>$response_arr['invoiceid'],
@@ -487,16 +487,16 @@ 
 			  'generate_type'=>1,
 			  'item_type'=>'TAX',
 			  'description'=>$response_arr['description_total_tax_input_'.$a],
-			  'debit'=>$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a],"","",true,false),
+			  'debit'=>$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a], "", "", true, false),
 			  'created_date'=>gmdate("Y-m-d H:i:s"),
 			);
-		 $final_tax_bal +=$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a],"","",true,false);	
-		   	 $this->db->insert("invoice_details",$add_arr);
+		 $final_tax_bal += $this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a], "", "", true, false);	
+		   	 $this->db->insert("invoice_details", $add_arr);
 	}
 	}
 	for ($i = 1; $i <= $response_arr['row_count']; $i++) {
-		if($response_arr['invoice_amount_'.$i] != ''){
-			$add_arr=array(
+		if ($response_arr['invoice_amount_'.$i] != '') {
+			$add_arr = array(
 			  'accountid'=>$response_arr['accountid'],
 			  'reseller_id'=>$response_arr['reseller_id'],
 			  'invoiceid'=>$response_arr['invoiceid'],
@@ -504,29 +504,29 @@ 
 			  'generate_type'=>1,
 			  'item_type'=>'manual_inv',
 			  'description'=>$response_arr['invoice_description_'.$i],
-			  'debit'=>$this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i],"","",true,false),
+			  'debit'=>$this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i], "", "", true, false),
 			  'created_date'=>$response_arr['invoice_from_date_'.$i],
 			);
-		   	 $this->db->insert("invoice_details",$add_arr);	
+		   	 $this->db->insert("invoice_details", $add_arr);	
 		}
-		$final_bal += $this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i],"","",true,false);
+		$final_bal += $this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i], "", "", true, false);
 	  }
-		  $query="select  sum(debit) as credit from invoice_details where invoiceid = ".$response_arr['invoiceid']; 
-		  $invoice_total_query=$this->db->query($query);
-		  $invoice_total_query= $invoice_total_query->result_array();
-		  $data = array('amount' =>$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false),'confirm'=>$confirm,'notes'=>$response_arr['invoice_notes']);
+		  $query = "select  sum(debit) as credit from invoice_details where invoiceid = ".$response_arr['invoiceid']; 
+		  $invoice_total_query = $this->db->query($query);
+		  $invoice_total_query = $invoice_total_query->result_array();
+		  $data = array('amount' =>$this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false), 'confirm'=>$confirm, 'notes'=>$response_arr['invoice_notes']);
 		  $this->db->where("id", $response_arr['invoiceid']);        
 		  $this->db->update("invoices", $data);
-	if($confirm == 1){
+	if ($confirm == 1) {
 		$invoice_details = $this->db_model->getSelect("*", "invoice_details", array("invoiceid" => $response_arr["invoiceid"]));
-		if($invoice_details->num_rows >0){
+		if ($invoice_details->num_rows > 0) {
 			$invoice_details_res = $invoice_details->result_array();
-			$after_bal=0;
-			foreach($invoice_details_res as $details_key=>$details_value){
-				$before_balance_add=$account_balance-$after_bal;
-				$after_balance_add=$before_balance_add-$details_value['debit'];
-				$balnace_update=array('before_balance'=>$before_balance_add,'after_balance'=>$after_balance_add);
-				$after_bal +=$details_value['debit'];
+			$after_bal = 0;
+			foreach ($invoice_details_res as $details_key=>$details_value) {
+				$before_balance_add = $account_balance - $after_bal;
+				$after_balance_add = $before_balance_add - $details_value['debit'];
+				$balnace_update = array('before_balance'=>$before_balance_add, 'after_balance'=>$after_balance_add);
+				$after_bal += $details_value['debit'];
 				$this->db->where("id", $details_value['id']);
 				$this->db->update("invoice_details", $balnace_update);       
 			}
@@ -534,21 +534,21 @@ 
 
 		$account_data = $this->db_model->getSelect("*", "accounts", array("id" => $response_arr["accountid"]));
 		$account_data = $account_data->result_array();
-		if($account_data[0]['posttoexternal'] == 1){
-			$bal_data=$account_data[0]['balance']-$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false);
-		} else{
-			$bal_data=$account_data[0]['balance']-$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false);
-			if($response_arr['reseller_id'] == 0){
-				$payment=1;
-			} else{
-				$payment=$response_arr['reseller_id'];
+		if ($account_data[0]['posttoexternal'] == 1) {
+			$bal_data = $account_data[0]['balance'] - $this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false);
+		} else {
+			$bal_data = $account_data[0]['balance'] - $this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false);
+			if ($response_arr['reseller_id'] == 0) {
+				$payment = 1;
+			} else {
+				$payment = $response_arr['reseller_id'];
 			}
 				$invoice_prefix = $this->common->get_field_name('invoice_prefix', 'invoices', $response_arr['invoiceid']);
 				$invoice_prefix_id = $this->common->get_field_name('invoiceid', 'invoices', $response_arr['invoiceid']);
-						$payment_arr = array("accountid"=> $response_arr["accountid"],"payment_mode"=>"1","credit"=>$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false),"type"=>"invoice","payment_by"=>$payment,"notes"=>"Payment made by ".$account_data[0]['first_name']." ".$account_data[0]['last_name'].", invoices No: ".$invoice_prefix ."_".$invoice_prefix_id." ","paypalid"=>'',"txn_id"=>'','payment_date'=>gmdate('Y-m-d H:i:s'));
+						$payment_arr = array("accountid"=> $response_arr["accountid"], "payment_mode"=>"1", "credit"=>$this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false), "type"=>"invoice", "payment_by"=>$payment, "notes"=>"Payment made by ".$account_data[0]['first_name']." ".$account_data[0]['last_name'].", invoices No: ".$invoice_prefix."_".$invoice_prefix_id." ", "paypalid"=>'', "txn_id"=>'', 'payment_date'=>gmdate('Y-m-d H:i:s'));
 				$this->db->insert('payments', $payment_arr);
 			$account_balance = $this->common->get_field_name('balance', 'accounts', $response_arr['accountid']);
-		$add_arr=array(
+		$add_arr = array(
 			  'accountid'=>$response_arr['accountid'],
 			  'reseller_id'=>$response_arr['reseller_id'],
 			  'invoiceid'=>$response_arr['invoiceid'],
@@ -556,60 +556,60 @@ 
 			  'generate_type'=>1,
 			  'item_type'=>'INVPAY',
 			  'description'=>'Prepaid invoice generate',
-			  'credit'=>$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false),
+			  'credit'=>$this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false),
 			  'created_date'=>gmdate("Y-m-d H:i:s"),
 			  'before_balance'=>$account_balance,
-			  'after_balance'=>$account_balance-$this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false),
+			  'after_balance'=>$account_balance - $this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false),
 			);
-		   	 $this->db->insert("invoice_details",$add_arr);
+		   	 $this->db->insert("invoice_details", $add_arr);
 		}
 		$this->db->where("id", $response_arr['accountid']);        
-		$act_status=0;
-		if($bal_data < 0 && $account_data[0]['posttoexternal'] == 0){
-			$act_status=1;
+		$act_status = 0;
+		if ($bal_data < 0 && $account_data[0]['posttoexternal'] == 0) {
+			$act_status = 1;
 		}     
-		$balance_data = array('balance' => $bal_data,'status'=>$act_status);
+		$balance_data = array('balance' => $bal_data, 'status'=>$act_status);
 		$this->db->update("accounts", $balance_data);
 /*** invoice mail ***/
-		$this->invoice_send_notification($response_arr['invoiceid'],$account_data[0],'manually');
+		$this->invoice_send_notification($response_arr['invoiceid'], $account_data[0], 'manually');
 /***** ***/
 	}
 		  $this->session->set_flashdata('astpp_errormsg', 'Invoice updated successfully!'); 
-	  	  redirect(base_url() . 'invoices/invoice_list/');
+	  	  redirect(base_url().'invoices/invoice_list/');
 	}
-	function invoice_automatically_payment_edit_save(){
-	$response_arr=$_POST;
-	if(isset($response_arr['save'])){
-	   $confirm=0;
-	} else{
-	   $confirm=1;
+	function invoice_automatically_payment_edit_save() {
+	$response_arr = $_POST;
+	if (isset($response_arr['save'])) {
+	   $confirm = 0;
+	} else {
+	   $confirm = 1;
 	}
-	foreach($response_arr['auto_invoice_date'] as $key=>$val){
-		  $data = array('debit' => $this->common_model->add_calculate_currency($response_arr['auto_invoice_amount'][$key],"","",true,false),'created_date'=>$response_arr['auto_invoice_date'][$key],'description'=>$response_arr['auto_invoice_description'][$key],'generate_type'=>0);
+	foreach ($response_arr['auto_invoice_date'] as $key=>$val) {
+		  $data = array('debit' => $this->common_model->add_calculate_currency($response_arr['auto_invoice_amount'][$key], "", "", true, false), 'created_date'=>$response_arr['auto_invoice_date'][$key], 'description'=>$response_arr['auto_invoice_description'][$key], 'generate_type'=>0);
 		  $this->db->where("id", $key);        
 		  $this->db->update("invoice_details", $data);
 
 	}
-	$where=array('invoiceid'=>$response_arr['invoiceid'],'generate_type'=>1);
+	$where = array('invoiceid'=>$response_arr['invoiceid'], 'generate_type'=>1);
 		$this->db->where($where);
 		$this->db->delete("invoice_details");
-	$final_bal=0;
-	$final_tax_bal=0;
+	$final_bal = 0;
+	$final_tax_bal = 0;
 		$account_balance = $this->common->get_field_name('balance', 'accounts', $response_arr['accountid']);	
-	if($response_arr['taxes_count'] > 0){
-	for($a=0 ;$a < $response_arr['row_count'];$a++){
-		$arr_update=array('item_type'=>'TAX','id'=>$response_arr['description_total_tax_id_'.$a]);
+	if ($response_arr['taxes_count'] > 0) {
+	for ($a = 0; $a < $response_arr['row_count']; $a++) {
+		$arr_update = array('item_type'=>'TAX', 'id'=>$response_arr['description_total_tax_id_'.$a]);
 		$this->db->where($arr_update);
-		$update_arr=array(
-			  'debit'=>$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a],"","",true,false),
+		$update_arr = array(
+			  'debit'=>$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a], "", "", true, false),
 			);
-		 $final_tax_bal +=$this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a],"","",true,false);	
-		   	 $this->db->update("invoice_details",$update_arr);
+		 $final_tax_bal += $this->common_model->add_calculate_currency($response_arr['abc_total_tax_input_'.$a], "", "", true, false);	
+		   	 $this->db->update("invoice_details", $update_arr);
 	}
 	}
-		 for ($i = 1; $i <=$response_arr['row_count']; $i++) {
-		if($response_arr['invoice_amount_'.$i] != ''){
-			$add_arr=array(
+		 for ($i = 1; $i <= $response_arr['row_count']; $i++) {
+		if ($response_arr['invoice_amount_'.$i] != '') {
+			$add_arr = array(
 			  'accountid'=>$response_arr['accountid'],
 			  'reseller_id'=>$response_arr['reseller_id'],
 			  'invoiceid'=>$response_arr['invoiceid'],
@@ -617,29 +617,29 @@ 
 			  'generate_type'=>1,
 			  'item_type'=>'manual_inv',
 			  'description'=>$response_arr['invoice_description_'.$i],
-			  'debit'=>$this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i],"","",true,false),
+			  'debit'=>$this->common_model->add_calculate_currency($response_arr['invoice_amount_'.$i], "", "", true, false),
 			  'created_date'=>$response_arr['invoice_from_date_'.$i],
 			);
-		   	 $this->db->insert("invoice_details",$add_arr);	
+		   	 $this->db->insert("invoice_details", $add_arr);	
 		}
 		}
-		$query="select  sum(debit) as credit from invoice_details where invoiceid = ".$response_arr['invoiceid']; 
-		$invoice_total_query=$this->db->query($query);
-		$invoice_total_query= $invoice_total_query->result_array();
-		$data = array('amount' => $this->common_model->add_calculate_currency($response_arr['total_val_final'],"","",true,false),'confirm'=>$confirm,'notes'=>$response_arr['invoice_notes']);
+		$query = "select  sum(debit) as credit from invoice_details where invoiceid = ".$response_arr['invoiceid']; 
+		$invoice_total_query = $this->db->query($query);
+		$invoice_total_query = $invoice_total_query->result_array();
+		$data = array('amount' => $this->common_model->add_calculate_currency($response_arr['total_val_final'], "", "", true, false), 'confirm'=>$confirm, 'notes'=>$response_arr['invoice_notes']);
 		$this->db->where("id", $response_arr['invoiceid']);        
 		$this->db->update("invoices", $data);
-	if($confirm == 1){
+	if ($confirm == 1) {
 		$invoice_details = $this->db_model->getSelect("*", "invoice_details", array("invoiceid" => $response_arr["invoiceid"]));
-		if($invoice_details->num_rows >0){
+		if ($invoice_details->num_rows > 0) {
 			$invoice_details_res = $invoice_details->result_array();
-			$after_bal=0;
-			foreach($invoice_details_res as $details_key=>$details_value){
-			   if($details_value['item_type'] != 'STANDARD'){
-				$before_balance_add=$account_balance-$after_bal;
-				$after_balance_add=$before_balance_add-$details_value['debit'];
-				$balnace_update=array('before_balance'=>$before_balance_add,'after_balance'=>$after_balance_add);
-				$after_bal +=$details_value['debit'];
+			$after_bal = 0;
+			foreach ($invoice_details_res as $details_key=>$details_value) {
+			   if ($details_value['item_type'] != 'STANDARD') {
+				$before_balance_add = $account_balance - $after_bal;
+				$after_balance_add = $before_balance_add - $details_value['debit'];
+				$balnace_update = array('before_balance'=>$before_balance_add, 'after_balance'=>$after_balance_add);
+				$after_bal += $details_value['debit'];
 				$this->db->where("id", $details_value['id']);
 				$this->db->update("invoice_details", $balnace_update);       
 			   }			   
@@ -647,266 +647,266 @@ 
 		}
 		$account_data = $this->db_model->getSelect("*", "accounts", array("id" => $response_arr["accountid"]));
 		$account_data = $account_data->result_array();
-		$invoice_not_deduct= $this->db_model->getSelect("*", "invoice_details", array("invoiceid" =>$response_arr['invoiceid']));
-		$standard_call_balance=0;
+		$invoice_not_deduct = $this->db_model->getSelect("*", "invoice_details", array("invoiceid" =>$response_arr['invoiceid']));
+		$standard_call_balance = 0;
 		$invoice_not_deduct = $invoice_not_deduct->result_array();
-		foreach($invoice_not_deduct as $key=>$invoice_nodeduct_val){
-			if($invoice_nodeduct_val['item_type'] == 'STANDARD'){
-			   $standard_call_balance=$invoice_nodeduct_val['debit'];
+		foreach ($invoice_not_deduct as $key=>$invoice_nodeduct_val) {
+			if ($invoice_nodeduct_val['item_type'] == 'STANDARD') {
+			   $standard_call_balance = $invoice_nodeduct_val['debit'];
 			}
 		}
-		if($account_data[0]['posttoexternal'] == 1){
-			$finaldeduct_bal=$response_arr['total_val_final']-$standard_call_balance;
-			$bal_data=$account_data[0]['balance']-$finaldeduct_bal;
+		if ($account_data[0]['posttoexternal'] == 1) {
+			$finaldeduct_bal = $response_arr['total_val_final'] - $standard_call_balance;
+			$bal_data = $account_data[0]['balance'] - $finaldeduct_bal;
 		}
 		$this->db->where("id", $response_arr['accountid']);        
 		$balance_data = array('balance' => $bal_data);
 		$this->db->update("accounts", $balance_data);
 /*** invoice mail ***/
-		$this->invoice_send_notification($response_arr['invoiceid'],$account_data[0],'auto');
+		$this->invoice_send_notification($response_arr['invoiceid'], $account_data[0], 'auto');
 /***** ***/
 	}
         $this->session->set_flashdata('astpp_errormsg', 'Invoice updated successfully!'); 
-  	redirect(base_url() . 'invoices/invoice_list/');
+  	redirect(base_url().'invoices/invoice_list/');
     }   
 
     /**
      * @param string $inv_flag
      */
-    function invoice_send_notification($invoice_id,$accountdata,$inv_flag){
+    function invoice_send_notification($invoice_id, $accountdata, $inv_flag) {
 		$invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoice_id));
 		$invoicedata = $invoicedata->result_array();
-		$invoicedata =$invoicedata[0];
+		$invoicedata = $invoicedata[0];
          	//$res = $this->common->get_invoice_template($invoicedata,$accountdata,"False");
-		$invoice_conf =  array();
-		if($accountdata['reseller_id'] == 0){
+		$invoice_conf = array();
+		if ($accountdata['reseller_id'] == 0) {
 			$where = array("accountid"=> 1);
-		} else{
+		} else {
 			$where = array("accountid"=> $accountdata['reseller_id']);    
 		}
 		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
-		if($query->num_rows >0){
+		if ($query->num_rows > 0) {
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];
-		} else{
-			$query = $this->db_model->getSelect("*", "invoice_conf",array("accountid"=> 1));
+		} else {
+			$query = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> 1));
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];            
 		}
-		 $template_config=$this->config->item('invoice_screen');
+		 $template_config = $this->config->item('invoice_screen');
 				 include($template_config.'generateInvoice.php');
 				 $generateInvoice = new generateInvoice();
-				 $generateInvoice->download_invoice($invoicedata['id'],$accountdata,$invoice_conf,$inv_flag);
+				 $generateInvoice->download_invoice($invoicedata['id'], $accountdata, $invoice_conf, $inv_flag);
 		return true;
    }   
-	function currency_decimal($amount){
-	$decimal_amount=Common_model::$global_config['system_config']['decimalpoints_total'];
-	$number_convert=number_format((float)$amount,$decimal_amount, '.', '');
+	function currency_decimal($amount) {
+	$decimal_amount = Common_model::$global_config['system_config']['decimalpoints_total'];
+	$number_convert = number_format((float)$amount, $decimal_amount, '.', '');
 	return $number_convert;
 	}
-	function invoice_summary($id){
-		 $query="SELECT  * from invoice_details where  invoiceid='$id' ";
+	function invoice_summary($id) {
+		 $query = "SELECT  * from invoice_details where  invoiceid='$id' ";
         
-		  $invoice_total_query=$this->db->query($query);
+		  $invoice_total_query = $this->db->query($query);
 		  if ($invoice_total_query ->num_rows() > 0) {
-			  $invoice_final_query =  $invoice_total_query->result_array();
-			  $data['invoice_final_query']=$invoice_final_query;
+			  $invoice_final_query = $invoice_total_query->result_array();
+			  $data['invoice_final_query'] = $invoice_final_query;
           
 		 $account_data = $this->session->userdata("accountinfo");
 		 $logintype = $this->session->userdata('logintype');
-		 $invoice_total='';
-		 $query="SELECT  * from invoice_details where item_type='INVPAY' AND invoiceid='$id' ORDER BY created_date ASC";
-		  $invoice_total_query=$this->db->query($query);
+		 $invoice_total = '';
+		 $query = "SELECT  * from invoice_details where item_type='INVPAY' AND invoiceid='$id' ORDER BY created_date ASC";
+		  $invoice_total_query = $this->db->query($query);
 		  if ($invoice_total_query ->num_rows() > 0) {
-			$invoice_total_query= $invoice_total_query->result_array();
+			$invoice_total_query = $invoice_total_query->result_array();
          
-			$data['invoice_total_query']=$invoice_total_query;
+			$data['invoice_total_query'] = $invoice_total_query;
 		  }
 		  $invoice = $this->db_model->getSelect("*", "invoices", array("id"=> $id));
 		  if ($invoice ->num_rows() > 0) {
-			 $invoice= $invoice->result_array();
-			 $result=$invoice[0];
-			 $data['payment_due_date']=$result['due_date'];
+			 $invoice = $invoice->result_array();
+			 $result = $invoice[0];
+			 $data['payment_due_date'] = $result['due_date'];
 		  }
      
-			$accountdata = $this->db_model->getSelect("*","accounts",array("id"=> $result['accountid']));
+			$accountdata = $this->db_model->getSelect("*", "accounts", array("id"=> $result['accountid']));
 			if ($accountdata ->num_rows() > 0) {
-			   $accountdata =  $accountdata->result_array();
+			   $accountdata = $accountdata->result_array();
 			 $accountdata = $accountdata[0];
 			 }
         
 		$system_config = common_model::$global_config['system_config'];
-		if($system_config["paypal_mode"]==0){
+		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"];
 		 }
 		$date = strtotime($result['invoice_date']);
-		$data['time'] = date("Y-m-d h:i:s ",$date);
+		$data['time'] = date("Y-m-d h:i:s ", $date);
 		$data["paypal_tax"] = $system_config["paypal_tax"];
 		$data["from_currency"] = $this->common->get_field_name('currency', 'currency', $account_data["currency_id"]);
 		$data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
-	  if($account_data['type'] == -1){
+	  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"];
 	  }
 	  $data["system_currency"] = Common_model::$global_config['system_config']['base_currency'];
-		foreach($invoice_total_query as  $value){
-		 	$data['from_date']=$result['from_date'];
-			$data['to_date']=$result['to_date'];
-			$data['invoice_date']=$result['invoice_date'];
-			$data['amount'] =  $this->common_model->calculate_currency($result['amount']);
-			$data['invoice_prefix'] =  $result['invoice_prefix'];
-			$data['page_title'] =  'Invoice Summary';
-			$data['invoice_date']=$result['invoice_date'];
-			$data['return'] =base_url() . "invoices/invoice_list_modified";
-			$data['cancel_return'] =base_url()."invoice/invoice_list_cancel";
+		foreach ($invoice_total_query as  $value) {
+		 	$data['from_date'] = $result['from_date'];
+			$data['to_date'] = $result['to_date'];
+			$data['invoice_date'] = $result['invoice_date'];
+			$data['amount'] = $this->common_model->calculate_currency($result['amount']);
+			$data['invoice_prefix'] = $result['invoice_prefix'];
+			$data['page_title'] = 'Invoice Summary';
+			$data['invoice_date'] = $result['invoice_date'];
+			$data['return'] = base_url()."invoices/invoice_list_modified";
+			$data['cancel_return'] = base_url()."invoice/invoice_list_cancel";
 			$data['paypal_mode'] = 1;
-			$data['prefix_id']=$result['invoiceid'];
-			$data['logintype']=$logintype;
+			$data['prefix_id'] = $result['invoiceid'];
+			$data['logintype'] = $logintype;
 			$data['accountdata'] = $accountdata;
-			$data['value']=$value;
-			$data['id']=$id;
-			$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{
-			$data['response_url'] = base_url() . "user/user_list_responce/";
+			$data['value'] = $value;
+			$data['id'] = $id;
+			$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 {
+			$data['response_url'] = base_url()."user/user_list_responce/";
 			}
-			$data['sucess_url'] = base_url() . "invoices/invoice_list_sucess/";
+			$data['sucess_url'] = base_url()."invoices/invoice_list_sucess/";
 	  	}
       	
-	  	}else{
+	  	} else {
       	
-	  	redirect(base_url() . 'dashboard/');
+	  	redirect(base_url().'dashboard/');
 	  	}
-		  $this->load->view('view_invoice_payment',$data);
+		  $this->load->view('view_invoice_payment', $data);
 	}
-	function invoice_list_get_data(){
+	function invoice_list_get_data() {
 	  redirect(base_url().'invoices/invoice_list/');
 	}
-	function convert_amount($amount){
-	   $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
-	   echo number_format($amount,2);
+	function convert_amount($amount) {
+	   $amount = $this->common_model->add_calculate_currency($amount, "", "", true, false);
+	   echo number_format($amount, 2);
 	}
-	 function invoice_list_responce(){
-	  $response_arr=$_POST;
+	 function invoice_list_responce() {
+	  $response_arr = $_POST;
 	   $logintype = $this->session->userdata('logintype');
-	  if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) ){
-		$invoice_id=$response_arr['item_number'];
-		$amount=$response_arr['payment_gross'];       
-		$description=$response_arr['item_name'];     
-		$debit='';         
+	  if (($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed")) {
+		$invoice_id = $response_arr['item_number'];
+		$amount = $response_arr['payment_gross'];       
+		$description = $response_arr['item_name'];     
+		$debit = '';         
                        
-			$paypal_tax = $this->db_model->getSelect("value", "system", array("name" => "paypal_tax","group_title"=>"paypal"));
+			$paypal_tax = $this->db_model->getSelect("value", "system", array("name" => "paypal_tax", "group_title"=>"paypal"));
 			$paypal_tax = $paypal_tax->result();
 			$paypal_tax = $paypal_tax[0]->value;
 			$balance_amt = $actual_amount = $response_arr["custom"];                       
                             
-			$paypal_fee = $this->db_model->getSelect("value", "system", array("name" => "paypal_fee","group_title"=>"paypal"));
+			$paypal_fee = $this->db_model->getSelect("value", "system", array("name" => "paypal_fee", "group_title"=>"paypal"));
 			$paypal_fee = $paypal_fee->result();
 			$paypal_fee = $paypal_fee[0]->value;
 
-			$paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];               
+			$paypalfee = ($paypal_fee == 0) ? '0' : $response_arr["mc_gross"];               
              
 			 $account_data = $this->db_model->getSelect("*", "accounts", array("id" => $response_arr["custom"]));
 			$account_data = $account_data->result_array();
 			$account_data = $account_data[0];              
 			  $currency = $this->db_model->getSelect('currency,currencyrate', 'currency', array("id"=>$account_data["currency_id"]));
 			$currency = $currency->result_array();
-			$currency =$currency[0];
+			$currency = $currency[0];
 			$date = date('Y-m-d H:i:s');              
 			   $invoice_total_query = $this->db_model->getSelect("*", "invoices", array("id"=> $invoice_id));
-		if ( $invoice_total_query ->num_rows() > 0) {
-		 $invoice_total_query= $invoice_total_query->result_array();
-		 $debit=$invoice_total_query[0]['amount'];
+		if ($invoice_total_query ->num_rows() > 0) {
+		 $invoice_total_query = $invoice_total_query->result_array();
+		 $debit = $invoice_total_query[0]['amount'];
 		}             
-			  $query="select  sum(credit) as credit from invoice_details where invoiceid = ".$invoice_id." AND item_type !='PAYMENT' Group By invoiceid";  
+			  $query = "select  sum(credit) as credit from invoice_details where invoiceid = ".$invoice_id." AND item_type !='PAYMENT' Group By invoiceid";  
 		//echo $query; exit;
-		$invoice_total_query=$this->db->query($query);
+		$invoice_total_query = $this->db->query($query);
 		if ($invoice_total_query ->num_rows() > 0) {
-			$invoice_total_query= $invoice_total_query->result_array();
-			$total_debit=$invoice_total_query[0]['credit'];
+			$invoice_total_query = $invoice_total_query->result_array();
+			$total_debit = $invoice_total_query[0]['credit'];
 			}
-			$credit_total=$total_debit+$amount;
+			$credit_total = $total_debit + $amount;
 	   //   echo  $debit; exit;
-		 if($debit >= $credit_total)   {
+		 if ($debit >= $credit_total) {
          
          
-		  if($debit == $credit_total){
+		  if ($debit == $credit_total) {
           
 		  $this->db->where("id", $invoice_id);        
 		  $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);
 		  // echo $this->db->last_query(); exit;
 		  }
         
-		if($amount > $debit){
+		if ($amount > $debit) {
 		  $this->session->set_flashdata('astpp_notification', 'Invoice payment amount should be higher then the invoice amount.');
 		  redirect(base_url().'invoices/invoice_summary/'.$invoice_id);
 		}               
-			$payment_trans_array = array("accountid"=>$response_arr["custom"],"amount"=>$response_arr["payment_gross"],
-				"tax"=>"1","payment_method"=>"Paypal","actual_amount"=> $amount,"paypal_fee"=>  $paypalfee,
-				"user_currency"=>$currency["currency"],"currency_rate"=>$currency["currencyrate"],"transaction_details"=>json_encode($response_arr),"date"=>$date);
-			$this->db->insert('payment_transaction',$payment_trans_array); 
-		 $transaction_details_id= $this->db->insert_id();
+			$payment_trans_array = array("accountid"=>$response_arr["custom"], "amount"=>$response_arr["payment_gross"],
+				"tax"=>"1", "payment_method"=>"Paypal", "actual_amount"=> $amount, "paypal_fee"=>  $paypalfee,
+				"user_currency"=>$currency["currency"], "currency_rate"=>$currency["currencyrate"], "transaction_details"=>json_encode($response_arr), "date"=>$date);
+			$this->db->insert('payment_transaction', $payment_trans_array); 
+		 $transaction_details_id = $this->db->insert_id();
          
         
-			  if($transaction_details_id == ''){
+			  if ($transaction_details_id == '') {
 			  $transaction_details_id == 0;
 			  }
               
-			 $accountdata = $this->db_model->getSelect("*","payment_transaction",array());
-	   if($accountdata->num_rows() > 0){
-		foreach($accountdata->result_array() as $payment_value){
-		  $payment_transaction=$payment_value['transaction_details'];
-		  $payment_result=json_decode($payment_transaction,true);
-		  $transaction_id= $payment_result['txn_id'];
+			 $accountdata = $this->db_model->getSelect("*", "payment_transaction", array());
+	   if ($accountdata->num_rows() > 0) {
+		foreach ($accountdata->result_array() as $payment_value) {
+		  $payment_transaction = $payment_value['transaction_details'];
+		  $payment_result = json_decode($payment_transaction, true);
+		  $transaction_id = $payment_result['txn_id'];
 		}
 	   }
-		 $invoice_total_history = $this->db_model->getSelect("*", "invoice_details", array("invoiceid"=> $invoice_id,'item_type'=>'INVPAY'));
-	$account_balance=$account_data['balance'];
+		 $invoice_total_history = $this->db_model->getSelect("*", "invoice_details", array("invoiceid"=> $invoice_id, 'item_type'=>'INVPAY'));
+	$account_balance = $account_data['balance'];
 	   if ($invoice_total_history ->num_rows() > 0) {
 		// echo 'if'; exit;
-		 $invoice_main= $invoice_total_history->result_array();
+		 $invoice_main = $invoice_total_history->result_array();
 		// echo '<pre>'; print_r($invoice_main); exit;
 		 $debit_amount = "0.00";
-		foreach($invoice_main as $value){
+		foreach ($invoice_main as $value) {
 		   $debit_amount = $value['debit'];
 		}
        
-		 $actual_amount= $debit_amount-$amount;
+		 $actual_amount = $debit_amount - $amount;
 		  // echo   $actual_amount; exit;
-		$tax_array = array("accountid"=>$response_arr["custom"],"invoiceid"=>$invoice_id,"item_id"=> $transaction_details_id,"description"=>$description,"debit"=>$this->common->currency_decimal(0),"credit"=> $this->common->currency_decimal($amount),"item_type"=>"INVPAY","created_date"=> $date,"reseller_id"=>$account_data['reseller_id'],'before_balance'=>$account_balance,'after_balance'=>$account_balance+$amount,
-);        // echo '<pre>'; print_r( $tax_array); exit;
-	   	 $this->db->insert("invoice_details",$tax_array);
+		$tax_array = array("accountid"=>$response_arr["custom"], "invoiceid"=>$invoice_id, "item_id"=> $transaction_details_id, "description"=>$description, "debit"=>$this->common->currency_decimal(0), "credit"=> $this->common->currency_decimal($amount), "item_type"=>"INVPAY", "created_date"=> $date, "reseller_id"=>$account_data['reseller_id'], 'before_balance'=>$account_balance, 'after_balance'=>$account_balance + $amount,
+); // echo '<pre>'; print_r( $tax_array); exit;
+	   	 $this->db->insert("invoice_details", $tax_array);
          
-		 }else{
+		 } else {
          
 		//  echo 'else'; exit;
-		 $actual_amount=$debit-$amount;
-		 $tax_array = array("accountid"=>$response_arr["custom"],"invoiceid"=>$invoice_id,"item_id"=> $transaction_details_id,"description"=>$description,"debit"=> $this->common->currency_decimal(0),"credit"=> $this->common->currency_decimal($amount),"item_type"=>"INVPAY","created_date"=> $date,"reseller_id"=>$account_data['reseller_id'],'before_balance'=>$account_balance,'after_balance'=>$account_balance+$amount); 
+		 $actual_amount = $debit - $amount;
+		 $tax_array = array("accountid"=>$response_arr["custom"], "invoiceid"=>$invoice_id, "item_id"=> $transaction_details_id, "description"=>$description, "debit"=> $this->common->currency_decimal(0), "credit"=> $this->common->currency_decimal($amount), "item_type"=>"INVPAY", "created_date"=> $date, "reseller_id"=>$account_data['reseller_id'], 'before_balance'=>$account_balance, 'after_balance'=>$account_balance + $amount); 
        
-			 $this->db->insert("invoice_details",$tax_array);
+			 $this->db->insert("invoice_details", $tax_array);
 		 }
-	 }else{
-	  if($logintype = 0){
+	 } 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);
 		  }
@@ -914,69 +914,69 @@ 
 	 }
         
 		 $this->load->module('accounts/accounts');
-		 $reseller_debit=0;
-		 $reseller_debit=$this->common->get_field_name('reseller_id', 'accounts', array('id'=>$response_arr["custom"],'status'=>0,'deleted'=>0)); 
+		 $reseller_debit = 0;
+		 $reseller_debit = $this->common->get_field_name('reseller_id', 'accounts', array('id'=>$response_arr["custom"], 'status'=>0, 'deleted'=>0)); 
 		// echo '<pre>'; print_r($reseller_debit); exit;
-		 if($reseller_debit > 0){
-	 $this->accounts_model->update_balance($amount,$response_arr["custom"], "debit");
-	 $this->accounts_model->update_balance($amount,$reseller_debit, "debit");
-	 } else{
-	 $this->accounts_model->update_balance($amount,$response_arr["custom"], "debit");
+		 if ($reseller_debit > 0) {
+	 $this->accounts_model->update_balance($amount, $response_arr["custom"], "debit");
+	 $this->accounts_model->update_balance($amount, $reseller_debit, "debit");
+	 } else {
+	 $this->accounts_model->update_balance($amount, $response_arr["custom"], "debit");
 	 }
-	 $account_data['accountid']=$account_data['id'];
-		 $this->email_lib->send_email('email_payment_notification',$account_data ,'','',0,0,0);
-	 if($logintype = '1'){
+	 $account_data['accountid'] = $account_data['id'];
+		 $this->email_lib->send_email('email_payment_notification', $account_data, '', '', 0, 0, 0);
+	 if ($logintype = '1') {
 		 $this->session->set_flashdata('astpp_errormsg', 'Invoice payment done successfully!');
-	   redirect(base_url() . 'invoices/invoice_list/');
-	   }else{
+	   redirect(base_url().'invoices/invoice_list/');
+	   } else {
 		$this->session->set_flashdata('astpp_errormsg', 'Invoice payment done successfully!');
-	   redirect(base_url() . 'user/user_invoices_list/');
+	   redirect(base_url().'user/user_invoices_list/');
 	   }
 	}
 	  }
-	 function invoice_admin_payment(){
+	 function invoice_admin_payment() {
      
-	 $response_arr=$_POST;
+	 $response_arr = $_POST;
     
-	 if(!empty($response_arr)){
+	 if ( ! empty($response_arr)) {
         
-		$amount=$response_arr['amount'];       
-		$description=$response_arr['item_name'];
-		$invoice_id=$response_arr['item_number'];
+		$amount = $response_arr['amount'];       
+		$description = $response_arr['item_name'];
+		$invoice_id = $response_arr['item_number'];
 		$date = date('Y-m-d H:i:s'); 
     
 		$invoice_total_query = $this->db_model->getSelect("*", "invoices", array("id"=> $invoice_id));
-		if ( $invoice_total_query ->num_rows() > 0) {
-		 $invoice_total_query= $invoice_total_query->result_array();
-		 $debit=$invoice_total_query[0]['amount'];
+		if ($invoice_total_query ->num_rows() > 0) {
+		 $invoice_total_query = $invoice_total_query->result_array();
+		 $debit = $invoice_total_query[0]['amount'];
 		}
          
-		$query="select  sum(credit) as credit from invoice_details where invoiceid = ".$invoice_id."  AND item_type !='PAYMENT'  Group By invoiceid"; 
+		$query = "select  sum(credit) as credit from invoice_details where invoiceid = ".$invoice_id."  AND item_type !='PAYMENT'  Group By invoiceid"; 
 		//echo $query; exit;
-		$invoice_total_query=$this->db->query($query);
+		$invoice_total_query = $this->db->query($query);
 		if ($invoice_total_query ->num_rows() > 0) {
-			$invoice_total_query= $invoice_total_query->result_array();
-			$total_debit=$invoice_total_query[0]['credit'];
+			$invoice_total_query = $invoice_total_query->result_array();
+			$total_debit = $invoice_total_query[0]['credit'];
 			}
-			$credit_total=$total_debit+$amount;
+			$credit_total = $total_debit + $amount;
 		  // echo  $credit_total; exit;
-		 if($debit >= $credit_total)   {
+		 if ($debit >= $credit_total) {
          
          
-		  if($debit == $credit_total){
+		  if ($debit == $credit_total) {
           
 		  $this->db->where("id", $invoice_id);        
 		  $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);
 		  // echo $this->db->last_query(); exit;
 		  }
         
-		if($amount > $debit){
+		if ($amount > $debit) {
 		  $this->session->set_flashdata('astpp_notification', 'Invoice payment amount should be higher then the invoice amount.');
 		  redirect(base_url().'invoices/invoice_summary/'.$invoice_id);
 		}
@@ -984,40 +984,40 @@ 
 
 		$debit_amount = "0.00";
 		$account_balance = $this->common->get_field_name('balance', 'accounts', $response_arr['custom']);
-		$tax_array = array("accountid"=>$response_arr["custom"],"invoiceid"=>$invoice_id,"item_id"=> '',"description"=>$description,"debit"=>"0.00","credit"=> $amount,"item_type"=>"INVPAY","created_date"=> $date,"reseller_id"=>"0",'before_balance'=>$account_balance,'after_balance'=>$account_balance+$amount); 
-		$this->db->insert("invoice_details",$tax_array);
+		$tax_array = array("accountid"=>$response_arr["custom"], "invoiceid"=>$invoice_id, "item_id"=> '', "description"=>$description, "debit"=>"0.00", "credit"=> $amount, "item_type"=>"INVPAY", "created_date"=> $date, "reseller_id"=>"0", 'before_balance'=>$account_balance, 'after_balance'=>$account_balance + $amount); 
+		$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);
 		 }
          
 		 $this->load->module('accounts/accounts');
-	 $this->accounts_model->update_balance($amount,$response_arr["custom"], "debit");
+	 $this->accounts_model->update_balance($amount, $response_arr["custom"], "debit");
 		 $this->session->set_flashdata('astpp_errormsg', 'Invoice payment done successfully!');
         
 	 }
 	 $account_data = $this->db_model->getSelect("*", "accounts", array("id" => $response_arr["custom"]));
 			$account_data = $account_data->result_array();
 			$account_data = $account_data[0]; 
-	 $account_data['accountid']=$account_data['id'];
+	 $account_data['accountid'] = $account_data['id'];
   //   $this->email_lib->send_email('email_payment_notification',$account_data ,'','',0,0,0);
-	 redirect(base_url() . 'invoices/invoice_list/');
+	 redirect(base_url().'invoices/invoice_list/');
      
 	 }
     
-	function invoice_list_sucess(){
+	function invoice_list_sucess() {
 	echo 'sucess'; exit;
     
 	}
-	 function invoice_list_modified(){
+	 function invoice_list_modified() {
 	echo 'sucess'; exit;
     
 	}
     
-	function invoice_delete(){
+	function invoice_delete() {
 	$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
 		$this->db->where($where);
@@ -1027,58 +1027,58 @@ 
 	function invoice_conf() {
 		$data['page_title'] = 'Company Profile';
 		$post_array = $this->input->post();
-		$accountinfo=$this->session->userdata('accountinfo');
+		$accountinfo = $this->session->userdata('accountinfo');
 		unset($post_array['action']);
 		unset($post_array['button']);
 		unset($post_array['file']);
                                 
-		if (!empty($post_array)) {
+		if ( ! empty($post_array)) {
 			$invoice_prefix = trim($post_array['invoice_prefix']);
 			if ($_FILES['file']['name'] == '') {
 				$invoiceconf = $this->invoices_model->get_invoiceconf($post_array['accountid']);
-				$file_name=($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
+				$file_name = ($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
 			}
 			if ($invoice_prefix == '') {
 				$this->session->set_flashdata('astpp_notification', 'Invoice Prefix is required.');
-				redirect(base_url() . 'invoices/invoice_conf/');
+				redirect(base_url().'invoices/invoice_conf/');
 			}
             
 			if (isset($_FILES['file']['name']) && $_FILES['file']['name'] != '') {
 				$files = $_FILES['file'];
 				if ($files['size'] < 0) {
 					$this->session->set_flashdata('astpp_notification', 'PLease upload maximum file');
-					redirect(base_url() . 'invoices/invoice_conf/');
+					redirect(base_url().'invoices/invoice_conf/');
 				}
 				$file = $_FILES['file'];
 				$uploadedFile = $file["tmp_name"];
 				$file_name = $file['name'];
 				$file_type = $file['type'];
 				if ($file_type == 'image/jpg' || $file_type == 'image/png' || $file_type == 'image/jpeg') {
-					$dir_path = FCPATH. "upload/";
-					$path = $dir_path . $accountinfo['id']."_".$file['name'];
+					$dir_path = FCPATH."upload/";
+					$path = $dir_path.$accountinfo['id']."_".$file['name'];
 					if (move_uploaded_file($uploadedFile, $path)) {
 						$this->session->set_flashdata('astpp_errormsg', gettext('files added successfully!'));
 					} else {
 						$this->session->set_flashdata('astpp_notification', "File Uploading Fail Please Try Again");
-						redirect(base_url() . 'invoices/invoice_conf/');
+						redirect(base_url().'invoices/invoice_conf/');
 					}
 				} else {
 					$this->session->set_flashdata('astpp_notification', 'Please upload only image!');
-					redirect(base_url() . 'invoices/invoice_conf/');
+					redirect(base_url().'invoices/invoice_conf/');
 				}
 			}
 			$post_array['logo'] = $file_name;
             
 			$this->invoices_model->save_invoiceconf($post_array);
 			$this->session->set_flashdata('astpp_errormsg', 'Invoice configuration updated sucessfully!');
-			redirect(base_url() . 'invoices/invoice_conf/');
+			redirect(base_url().'invoices/invoice_conf/');
 		} else {
 
 			$invoiceconf = $this->invoices_model->get_invoiceconf($accountinfo['id']);
 
-			if (!empty($invoiceconf)) {
+			if ( ! empty($invoiceconf)) {
 				$data['file_name'] = $accountinfo['id']."_".$invoiceconf['logo'];
-				$invoiceconf['file']=$accountinfo['id']."_".$invoiceconf['logo'];
+				$invoiceconf['file'] = $accountinfo['id']."_".$invoiceconf['logo'];
 			}
             
 			$data['form'] = $this->form->build_form($this->invoices_form->get_invoiceconf_form_fields($invoiceconf), $invoiceconf);
@@ -1086,106 +1086,106 @@ 
 			$this->load->view('view_invoiceconf', $data);
 		}
 	}
-	   function incr($inteval){
+	   function incr($inteval) {
 	   $inteval++; // $a is undefined
 		return $inteval;
 		}
      
     
-	function customer_invoices($accountid){
+	function customer_invoices($accountid) {
 	// echo '<pre>'; print_r($accountid); exit;
 		$json_data = array();
 /****
 Invoice manually
 **/
-		$where = array('accountid' => $accountid,'confirm'=>1);
-		$count_all = $this->db_model->countQuery("*","invoices",$where);
+		$where = array('accountid' => $accountid, 'confirm'=>1);
+		$count_all = $this->db_model->countQuery("*", "invoices", $where);
 		 $currency_id = Common_model::$global_config['system_config']['base_currency'];
-		$paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 	
-		$Invoice_grid_data = $this->db_model->select("*","invoices",$where,"invoice_date","desc",$paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
+		$Invoice_grid_data = $this->db_model->select("*", "invoices", $where, "invoice_date", "desc", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 	  //  echo $this->db->last_query(); exit;
-		$grid_fields= json_decode($this->invoices_form->build_invoices_list_for_admin());
+		$grid_fields = json_decode($this->invoices_form->build_invoices_list_for_admin());
         
 	   // $json_data['rows'] = $this->form->build_grid($Invoice_grid_data,$grid_fields);
 		$logintype = $this->session->userdata('logintype');
-	   $url= ($logintype==0 ||$logintype==3 ) ? "/user/user_invoice_download/":'/invoices/invoice_download/';
-		if($Invoice_grid_data->num_rows > 0 ){
-		  $query=$Invoice_grid_data->result_array();
+	   $url = ($logintype == 0 || $logintype == 3) ? "/user/user_invoice_download/" : '/invoices/invoice_download/';
+		if ($Invoice_grid_data->num_rows > 0) {
+		  $query = $Invoice_grid_data->result_array();
 			$total_value = 0;
 			$ountstanding_value = 0;
          
 		 foreach ($query as $key => $value) {
 		  $date = strtotime($value['invoice_date']);
-		  $invoice_date =date("Y-m-d",$date);
+		  $invoice_date = date("Y-m-d", $date);
 		  $fromdate = strtotime($value['from_date']);
-		  $from_date =date("Y-m-d",$fromdate);
+		  $from_date = date("Y-m-d", $fromdate);
 		  $duedate = strtotime($value['due_date']);
-		  $due_date =date("Y-m-d",$duedate);
+		  $due_date = date("Y-m-d", $duedate);
 		  $outstanding = $value['amount'];
 			 $last_payment_date = '';
-			  $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'],"item_type"=>"INVPAY"),"created_date","DESC","1","0");
+			  $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'], "item_type"=>"INVPAY"), "created_date", "DESC", "1", "0");
 	   // echo $this->db->last_query(); exit;
-		  if ($invoice_total_query ->num_rows() > 0){
-			$invoice_total_query= $invoice_total_query->result_array();
+		  if ($invoice_total_query ->num_rows() > 0) {
+			$invoice_total_query = $invoice_total_query->result_array();
 			//echo '<pre>'; print_r($invoice_total_query); 
 			$outstanding -= $invoice_total_query[0]['credit'];
             
 			$last_payment_date = $invoice_total_query[0]['created_date'];
-			if($last_payment_date ){
-			$payment_date=strtotime( $last_payment_date);
-			$payment_last=date("d/m/Y",$payment_date);
-			}else{
-			 $payment_last='';
+			if ($last_payment_date) {
+			$payment_date = strtotime($last_payment_date);
+			$payment_last = date("d/m/Y", $payment_date);
+			} else {
+			 $payment_last = '';
 			}
          
             
 		  }
-		  $invoice_total='';
-		  $accountinfo=$this->session->userdata('accountinfo');
-		  $id=$accountinfo['id'];
-		  $query ="select sum(amount) as grand_total from invoices where confirm=1 and accountid=$accountid";
+		  $invoice_total = '';
+		  $accountinfo = $this->session->userdata('accountinfo');
+		  $id = $accountinfo['id'];
+		  $query = "select sum(amount) as grand_total from invoices where confirm=1 and accountid=$accountid";
          
-		  $ext_query=$this->db->query($query);
-		  if($ext_query->num_rows() > 0){
-		  $result_total=$ext_query->result_array();
-		  $grandtotal=$result_total[0]['grand_total'];
-		  $grand_total=$this->common->currency_decimal($grandtotal).' '.$currency_id;
+		  $ext_query = $this->db->query($query);
+		  if ($ext_query->num_rows() > 0) {
+		  $result_total = $ext_query->result_array();
+		  $grandtotal = $result_total[0]['grand_total'];
+		  $grand_total = $this->common->currency_decimal($grandtotal).' '.$currency_id;
 		  }
           
-		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where accountid=$accountid";
-		  $credit_query=$this->db->query($invoice_query);
-		  if($credit_query->num_rows() > 0){
-		  $credit_total=$credit_query->result_array();
-		  $grand_credit_total=$credit_total[0]['grand_credit'];
-		  $grandcredit=$grand_total-$grand_credit_total;
-		  $grand_credit=$this->common->currency_decimal($grandcredit).' '.$currency_id;
+		  $invoice_query = "select sum(credit) as grand_credit from invoice_details where accountid=$accountid";
+		  $credit_query = $this->db->query($invoice_query);
+		  if ($credit_query->num_rows() > 0) {
+		  $credit_total = $credit_query->result_array();
+		  $grand_credit_total = $credit_total[0]['grand_credit'];
+		  $grandcredit = $grand_total - $grand_credit_total;
+		  $grand_credit = $this->common->currency_decimal($grandcredit).' '.$currency_id;
 		  }
          
          
        
-		  $download="<a href=" . $url .$value['id']. " class='btn btn-royelblue btn-sm'  title='Download Invoice' ><i class='fa fa-cloud-download fa-fw'></i></a>&nbsp";
-		if($value['type'] == 'R'){
-		$payment ='';	
-		$outstanding=0;	
-		}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{
+		  $download = "<a href=".$url.$value['id']." class='btn btn-royelblue btn-sm'  title='Download Invoice' ><i class='fa fa-cloud-download fa-fw'></i></a>&nbsp";
+		if ($value['type'] == 'R') {
+		$payment = '';	
+		$outstanding = 0;	
+		} 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 {
 			  $payment = ' <button style="padding: 0 8px;" type="button"  class="btn btn-success">Paid</button>';
 			}
 			}
         
-		   $account_arr = $this->db_model->getSelect('first_name,number,last_name','accounts', array('id'=>$value['accountid']));
+		   $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{
-		$invoice_type='Automatically';
+		   if ($value['generate_type'] == 1) {
+		$invoice_type = 'Manually';
+	   } else {
+		$invoice_type = 'Automatically';
 	   }
 	   
-	   if($value['type'] == 'R'){
+	   if ($value['type'] == 'R') {
 		$icon = '<div class="flx_font flx_magenta">R</div>';
 		} else
 		{		
@@ -1207,84 +1207,84 @@ 
 		$this->common_model->to_calculate_currency($outstanding, '', '', true, false),
 		$download.''.$payment,
   	  ));
-		  $total_value=$total_value + $value['amount'];
-		  $ountstanding_value=$ountstanding_value + $outstanding;
+		  $total_value = $total_value + $value['amount'];
+		  $ountstanding_value = $ountstanding_value + $outstanding;
 		 }
 		 }
         
 		echo json_encode($json_data);
 	}
-	function user_invoices($accountid){
+	function user_invoices($accountid) {
 		$json_data = array();
 	$count_all = $this->invoices_model->get_user_invoice_list(false);
-		$paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 		$currency_id = Common_model::$global_config['system_config']['base_currency'];
-		$query = $this->invoices_model->get_user_invoice_list(true,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-		$grid_fields= json_decode($this->invoices_form->build_invoices_list_for_customer());
-		 $query=$query->result_array();
+		$query = $this->invoices_model->get_user_invoice_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->invoices_form->build_invoices_list_for_customer());
+		 $query = $query->result_array();
 		 $account_arr = '';
-		 $created_date='';
+		 $created_date = '';
 		 foreach ($query as $key => $value) {
 		  $date = strtotime($value['invoice_date']);
-		  $invoice_date =date("d/m/Y",$date);
+		  $invoice_date = date("d/m/Y", $date);
 		  $fromdate = strtotime($value['from_date']);
-		  $from_date =date("d/m/Y",$fromdate);
+		  $from_date = date("d/m/Y", $fromdate);
 		  $duedate = strtotime($value['due_date']);
-		  $due_date =date("d/m/Y",$duedate);
+		  $due_date = date("d/m/Y", $duedate);
 		  $outstanding = $value['amount'];
-		   $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'],"item_type"=>"INVPAY"),"created_date","DESC","1","0");
+		   $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid"=> $value['id'], "item_type"=>"INVPAY"), "created_date", "DESC", "1", "0");
 	   // echo $this->db->last_query(); exit;
-		  if ($invoice_total_query ->num_rows() > 0){
-			$invoice_total_query= $invoice_total_query->result_array();
+		  if ($invoice_total_query ->num_rows() > 0) {
+			$invoice_total_query = $invoice_total_query->result_array();
 			//echo '<pre>'; print_r($invoice_total_query); 
 			$outstanding -= $invoice_total_query[0]['credit'];
             
 			$last_payment_date = $invoice_total_query[0]['created_date'];
-			if($last_payment_date ){
-			$payment_date=strtotime( $last_payment_date);
-			$payment_last=date("d/m/Y",$payment_date);
-			}else{
-			 $payment_last='';
+			if ($last_payment_date) {
+			$payment_date = strtotime($last_payment_date);
+			$payment_last = date("d/m/Y", $payment_date);
+			} else {
+			 $payment_last = '';
 			}
          
             
 		  }
-		 $invoice_total_query = $this->db_model->select("debit,created_date", "invoice_details", array("invoiceid"=> $value['id'],"item_type"=>"INVPAY"),"created_date","DESC","1","0");
-		 if ( $invoice_total_query ->num_rows() > 0) {
-			$invoice_total_query= $invoice_total_query->result_array();
+		 $invoice_total_query = $this->db_model->select("debit,created_date", "invoice_details", array("invoiceid"=> $value['id'], "item_type"=>"INVPAY"), "created_date", "DESC", "1", "0");
+		 if ($invoice_total_query ->num_rows() > 0) {
+			$invoice_total_query = $invoice_total_query->result_array();
 		   // $outstanding = $invoice_total_query[0]['debit'];
 			$created_date = $invoice_total_query[0]['created_date'];
 		 }
-	$accountinfo=$this->session->userdata('accountinfo');
-		  $query ="select sum(amount) as grand_total from invoices where  confirm=1 and accountid=$accountid";
+	$accountinfo = $this->session->userdata('accountinfo');
+		  $query = "select sum(amount) as grand_total from invoices where  confirm=1 and accountid=$accountid";
          
-		  $ext_query=$this->db->query($query);
-		  if($ext_query->num_rows() > 0){
-		  $result_total=$ext_query->result_array();
-		  $grandtotal=$result_total[0]['grand_total'];
-		  $grand_total=$this->common->currency_decimal($grandtotal).' '.$currency_id;
+		  $ext_query = $this->db->query($query);
+		  if ($ext_query->num_rows() > 0) {
+		  $result_total = $ext_query->result_array();
+		  $grandtotal = $result_total[0]['grand_total'];
+		  $grand_total = $this->common->currency_decimal($grandtotal).' '.$currency_id;
 		  }
           
-		  $invoice_query ="select sum(credit) as grand_credit from invoice_details where accountid=$accountid";
-		  $credit_query=$this->db->query($invoice_query);
-		  if($credit_query->num_rows() > 0){
-		  $credit_total=$credit_query->result_array();
-		  $grand_credit_total=$credit_total[0]['grand_credit'];
-		  $grandcredit=$grand_total-$grand_credit_total;
-		  $grand_credit=$this->common->currency_decimal($grandcredit).' '.$currency_id;
+		  $invoice_query = "select sum(credit) as grand_credit from invoice_details where accountid=$accountid";
+		  $credit_query = $this->db->query($invoice_query);
+		  if ($credit_query->num_rows() > 0) {
+		  $credit_total = $credit_query->result_array();
+		  $grand_credit_total = $credit_total[0]['grand_credit'];
+		  $grandcredit = $grand_total - $grand_credit_total;
+		  $grand_credit = $this->common->currency_decimal($grandcredit).' '.$currency_id;
 		  }
-		 $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{
+		 $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 {
 
 $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']));
+}          $account_arr = $this->db_model->getSelect('first_name,number,last_name', 'accounts', array('id'=>$value['accountid']));
 	   $account_array = $account_arr->result_array();
 	   $date = strtotime($value['invoice_date']);
 		 $date = strtotime("+7 day", $date);
-		 $time = date("Y-m-d h:i:s ",$date);
+		 $time = date("Y-m-d h:i:s ", $date);
 		  $json_data['rows'][] = array('cell' => array(
 				$value['invoice_prefix'].$value['invoiceid'].' ('.$value['type'].')',
 		$account_array[0]['first_name'].' '.$account_array[0]['last_name'].'</br>'.$account_array[0]['number'],
@@ -1309,7 +1309,7 @@ 
 				'',
 				'',
 				'',
-				"<b>". $grand_total."</b>",
+				"<b>".$grand_total."</b>",
 				"<b>".$grand_credit."<b>",
 				'',
         		
@@ -1317,19 +1317,19 @@ 
 		echo json_encode($json_data);
 	}
      
-	 function invoice_logo_delete($accountid){
+	 function invoice_logo_delete($accountid) {
     
-	 $invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("id"=> $accountid));
-	 $result=$invoiceconf->result_array();
-	 $logo=$result[0]['logo'];
-	 $post_arr=array('logo'=>'');
-	 $where_arr=array('logo'=>$logo);
+	 $invoiceconf = $this->db_model->getSelect("*", "invoice_conf", array("id"=> $accountid));
+	 $result = $invoiceconf->result_array();
+	 $logo = $result[0]['logo'];
+	 $post_arr = array('logo'=>'');
+	 $where_arr = array('logo'=>$logo);
 	 $this->db->where($where_arr);
-	 $this->db->update('invoice_conf',$post_arr);
+	 $this->db->update('invoice_conf', $post_arr);
 	// redirect(base_url() . 'invoices/invoice_conf/');
      
 	 }
-	function invoice_list_view_invoice($invoiceid=false) {
+	function invoice_list_view_invoice($invoiceid = false) {
         
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = 'Invoice Detail';
@@ -1361,7 +1361,7 @@ 
 		$data['invoiceid'] = @$invoicedata[0]['invoiceid'];
 		$data['invoicedate'] = @$invoicedata[0]['date'];
 		$data['accountid'] = @$invoicedata[0]['accountid'];
-		if(!empty($invoicedata)){
+		if ( ! empty($invoicedata)) {
 		$accountinfo = $this->invoices_model->get_account_including_closed(@$invoicedata[0]['accountid']);
 		$data['accountinfo'] = $accountinfo;
 		}
@@ -1370,97 +1370,97 @@ 
 		$this->load->view('view_account_invoice_detail', $data);
 	}
     
-	function invoice_download($invoiceid){   
-	 $this->db->where('id',$invoiceid);
+	function invoice_download($invoiceid) {   
+	 $this->db->where('id', $invoiceid);
 	 $this->db->select('type');
 	 $this->db->from('invoices');
-	 $result=$this->db->get();
-	 if($result->num_rows() > 0 ){
-	  $result=$result->result_array();
-	  $type= $result[0]['type'];
-	  if($type=='I'){
+	 $result = $this->db->get();
+	 if ($result->num_rows() > 0) {
+	  $result = $result->result_array();
+	  $type = $result[0]['type'];
+	  if ($type == 'I') {
 		   $this->invoice_main_download($invoiceid);
 	  }
-	  if($type=='R'){
+	  if ($type == 'R') {
 		   $this->receipt_download($invoiceid);
 	  }
-	 }else{
-	  redirect(base_url() . 'invoices/invoice_list/');
+	 } else {
+	  redirect(base_url().'invoices/invoice_list/');
 	 }
 	}
   
-function invoice_screen(){
+function invoice_screen() {
 	$login_type = $this->session->userdata['userlevel_logintype'];
-	if($login_type == -1 || $login_type == 2 ||$login_type == 1 || $login_type == 4){
-		 if($this->input->post()){
+	if ($login_type == -1 || $login_type == 2 || $login_type == 1 || $login_type == 4) {
+		 if ($this->input->post()) {
 		 $data = $this->input->post();
-		 if($data['accountid'] == ''  || $data['accountid'] == '-Select-' ){
+		 if ($data['accountid'] == '' || $data['accountid'] == '-Select-') {
  		 	 $this->session->set_flashdata('astpp_notification', 'Please select accounts');  
 			 redirect(base_url()."invoices/invoice_list/");
 		 }
-		 if(!empty($data)){
-		 if(isset($data['notes']) && $data['notes'] !=''){
-					 $this->session->set_userdata('invoice_note',$data['notes']);
+		 if ( ! empty($data)) {
+		 if (isset($data['notes']) && $data['notes'] != '') {
+					 $this->session->set_userdata('invoice_note', $data['notes']);
 		 }
-			 $date=date('Y-m-d');
-			 $feture_date=date('Y-m-d', strtotime($date));
- 		 	 $from_date=$data['fromdate'];
- 		 	 $genrated_date=$data['todate'];
- 		 	 $to_date=date('Y-m-d', strtotime($genrated_date));
- 		 	 if( $to_date > $feture_date){
+			 $date = date('Y-m-d');
+			 $feture_date = date('Y-m-d', strtotime($date));
+ 		 	 $from_date = $data['fromdate'];
+ 		 	 $genrated_date = $data['todate'];
+ 		 	 $to_date = date('Y-m-d', strtotime($genrated_date));
+ 		 	 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{
-			 $todate=$data['todate'].' '.'23:59:59';
-			 $from_date=$data['fromdate'].' '.'00:00:01';
-			 $accountid=$data['accountid'];
+ 		 	 } else {
+			 $todate = $data['todate'].' '.'23:59:59';
+			 $from_date = $data['fromdate'].' '.'00:00:01';
+			 $accountid = $data['accountid'];
 			 $acc_query = $this->db_model->getSelect("*", "accounts", array("id" => $accountid));
 		 $accountdata = $acc_query->result_array();
-		 $accountdata=$accountdata[0];
+		 $accountdata = $accountdata[0];
 		 $screen_path = getcwd()."/cron";
 			   $screen_filename = "Email_Broadcast_".strtotime('now');
 			   $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
 			   exec($command);
 		$invoice_data_count = 0;
-		$invoice_conf =  array();
-		if($accountdata['reseller_id'] == 0){
+		$invoice_conf = array();
+		if ($accountdata['reseller_id'] == 0) {
  			$where = array("accountid"=> 1);
-		} else{
+		} else {
 			$where = array("accountid"=> $accountdata['reseller_id']);    
 		}
 		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
-		if($query->num_rows >0){
+		if ($query->num_rows > 0) {
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];
-		} else{
-			$query = $this->db_model->getSelect("*", "invoice_conf",array("accountid"=> 1));
+		} else {
+			$query = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> 1));
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];            
 		}
 		$last_invoice_ID = $this->get_invoice_date("invoiceid");
-		if($last_invoice_ID && $last_invoice_ID > 0){
-			$last_invoice_ID = ($last_invoice_ID+1);
-		}else{
+		if ($last_invoice_ID && $last_invoice_ID > 0) {
+			$last_invoice_ID = ($last_invoice_ID + 1);
+		} 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{
+		$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 {
 	   			$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{
-			$due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
+		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 {
+			$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"=>   
-		$accountdata['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>$from_date,"to_date"=>$todate,"due_date"=>$due_date,"status"=>1,"amount"=>"0.00","balance"=>$balance,'generate_type'=>1,'confirm'=>0,'notes'=>$data['notes']);
+		$invoice_data = array("accountid"=>$accountdata['id'], "invoice_prefix" =>$invoice_conf['invoice_prefix'], "invoiceid"=>$last_invoice_ID, "reseller_id"=>   
+		$accountdata['reseller_id'], "invoice_date"=>gmdate("Y-m-d H:i:s"), "from_date"=>$from_date, "to_date"=>$todate, "due_date"=>$due_date, "status"=>1, "amount"=>"0.00", "balance"=>$balance, 'generate_type'=>1, 'confirm'=>0, 'notes'=>$data['notes']);
 		// echo "<pre>"; print_r($invoice_data); exit;
 		$invoice_note = $this->session->userdata('invoice_note');
 		$this->session->unset_userdata('invoice_note');
-		$invoice_data['invoice_note']=$invoice_note;
-		$this->db->insert("invoices",$invoice_data);
+		$invoice_data['invoice_note'] = $invoice_note;
+		$this->db->insert("invoices", $invoice_data);
 		$invoiceid = $this->db->insert_id();
 				 //$generateInvoice->process_invoice($accountdata,$from_date,$todate);
 				 $this->session->set_flashdata('astpp_errormsg', 'Invoice generation completed .');  
@@ -1468,7 +1468,7 @@ 
 	         
 		   }
 			} 
-		 } else{
+		 } else {
 			 $this->session->set_flashdata('astpp_errormsg', 'No data found.....');  
 			 redirect(base_url()."invoices/invoice_list/");
 		 }
@@ -1483,144 +1483,144 @@ 
      /**
       * @param string $select
       */
-     function get_invoice_date($select,$accountid=false){
-	if($accountid){
-	        $where = array('type'=>"I","accountid"=>$accountid);
-        $query = $this->db_model->select($select, "invoices", $where,"to_date","DESC","1","0");
-	} else{
+     function get_invoice_date($select, $accountid = false) {
+	if ($accountid) {
+	        $where = array('type'=>"I", "accountid"=>$accountid);
+        $query = $this->db_model->select($select, "invoices", $where, "to_date", "DESC", "1", "0");
+	} else {
 		 $where = array('type'=>"I");
-        $query = $this->db_model->select($select, "invoices", $where,"id","DESC","1","0");
+        $query = $this->db_model->select($select, "invoices", $where, "id", "DESC", "1", "0");
 	}
-        if($query->num_rows >0){
+        if ($query->num_rows > 0) {
             $invoiceid = $query->result_array();
-            $invoice_date=$invoiceid[0][$select];
+            $invoice_date = $invoiceid[0][$select];
             return  $invoice_date;
         }
         return false;
     }   
      function invoice_main_download($invoiceid) {
 
-        $invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
+        $invoicedata = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
         $invoicedata = $invoicedata->result_array();
-        $invoicedata=$invoicedata[0];
-	$invoice_path='';
+        $invoicedata = $invoicedata[0];
+	$invoice_path = '';
         $accountid = $invoicedata['accountid'];
-        $acc_file=$invoice_path.$accountid.'/'.$invoiceid;  
-        $accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
-        $accountdata =  $accountdata->result_array();
+        $acc_file = $invoice_path.$accountid.'/'.$invoiceid;  
+        $accountdata = $this->db_model->getSelect("*", "accounts", array("id"=>$accountid));
+        $accountdata = $accountdata->result_array();
         $accountdata = $accountdata[0];
 
         $login_type = $this->session->userdata['userlevel_logintype'];
-        $query="select item_type,credit from invoice_details where invoiceid = ".$invoicedata['id']." and item_type='INVPAY' Group By id order by item_type desc"; 
+        $query = "select item_type,credit from invoice_details where invoiceid = ".$invoicedata['id']." and item_type='INVPAY' Group By id order by item_type desc"; 
             // echo  $query; exit;
-        $invoice_total_query=$this->db->query($query);
-         if($invoice_total_query->num_rows() > 0){
-        $total=$invoice_total_query->result_array();
-        foreach($total as $key => $value){
-        $debit=$value['credit'];
+        $invoice_total_query = $this->db->query($query);
+         if ($invoice_total_query->num_rows() > 0) {
+        $total = $invoice_total_query->result_array();
+        foreach ($total as $key => $value) {
+        $debit = $value['credit'];
         }
-         if($debit){
+         if ($debit) {
        // echo 'debit'; exit;
-           $invoice_path=$this->config->item('invoices_path');
+           $invoice_path = $this->config->item('invoices_path');
            $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
            unlink($download_path);
-           $res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
+           $res = $this->common->get_invoice_template($invoicedata, $accountdata, "TRUE");
           }
           }
-         $invoice_path=$this->config->item('invoices_path');
+         $invoice_path = $this->config->item('invoices_path');
          $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf";
-        $res = $this->common->get_invoice_template($invoicedata,$accountdata,"TRUE");
+        $res = $this->common->get_invoice_template($invoicedata, $accountdata, "TRUE");
     }
-  function Sec2Minutes( $seconds )
+  function Sec2Minutes($seconds)
   {
-      return sprintf( "%02.2d:%02.2d", floor( $seconds / 60 ), $seconds % 60 );
+      return sprintf("%02.2d:%02.2d", floor($seconds / 60), $seconds % 60);
   }
   function receipt_download($invoiceid) {
         $login_info = $this->session->userdata('accountinfo');
        ob_start();
        $this->load->library('/html2pdf/html2pdf');
-       $template_config=$this->config->item('invoice_template');
+       $template_config = $this->config->item('invoice_template');
        include($template_config.'invoice_template_receipt.php');
        $content = ob_get_clean();
        ob_clean();
         $accountid = $this->common->get_field_name('accountid', 'invoices', $invoiceid);	
-        $accountdata = $this->db_model->getSelect("*","accounts",array("id"=>$accountid));
-        $accountdata =  $accountdata->result_array();
+        $accountdata = $this->db_model->getSelect("*", "accounts", array("id"=>$accountid));
+        $accountdata = $accountdata->result_array();
         $accountdata = $accountdata[0];
 //        $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $accountdata["currency_id"]);
 	//$currency = $accountdata["currency_id"];
-      if($login_info['type'] == -1){
+      if ($login_info['type'] == -1) {
 	  $data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
           $currency = $data["to_currency"];
-      } elseif($login_info['type'] == 1){
+      } elseif ($login_info['type'] == 1) {
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $login_info["currency_id"]);
           $currency = $accountdata["currency_id"];
-      } else{
+      } else {
 	  $accountdata["currency_id"] = $this->common->get_field_name('currency', 'currency', $login_info["currency_id"]);
           $currency = $accountdata["currency_id"];
       }
         $invoice_cdr_list = array();
-        $invoicedata  = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
+        $invoicedata = $this->db_model->getSelect("*", "invoices", array("id"=> $invoiceid));
         $invoicedata = $invoicedata->result_array();
-        $invoicedata=$invoicedata[0];
+        $invoicedata = $invoicedata[0];
        
         $data['invoiceid'] = @$invoicedata[0]['id'];
-        $data['id']	 = @$invoicedata['invoiceid'];
+        $data['id'] = @$invoicedata['invoiceid'];
         
         $data['invoice_date'] = @$invoicedata[0]['invoice_date'];
         $data['accountid'] = @$invoicedata[0]['accountid'];
 	$data['from_date'] = @$invoicedata[0]['from_date'];
 	$data['to_date'] = @$invoicedata[0]['to_date'];
         $total_list = array();
-        $data['description']='';
-        $data['item_type']='';
-        $data['debit']='';
+        $data['description'] = '';
+        $data['item_type'] = '';
+        $data['debit'] = '';
         $invoice_total_list = array();
-	$query="select item_type,description,created_date,invoiceid,debit,credit from invoice_details where invoiceid = ".$invoiceid." And ( item_type='POSTCHARG' Or item_type='Refill') Group By item_type"; 	
-	$invoice_total_query=$this->db->query($query);
-	if($invoice_total_query ->num_rows() > 0) {
-		  $invoice_total_query= $invoice_total_query->result_array();
-		  foreach($invoice_total_query as $key=>$value){
-			  $data['item_type']=$value['item_type'];
-			  $data['description']=$value['description'];
-			  if($value['item_type'] == 'Refill'){
-				  $data['debit']=$value['credit'];
-			  }else{
-				  $data['debit']=$value['debit'];
+	$query = "select item_type,description,created_date,invoiceid,debit,credit from invoice_details where invoiceid = ".$invoiceid." And ( item_type='POSTCHARG' Or item_type='Refill') Group By item_type"; 	
+	$invoice_total_query = $this->db->query($query);
+	if ($invoice_total_query ->num_rows() > 0) {
+		  $invoice_total_query = $invoice_total_query->result_array();
+		  foreach ($invoice_total_query as $key=>$value) {
+			  $data['item_type'] = $value['item_type'];
+			  $data['description'] = $value['description'];
+			  if ($value['item_type'] == 'Refill') {
+				  $data['debit'] = $value['credit'];
+			  } else {
+				  $data['debit'] = $value['debit'];
 			  }	   
-			  $created_date=$value['created_date'];
-			  $invoicedata['invoiceid']=$value['invoiceid'];
+			  $created_date = $value['created_date'];
+			  $invoicedata['invoiceid'] = $value['invoiceid'];
 		  }
-		  }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) {
-		  $invoice_total_query= $invoice_total_query->result_array();
-		  foreach($invoice_total_query as $key=>$value){
-			  $data['item_type']=$value['item_type'];
-			  $data['description']=$value['description'];
-			  if($value['item_type'] == 'Refill'){
-				  $data['debit']=$value['credit'];
-			  } else{
-				  $data['debit']=$value['debit'];
+		  } 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) {
+		  $invoice_total_query = $invoice_total_query->result_array();
+		  foreach ($invoice_total_query as $key=>$value) {
+			  $data['item_type'] = $value['item_type'];
+			  $data['description'] = $value['description'];
+			  if ($value['item_type'] == 'Refill') {
+				  $data['debit'] = $value['credit'];
+			  } else {
+				  $data['debit'] = $value['debit'];
 			  }	   
-			  $created_date=$value['created_date'];
-			  $invoicedata['invoiceid']=$value['invoiceid'];
+			  $created_date = $value['created_date'];
+			  $invoicedata['invoiceid'] = $value['invoiceid'];
 		  }
 		}
 	  }
 		  $data['accountinfo'] = $accountdata;
 		 //Get invoice header information
-		if($accountdata['reseller_id']=='0')
+		if ($accountdata['reseller_id'] == '0')
 		  $accountid = '1';
 		else
 			$accountid = $accountdata['reseller_id'];
-			$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
+			$invoiceconf = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
 			$invoiceconf = $invoiceconf->result_array();
-			if(!empty($invoiceconf)){
+			if ( ! empty($invoiceconf)) {
 				$data['invoiceconf'] = $invoiceconf[0];
-			}else{
-			$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> "1"));
+			} else {
+			$invoiceconf = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> "1"));
 			$invoiceconf = $invoiceconf->result_array();
 			$data['invoiceconf'] = $invoiceconf[0];
 			}
@@ -1629,133 +1629,133 @@ 
         
 	  // 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 = "<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'] != "")
+		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/>";
+		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>";
 
-	$reseller_id=$accountdata['reseller_id'];     
-		$logo='';
-		if(!empty($invoiceconf) && $invoiceconf != ''){
-		$logo= $invoiceconf[0]['logo'];
-		$dir_path= getcwd()."/assets/Logo/";
+	$reseller_id = $accountdata['reseller_id'];     
+		$logo = '';
+		if ( ! empty($invoiceconf) && $invoiceconf != '') {
+		$logo = $invoiceconf[0]['logo'];
+		$dir_path = getcwd()."/assets/Logo/";
 	   // echo $dir_path; exit;
-		$path =$dir_path. $logo;
-		if($logo != ''){
-		$src=$path;
+		$path = $dir_path.$logo;
+		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;
+		$src = $path;
 		$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
 		}
 		}
         
         
-		$CALL_DETAILS_TABLE=null;
+		$CALL_DETAILS_TABLE = null;
 		$CALL_DETAILS_TABLE .= "<tr style='font-family:arial;'>";
 		$CALL_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 35%;text-align:right;border-bottom:1px solid black;border-left:1px solid #000;border-right:1px solid #000;'>".$accountdata['number']."</td>";
 		$CALL_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 25%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".$invoicedata['invoice_prefix'].$data['id']."</td>";
 		$CALL_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 20%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".date('Y-m-d', strtotime($invoicedata['from_date']))."</td>";
 		$CALL_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 20%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".date('Y-m-d', strtotime($invoicedata['from_date']))."</td>";
-		$CALL_DETAILS_TABLE .='</tr>';
+		$CALL_DETAILS_TABLE .= '</tr>';
         
         
-		$RECEIPT_DETAILS_TABLE=null;
+		$RECEIPT_DETAILS_TABLE = null;
 		$RECEIPT_DETAILS_TABLE .= "<tr style='font-family:arial;'>";
 		$RECEIPT_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 35%;text-align:right;border-bottom:1px solid black;border-left:1px solid #000;border-right:1px solid #000;'>".date('Y-m-d', strtotime($invoicedata['from_date']))."</td>";
 		$RECEIPT_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 25%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".$data['description']."</td>";
 		$RECEIPT_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 20%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".$data['item_type']."</td>";
 		$RECEIPT_DETAILS_TABLE .= "<td style='font-size:12px;padding:7px 5px;width: 20%;border-bottom:1px solid black;text-align:right;border-right:1px solid #000;'>".$this->common->currency_decimal($this->common_model->calculate_currency($data['debit']))."</td>";
-		$RECEIPT_DETAILS_TABLE .='</tr>';
+		$RECEIPT_DETAILS_TABLE .= '</tr>';
        
        
 		//echo '<pre>'; print_r($data['id']); exit;
         
-		$MONTHLY_DESC=null;
-		$MONTHLY_DESC .= "<div style='font-size:12px;' ><b>Account Number :</b> " . $accountdata['number']."<br/>";               
-		$MONTHLY_DESC .= "<b>Receipt Number  :</b> " .$invoicedata['invoice_prefix'].$data['id']."<br/>";        
-		$MONTHLY_DESC .= "<b>Receipt Date :</b>  " .date('Y-m-d', strtotime($invoicedata['from_date']))."<br/></div>";  
+		$MONTHLY_DESC = null;
+		$MONTHLY_DESC .= "<div style='font-size:12px;' ><b>Account Number :</b> ".$accountdata['number']."<br/>";               
+		$MONTHLY_DESC .= "<b>Receipt Number  :</b> ".$invoicedata['invoice_prefix'].$data['id']."<br/>";        
+		$MONTHLY_DESC .= "<b>Receipt Date :</b>  ".date('Y-m-d', strtotime($invoicedata['from_date']))."<br/></div>";  
         
 		$COMPANY_DETAILS_TABLE = null;
-	$COMPANY_DETAILS_SET=null;
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['company_name']."<br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['address'].",<br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['city'];
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['zipcode'].",<br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['province'].",<br/>";
+	$COMPANY_DETAILS_SET = null;
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['company_name']."<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['address'].",<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['city'];
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['zipcode'].",<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['province'].",<br/>";
 
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['country']."<br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['telephone']." <br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['fax']." <br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['emailaddress']."<br/>";
-	$COMPANY_DETAILS_SET.= $data['invoiceconf']['website']."<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['country']."<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['telephone']." <br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['fax']." <br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['emailaddress']."<br/>";
+	$COMPANY_DETAILS_SET .= $data['invoiceconf']['website']."<br/>";
         
-		if(!empty($data['invoiceconf']) && $data['invoiceconf'] != ''){
-		$logo= $data['invoiceconf']['logo'];
+		if ( ! empty($data['invoiceconf']) && $data['invoiceconf'] != '') {
+		$logo = $data['invoiceconf']['logo'];
        
-		$dir_path= base_url()."upload/";
+		$dir_path = base_url()."upload/";
 	  // echo $dir_path; exit;
-		$path =$dir_path.$data['invoiceconf']['accountid']."_".$data['invoiceconf']['logo'];
-	if(file_exists($path)){
-		if($logo != ''){
-			$src=$path;
+		$path = $dir_path.$data['invoiceconf']['accountid']."_".$data['invoiceconf']['logo'];
+	if (file_exists($path)) {
+		if ($logo != '') {
+			$src = $path;
 			$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
-		} else{
+		} else {
 			$path = base_url()."/assets/images/logo.png";
-			$src=$path;
+			$src = $path;
 			$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
 		}
-	} else{
-		$dir_path= base_url()."/upload/logo.png";
-		$src=$dir_path;
+	} else {
+		$dir_path = base_url()."/upload/logo.png";
+		$src = $dir_path;
 		$logo = "<img style='height:50px; width:180px; margin-left:70px;' alt='logo' src='".$src."'>";
 	}
 		}
-	$content = str_replace("<CURRENCY>",$currency,$content);
-	$content = str_replace("<LOGO>",$src,$content);
-	$content = str_replace("<MONTHLY_DESC>",$MONTHLY_DESC,$content);   
-		$content = str_replace("<COMPANY_ADD>",$customer_address,$content);
-		$content = str_replace("<RECEIPT_DETAILS_TABLE>",rtrim($RECEIPT_DETAILS_TABLE,""),$content);
-		$content = str_replace("<COMPANY_DETAILS_TABLE>",$COMPANY_DETAILS_TABLE,$content);
-		$content = str_replace("<COMPANY_DETAILS_SET>",$COMPANY_DETAILS_SET,$content);
-		$content = str_replace("<CALL_DETAILS_TABLE>",$CALL_DETAILS_TABLE,$content);    
+	$content = str_replace("<CURRENCY>", $currency, $content);
+	$content = str_replace("<LOGO>", $src, $content);
+	$content = str_replace("<MONTHLY_DESC>", $MONTHLY_DESC, $content);   
+		$content = str_replace("<COMPANY_ADD>", $customer_address, $content);
+		$content = str_replace("<RECEIPT_DETAILS_TABLE>", rtrim($RECEIPT_DETAILS_TABLE, ""), $content);
+		$content = str_replace("<COMPANY_DETAILS_TABLE>", $COMPANY_DETAILS_TABLE, $content);
+		$content = str_replace("<COMPANY_DETAILS_SET>", $COMPANY_DETAILS_SET, $content);
+		$content = str_replace("<CALL_DETAILS_TABLE>", $CALL_DETAILS_TABLE, $content);    
        
        
 	   // echo $content ; exit;
-		$invoice_path=$this->config->item('invoices_path');
+		$invoice_path = $this->config->item('invoices_path');
 		$download_path = $invoicedata['invoice_prefix'].$data['id'].".pdf";
 		$this->html2pdf->pdf->SetDisplayMode('fullpage');
 		$this->html2pdf->writeHTML($content);
         
-		$this->html2pdf->Output($download_path,"D");        
+		$this->html2pdf->Output($download_path, "D");        
       
         
 	} 
 
-	function calculate_currency($amount,$accountdata){
-		$base_currency=Common_model::$global_config['system_config']['base_currency'];
-		$from_currency=Common_model::$global_config['currency_list'][$base_currency];
-		$to_currency =  $this->db_model->getSelect("currencyrate", "currency", array("currency"=> $accountdata["currency_id"]));
-		if($to_currency->num_rows() > 0){
+	function calculate_currency($amount, $accountdata) {
+		$base_currency = Common_model::$global_config['system_config']['base_currency'];
+		$from_currency = Common_model::$global_config['currency_list'][$base_currency];
+		$to_currency = $this->db_model->getSelect("currencyrate", "currency", array("currency"=> $accountdata["currency_id"]));
+		if ($to_currency->num_rows() > 0) {
 			$to_currency_arr = $to_currency->result_array();
 			$to_currency = $to_currency_arr[0]["currencyrate"];
 		}
-		else{
-			$to_currency= $from_currency;
+		else {
+			$to_currency = $from_currency;
 		}
 
 		$cal_amount = ($amount * $to_currency) / $from_currency;
@@ -1763,22 +1763,22 @@ 
 	}
     
 	function format_currency($amount) {
-	$dp =  $this->db_model->getSelect("value", "system", array("name"=> "decimalpoints"));
+	$dp = $this->db_model->getSelect("value", "system", array("name"=> "decimalpoints"));
 		$dp = $dp->result_array();
 		$dp = $dp[0]["value"];
 	
-		return money_format('%.' . $dp . 'n', $amount);
+		return money_format('%.'.$dp.'n', $amount);
 	}
     
-	function date_diff_custom($end='2020-06-09 10:30:00', $out_in_array=false){
+	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)
+		if ( ! $out_in_array)
 			return $out;
 		$a_out = array();
-		array_walk(explode(',',$out),
-		function($val,$key) use(&$a_out){
-			$v=explode(':',$val);
+		array_walk(explode(',', $out),
+		function($val, $key) use(&$a_out){
+			$v = explode(':', $val);
 			$a_out[$v[0]] = $v[1];
 		});
 		return $a_out;
@@ -1794,12 +1794,12 @@ 
 print_r($action);
 			unset($action['action']);
 			unset($action['advance_search']);
-			$action['from_date'][0]=$action['from_date'][0] ? $action['from_date'][0]." 00:00:00" :'';
- 		$action['invoice_date'][0]=$action['invoice_date'][0] ? $action['invoice_date'][0]." 00:00:00" : '';
+			$action['from_date'][0] = $action['from_date'][0] ? $action['from_date'][0]." 00:00:00" : '';
+ 		$action['invoice_date'][0] = $action['invoice_date'][0] ? $action['invoice_date'][0]." 00:00:00" : '';
 			$this->session->set_userdata('invoice_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'invoices/invoice_list/');
+			redirect(base_url().'invoices/invoice_list/');
 		}
 	}
  function invoice_list_clearsearchfilter() {
@@ -1807,67 +1807,67 @@ 
 		$this->session->set_userdata('invoice_list_search', "");
 	}
 	 /**============ From below code developed for ASTPP version 2.0 ======================================**/
-	function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
-	   $invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-		$this->db->insert("invoices",$invoice_data);
+	function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
+	   $invoice_data = array("accountid"=>$accountid, "invoice_prefix" =>$invoice_prefix, "invoiceid"=>'0000'.$last_invoice_ID, "reseller_id"=>$accountinfo['reseller_id'], "invoice_date"=>gmdate("Y-m-d H:i:s"), "from_date"=>  gmdate("Y-m-d H:i:s"), "to_date"=>gmdate("Y-m-d H:i:s"), "due_date"=>$due_date, "status"=>1, "balance"=>$accountinfo['balance'], "amount"=>$amount, "type"=>'R', "confirm"=>'1');            
+		$this->db->insert("invoices", $invoice_data);
 		$invoiceid = $this->db->insert_id();    
 		return  $invoiceid;     
 	}
-	function insert_invoice_total_data($invoiceid,$sub_total,$sort_order){
-		$invoice_total_arr = array("invoiceid"=>$invoiceid,"sort_order"=>$sort_order,
-			"value"=>$sub_total, "title"=>"Sub Total","text"=>"Sub Total","class"=>"1");
-		$this->db->insert("invoices_total",$invoice_total_arr);
+	function insert_invoice_total_data($invoiceid, $sub_total, $sort_order) {
+		$invoice_total_arr = array("invoiceid"=>$invoiceid, "sort_order"=>$sort_order,
+			"value"=>$sub_total, "title"=>"Sub Total", "text"=>"Sub Total", "class"=>"1");
+		$this->db->insert("invoices_total", $invoice_total_arr);
 		return $sort_order++;
 	}
     
-	function apply_invoice_taxes($invoiceid,$accountid,$sort_order){
-		$tax_priority="";
+	function apply_invoice_taxes($invoiceid, $accountid, $sort_order) {
+		$tax_priority = "";
 		$where = array("accountid"=>$accountid);
-		$accounttax_query = $this->db_model->getSelectWithOrder("*", "taxes_to_accounts", $where,"ASC","taxes_priority");
-		if($accounttax_query->num_rows > 0){
+		$accounttax_query = $this->db_model->getSelectWithOrder("*", "taxes_to_accounts", $where, "ASC", "taxes_priority");
+		if ($accounttax_query->num_rows > 0) {
 			$accounttax_query = $accounttax_query->result_array();
-			foreach($accounttax_query as $tax_key => $tax_value){ 
-			$taxes_info=$this->db->get_where('taxes',array('id'=>$tax_value['taxes_id']));
-			if($taxes_info->num_rows() > 0 ){
-					$tax_value=$taxes_info->result_array();
-					$tax_value=$tax_value[0];
-				 if($tax_value["taxes_priority"] == ""){
+			foreach ($accounttax_query as $tax_key => $tax_value) { 
+			$taxes_info = $this->db->get_where('taxes', array('id'=>$tax_value['taxes_id']));
+			if ($taxes_info->num_rows() > 0) {
+					$tax_value = $taxes_info->result_array();
+					$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();
+					 $query = $query->result_array();
 					 $sub_total = $query["0"]["total"];
 				 }
-				$tax_total = (($sub_total * ( $tax_value['taxes_rate'] / 100 )) + $tax_value['taxes_amount'] );
-				$tax_array = array("invoiceid"=>$invoiceid,"title"=>"TAX","text"=>$tax_value['taxes_description'],
-					"value"=>$tax_total,"class"=>"2","sort_order"=>$sort_order);
-				$this->db->insert("invoices_total",$tax_array);
+				$tax_total = (($sub_total * ($tax_value['taxes_rate'] / 100)) + $tax_value['taxes_amount']);
+				$tax_array = array("invoiceid"=>$invoiceid, "title"=>"TAX", "text"=>$tax_value['taxes_description'],
+					"value"=>$tax_total, "class"=>"2", "sort_order"=>$sort_order);
+				$this->db->insert("invoices_total", $tax_array);
 				$sort_order++;
 			}
 			}
 		}
 		return $sort_order;
 	}
-	function set_invoice_total($invoiceid,$sort_order){
+	function set_invoice_total($invoiceid, $sort_order) {
 		$query = $this->db_model->getSelect("SUM(value) as total", "invoices_total", array("invoiceid"=> $invoiceid));
-		$query =  $query->result_array();
+		$query = $query->result_array();
 		$sub_total = $query["0"]["total"];
         
-		$invoice_total_arr = array("invoiceid"=>$invoiceid,"sort_order"=>$sort_order,
-			"value"=>$sub_total,"title"=>"Total","text"=>"Total","class"=>"9");
-		$this->db->insert("invoices_total",$invoice_total_arr);
+		$invoice_total_arr = array("invoiceid"=>$invoiceid, "sort_order"=>$sort_order,
+			"value"=>$sub_total, "title"=>"Total", "text"=>"Total", "class"=>"9");
+		$this->db->insert("invoices_total", $invoice_total_arr);
 		return true;
 	}
-	function invoice_delete_statically($inv_id){
-	$data=array('deleted'=>1);
-		$this->db->where('id',$inv_id);
-		$this->db->update("invoices",$data);
+	function invoice_delete_statically($inv_id) {
+	$data = array('deleted'=>1);
+		$this->db->where('id', $inv_id);
+		$this->db->update("invoices", $data);
 	$this->session->set_flashdata('astpp_notification', 'Invoices removed successfully');
-	redirect(base_url() . 'invoices/invoice_list/');
+	redirect(base_url().'invoices/invoice_list/');
 	}
-	function invoice_delete_massege(){
+	function invoice_delete_massege() {
 	$this->session->set_flashdata('astpp_notification', 'Invoices removed successfully');
-	redirect(base_url() . 'invoices/invoice_list/');
+	redirect(base_url().'invoices/invoice_list/');
 	}
 }
 

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

Spacing +100 added lines, -100 removed lines

@@ -24,74 +24,74 @@ 
 if ( ! defined('BASEPATH')) {
 	exit('No direct script access allowed');
 }
-class invoices_form{

+class invoices_form {

 	 function __construct($library_name = '') {

 		$this->CI = & get_instance();

 	}

-	 function build_invoices_list_for_admin(){

+	 function build_invoices_list_for_admin() {

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

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

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

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

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

 

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

-	  $url= ($logintype==0 ||$logintype==3 ) ? "/user/user_invoice_download/":'/invoices/invoice_main_download/';

-	  $grid_field_arr  = json_encode(array(

-		  array("Number","110","id","id,'',type","invoices","build_concat_string","","true","center"),

-		  array("Type","130","id","id,'',type","invoices","build_concat_string","","true","center"),

-		  array("Account","130","accountid","first_name,last_name,number","accounts","build_concat_string","","true","center"),

-		  array("Generated<br/> Date","140","invoice_date","invoice_date","","get_invoice_date","","true","center"),

-	  array("From Date","120","from_date","from_date","","get_from_date","","true","center"),

-	  array("Due Date","130","","","","","","true","center"),

-	  array("Last <br/>Pay Date","100","","","","","","true","center"),

-		  array("Amount($currency)","120","id","id","id","get_invoice_total","","true","right"),

+	  $url = ($logintype == 0 || $logintype == 3) ? "/user/user_invoice_download/" : '/invoices/invoice_main_download/';

+	  $grid_field_arr = json_encode(array(

+		  array("Number", "110", "id", "id,'',type", "invoices", "build_concat_string", "", "true", "center"),

+		  array("Type", "130", "id", "id,'',type", "invoices", "build_concat_string", "", "true", "center"),

+		  array("Account", "130", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+		  array("Generated<br/> Date", "140", "invoice_date", "invoice_date", "", "get_invoice_date", "", "true", "center"),

+	  array("From Date", "120", "from_date", "from_date", "", "get_from_date", "", "true", "center"),

+	  array("Due Date", "130", "", "", "", "", "", "true", "center"),

+	  array("Last <br/>Pay Date", "100", "", "", "", "", "", "true", "center"),

+		  array("Amount($currency)", "120", "id", "id", "id", "get_invoice_total", "", "true", "right"),

 	 

-		array("Outstanding <br/>Amount($currency)","140","","","","","","true","right"),

+		array("Outstanding <br/>Amount($currency)", "140", "", "", "", "", "", "true", "right"),

 	  // array("Payment", "110", "payment", "", "", ""),

-		  array("Action","120","","","",array(

-			 "DOWNLOAD"=>array("url"=>$url,"mode"=>"single"),

+		  array("Action", "120", "", "", "", array(

+			 "DOWNLOAD"=>array("url"=>$url, "mode"=>"single"),

 			// "VIEW" => array("url" => "invoices/invoice_summary_payment/", "mode" => "popup")

 		))

 	  ));

 	  return $grid_field_arr;

 	} 

-	 function build_invoices_list_for_customer_admin(){

+	 function build_invoices_list_for_customer_admin() {

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

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

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

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

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

 

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

-	  $url= ($logintype==0 ||$logintype==3 ) ? "/user/user_invoice_download/":'/invoices/invoice_main_download/';

-	  $grid_field_arr  = json_encode(array(

-		  array("Number","110","id","id,'',type","invoices","build_concat_string","","true","center"),

-		  array("Type","110","id","id,'',type","invoices","build_concat_string","","true","center"),

-		  array("Generated<br/> Date","120","invoice_date","invoice_date","","get_invoice_date","","true","center"),

-	  array("From Date","120","from_date","from_date","","get_from_date","","true","center"),

-	  array("Due Date","130","","","","","","true","center"),

-	  array("Last <br/>Pay Date","100","","","","","","true","center"),

-		  array("Amount($currency)","100","id","id","id","get_invoice_total","","true","right"),

+	  $url = ($logintype == 0 || $logintype == 3) ? "/user/user_invoice_download/" : '/invoices/invoice_main_download/';

+	  $grid_field_arr = json_encode(array(

+		  array("Number", "110", "id", "id,'',type", "invoices", "build_concat_string", "", "true", "center"),

+		  array("Type", "110", "id", "id,'',type", "invoices", "build_concat_string", "", "true", "center"),

+		  array("Generated<br/> Date", "120", "invoice_date", "invoice_date", "", "get_invoice_date", "", "true", "center"),

+	  array("From Date", "120", "from_date", "from_date", "", "get_from_date", "", "true", "center"),

+	  array("Due Date", "130", "", "", "", "", "", "true", "center"),

+	  array("Last <br/>Pay Date", "100", "", "", "", "", "", "true", "center"),

+		  array("Amount($currency)", "100", "id", "id", "id", "get_invoice_total", "", "true", "right"),

 	 

-		array("Outstanding <br/>Amount($currency)","100","","","","","","true","right"),

-		  array("Action","120","","","",array(

-			 "DOWNLOAD"=>array("url"=>$url,"mode"=>"single"),

+		array("Outstanding <br/>Amount($currency)", "100", "", "", "", "", "", "true", "right"),

+		  array("Action", "120", "", "", "", array(

+			 "DOWNLOAD"=>array("url"=>$url, "mode"=>"single"),

 		))

 	  ));

 	  return $grid_field_arr;

 	} 

-	function build_invoices_list_for_customer(){

-	  $url=($this->CI->session->userdata('logintype')==0 )?"/user/user_invoice_download/":'/invoices/invoice_main_download/';

+	function build_invoices_list_for_customer() {

+	  $url = ($this->CI->session->userdata('logintype') == 0) ? "/user/user_invoice_download/" : '/invoices/invoice_main_download/';

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

-	  $grid_field_arr  = json_encode(array(

-		  array("Number","100","id","id,'',type","invoices","build_concat_string","","true","center"),

-		  array("Account","110","accountid","first_name,last_name,number","accounts","build_concat_string","","true","center"),

-		  array("Generated Date","140","invoice_date","invoice_date","","get_invoice_date","","true","center"),

-	  array("From Date","140","from_date","from_date","","get_from_date","","true","center"),

-	  array("Due Date","150","","","","","","true","center"),

-	  array("Last Pay Date","150","","","","","","true","center"),

-		  array("Amount","150","id","id","id","get_invoice_total","","true","center"),

-	  array("Outstanding Amount","150","","","",""),

+	  $grid_field_arr = json_encode(array(

+		  array("Number", "100", "id", "id,'',type", "invoices", "build_concat_string", "", "true", "center"),

+		  array("Account", "110", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+		  array("Generated Date", "140", "invoice_date", "invoice_date", "", "get_invoice_date", "", "true", "center"),

+	  array("From Date", "140", "from_date", "from_date", "", "get_from_date", "", "true", "center"),

+	  array("Due Date", "150", "", "", "", "", "", "true", "center"),

+	  array("Last Pay Date", "150", "", "", "", "", "", "true", "center"),

+		  array("Amount", "150", "id", "id", "id", "get_invoice_total", "", "true", "center"),

+	  array("Outstanding Amount", "150", "", "", "", ""),

 	  // array("Payment", "110", "payment", "", "", ""),

-		  array("Action","160","","","",array(

-			 "DOWNLOAD"=>array("url"=>$url,"mode"=>"single"),

+		  array("Action", "160", "", "", "", array(

+			 "DOWNLOAD"=>array("url"=>$url, "mode"=>"single"),

 			// "VIEW" => array("url" => "invoices/invoice_summary_payment/", "mode" => "popup")

 		))

 			));

@@ -100,89 +100,89 @@ 
    function get_invoice_search_form()

 	{

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

-		$reseller_id=$account_data['type']==1 ? $account_data['id']:0;

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

+		$reseller_id = $account_data['type'] == 1 ? $account_data['id'] : 0;

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

 		$form['Search'] = array(

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

-		array('From Date', 'INPUT', array('name' => 'from_date[0]','id'=>'invoice_from_date','size' => '20', 'class' => "text field"), '', 'tOOL TIP', '', 'from_date[from_date-date]'),

-		 array('To Date', 'INPUT', array('name' => 'to_date[0]','id'=>'invoice_to_date','size' => '20', 'class' => "text field"), '', 'tOOL TIP', '', 'from_date[from_date-date]'),

+			array('Number', 'INPUT', array('name' => 'invoiceid[invoiceid]', '', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '1', 'id[invoiceid-string]', '', '', '', 'search_string_type', ''),

+		array('From Date', 'INPUT', array('name' => 'from_date[0]', 'id'=>'invoice_from_date', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '', 'from_date[from_date-date]'),

+		 array('To Date', 'INPUT', array('name' => 'to_date[0]', 'id'=>'invoice_to_date', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '', 'from_date[from_date-date]'),

 	    

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

-		array('Generated Date', 'INPUT', array('name' => 'invoice_date[0]','','size' => '20', 'class' => "text field",'id'=>'invoice_date'), '', 'tOOL TIP', '', 'invoice_date[invoice_date-date]'),

+		array('Generated Date', 'INPUT', array('name' => 'invoice_date[0]', '', 'size' => '20', 'class' => "text field", 'id'=>'invoice_date'), '', 'tOOL TIP', '', 'invoice_date[invoice_date-date]'),

 		array('Invoice', 'deleted', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_invoice_details'),		   

-		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id,"type"=>"GLOBAL")),

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

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

+		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id, "type"=>"GLOBAL")),

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

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

         

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

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

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

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

         

 		return $form;

 	}

     

-	function build_grid_buttons(){

+	function build_grid_buttons() {

 	$buttons_json = json_encode(array(

 					));

 	return $buttons_json;

 	}

-	 function get_invoiceconf_form_fields($invoiceconf = '0'){    

-	 if(!empty($invoiceconf)){

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

-		 $logo=$invoiceconf['file'];

-	}else{

-		 $logo=$invoiceconf['logo'];

+	 function get_invoiceconf_form_fields($invoiceconf = '0') {    

+	 if ( ! empty($invoiceconf)) {

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

+		 $logo = $invoiceconf['file'];

+	} else {

+		 $logo = $invoiceconf['logo'];

 	}

-	 $accountid=$invoiceconf['accountid'];  

-		  if($logo != ''){        

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

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

+	 $accountid = $invoiceconf['accountid'];  

+		  if ($logo != '') {        

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

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

-			 $image_path= array('Existing Image', 'HIDDEN', array('type'=>'','name' => '' ), '', 'tOOL TIP', '');

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

+			 $accountid = 0;

+			 $image_path = array('Existing Image', 'HIDDEN', array('type'=>'', 'name' => ''), '', 'tOOL TIP', '');

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

 			//$image_path=array();

              

              

 			 }

-	$form['forms'] = array(base_url() . 'invoices/invoice_conf/',array('id'=>'invoice_conf_form','method'=>'POST','name'=>'invoice_conf_form','enctype'=>'multipart/form-data'));

+	$form['forms'] = array(base_url().'invoices/invoice_conf/', array('id'=>'invoice_conf_form', 'method'=>'POST', 'name'=>'invoice_conf_form', 'enctype'=>'multipart/form-data'));

 		$form['Configuration '] = array(

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

-			array('', 'HIDDEN', array('name'=>'accountid'),'', '', '', ''),

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

+			array('', 'HIDDEN', array('name'=>'accountid'), '', '', '', ''),

 		   //  array('', 'HIDDEN', array('name' => 'start_name','value' => '1'), '', '', ''),

-			array('Company name', 'INPUT', array('name' => 'company_name','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Address', 'INPUT', array('name' => 'address','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('City', 'INPUT', array('name' => 'city','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Province', 'INPUT', array('name' => 'province','size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Country', 'INPUT', array('name' => 'country','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Zipcode', 'INPUT', array('name' => 'zipcode','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Telephone', 'INPUT', array('name' => 'telephone','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Fax', 'INPUT', array('name' => 'fax','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Email Address', 'INPUT', array('name' => 'emailaddress','size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Website', 'INPUT', array('name' => 'website','size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+			array('Company name', 'INPUT', array('name' => 'company_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Address', 'INPUT', array('name' => 'address', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('City', 'INPUT', array('name' => 'city', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Province', 'INPUT', array('name' => 'province', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Country', 'INPUT', array('name' => 'country', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Zipcode', 'INPUT', array('name' => 'zipcode', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Telephone', 'INPUT', array('name' => 'telephone', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Fax', 'INPUT', array('name' => 'fax', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Email Address', 'INPUT', array('name' => 'emailaddress', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Website', 'INPUT', array('name' => 'website', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

                  

                 

 		 );

 		 $form['Invoice Configuration '] = array(

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

-			array('', 'HIDDEN', array('name'=>'accountid'),'', '', '', ''),     

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

+			array('', 'HIDDEN', array('name'=>'accountid'), '', '', '', ''),     

 				   array('Invoice Notification', 'invoice_notification', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_allow_invoice'),                

 				  array('Invoice Due Notification', 'invoice_due_notification', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_allow_invoice'),

-					array('Invoice Date Interval', 'INPUT', array('name' => 'interval','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				   array('Notify before days', 'INPUT', array('name' => 'notify_before_day','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-					array('Invoice Prefix', 'INPUT', array('name' => 'invoice_prefix','size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				  array('Invoice Start Form', 'INPUT', array('name' => 'invoice_start_from','size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-					 array('Invoice Taxes number', 'INPUT', array('name' => 'invoice_taxes_number','size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

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

+					array('Invoice Date Interval', 'INPUT', array('name' => 'interval', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				   array('Notify before days', 'INPUT', array('name' => 'notify_before_day', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+					array('Invoice Prefix', 'INPUT', array('name' => 'invoice_prefix', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				  array('Invoice Start Form', 'INPUT', array('name' => 'invoice_start_from', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+					 array('Invoice Taxes number', 'INPUT', array('name' => 'invoice_taxes_number', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

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

 		 );

 	 $form['Company personalization'] = array(

 		

@@ -190,11 +190,11 @@ 
 		 array('Website Domain', 'INPUT', array('name' => 'domain', 'size' => '20', 'maxlength' => '100', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 		array('Website Header', 'INPUT', array('name' => 'website_title', 'size' => '100', 'maxlength' => '100', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('Website Footer', 'INPUT', array('name' => 'website_footer', 'size' => '200', 'maxlength' => '200', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-		array('Company logo', 'IMAGE', array('name' => 'file','size' => '20', 'maxlength' => '100', 'class' => "",'id'=>'uploadFile','type'=>'file'),'class' => '', 'tOOL TIP', 'Please Enter account number'),

+		array('Company logo', 'IMAGE', array('name' => 'file', 'size' => '20', 'maxlength' => '100', 'class' => "", 'id'=>'uploadFile', 'type'=>'file'), 'class' => '', 'tOOL TIP', 'Please Enter account number'),

 		//array('', 'BLANL_DIV', array('name'=>'accountid','id'=>'imagePreview'),'', '', '', ''),

-		$delete_logo,$image_path,

+		$delete_logo, $image_path,

 				 );

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

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

         

 		return $form;

         

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_edit_automatically.php

Spacing +7 added lines, -7 removed lines

@@ -181,13 +181,13 @@ 
 	        </tr>
 	<tr>
 		<td>
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
 		 </td>
 	</tr>
 	<tr>
 		<td>
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
+				echo date('Y-m-d', strtotime($payment_due_date));
 		?></span>
 		 </td>
 	</tr>
@@ -218,12 +218,12 @@ 
 	<th >Amount</th>
 </tr>
 <?php
-$j=1;
+$j = 1;
 
- foreach($invoice_total_query as $value){
-	   $id=$value['id'];
-	   $debit=$value['debit'];
-	   $created_date=$value['created_date'];
+ foreach ($invoice_total_query as $value) {
+	   $id = $value['id'];
+	   $debit = $value['debit'];
+	   $created_date = $value['created_date'];
 ?>	
 <tr>
 <td width="20" align="center">