diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 900ebf4..c49ce9b 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -19,28 +19,26 @@ class Corporate extends CI_Controller { * @see https://codeigniter.com/user_guide/general/urls.html */ - function __construct() - { - parent::__construct(); - $this->load->model('Corporate_model','corp'); - $this->db2 = $this->load->database('second', TRUE); - // $c_id = $this->session->userdata['recon_sess_i']['u_corporateid']; - // $this->db->select('payment'); - // $this->db->from('corporates'); - // $this->db->where('c_id', intval($c_id)); - // $query = $this->db->get(); - // $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment); - //force_ssl(); - } + function __construct() + { + parent::__construct(); + $this->load->model('Corporate_model','corp'); + $this->db2 = $this->load->database('second', TRUE); + // $c_id = $this->session->userdata['recon_sess_i']['u_corporateid']; + // $this->db->select('payment'); + // $this->db->from('corporates'); + // $this->db->where('c_id', intval($c_id)); + // $query = $this->db->get(); + // $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment); + //force_ssl(); + } public function index(){ - redirect('corporate/dashboard'); } public function dashboard(){ $this->checksess(); - $this->load->view('corporate/dashboard'); } @@ -419,6 +417,9 @@ class Corporate extends CI_Controller { $this->load->database('second', TRUE); $res_2 = $this->db2->where('pnr' , $value->td_tkt)->or_where('ticket_no' , $value->td_tkt)->get('air_invoice_details')->result(); if(isset($res_2[0])){ + // $uptData['inv_received'] = 1; + // $this->db->where('td_id', $value->td_id); + // $data = $this->db->update('tmc_data',$uptData); $value->inv = $res_2[0]->invoice_no; } else{ @@ -469,6 +470,25 @@ class Corporate extends CI_Controller { else $res = $this->db->query('select *,am_code as supplier_code from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv,sum(td_net) td_net_ref from tmc_data where td_show_status = 1 group by td_tkt) td on gd.gd_id=td.td_gstr2a_match_id left join airline_master am on am.am_name=gd.gd_supplier_type left join airline_invoice ai on gd.gd_id=ai.ti_gdid or gd.gd_inv_no=ai.ti_gst_nub where gd.is_active = 1 and gd_inv_date between "'.$fromdate.'" and "'.$todate.'" order by gd_id desc'); // $res = $this->db->query('select * from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv from tmc_data group by td_tkt) td on gd.gd_tkt_no=td.td_tkt where gd_inv_date between "'.$fromdate.'" and "'.$todate.'"'); + foreach ($res->result() as $key => $value) { + // print_r($value);die(); + if ($value) { + $this->load->database('second', TRUE); + $res_2 = $this->db2->where('invoice_no' , $value->gd_inv_no)->get('air_invoice_details')->result(); + if(isset($res_2[0])){ + // $uptData['inv_received'] = 1; + // $this->db->where('td_id', $value->td_id); + // $data = $this->db->update('tmc_data',$uptData); + $value->inv = $res_2[0]->invoice_no; + $value->tkt=$res_2[0]->ticket_no; + $value->amt=$res_2[0]->total_values; + $value->tpnr=$res_2[0]->pnr; + } + else{ + $value->inv = " "; + } + } + } $fres['data'] = array(); $res2 = new stdClass(); if($gid){ @@ -1886,6 +1906,7 @@ class Corporate extends CI_Controller { force_download('Payment_Advice_Sample.xlsx', $pth); } + public function p_tmc_sample_download(){ $this->checksess(); $this->load->helper('download'); @@ -5113,14 +5134,13 @@ public function upload_tmc(){ public function tmc_gst_inv(){ $this->checksess(); $this->load->database('second', TRUE); - // $res = $this->db->query('SELECT invoice_no as inv_invoice_no , pnr as inv_pnr , ticket_no as inv_tkt_no FROM gst1.air_invoice_details AS t1 JOIN reconciler_test.gstr2a_data AS t2 ON t1.invoice_no = t2.gd_inv_no;'); - - $this->db->select('tmc_data.td_tkt as tmc_tkt , gstr2a_data.gd_inv_no as gstr2a_inv , invoice_no as inv_invoice_no , pnr as inv_pnr , ticket_no as inv_tkt_no , total_values'); + $this->db->select('tmc_data.td_pax as tmc_pax,tmc_data.td_airline_pnr as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt_fare as tmc_ticket_fare , gstr2a_data.gd_inv_value as gstr2a_value , tmc_data.td_tkt_fare as tmc_ticket_fare , REPLACE(tmc_data.td_tkt," ","") as tmc_tkt , REPLACE(tmc_data.td_pnr," ","") as tmc_pnr , REPLACE(gstr2a_data.gd_inv_no, " ", "") as gstr2a_inv , invoice_no as inv_invoice_no , pnr as inv_pnr , ticket_no as inv_tkt_no , total_values'); $this->db->from('gst1.air_invoice_details'); + $this->db->join('reconciler_test.tmc_data', 'replace(tmc_data.td_tkt," ","") = replace(air_invoice_details.ticket_no," ","") or replace(tmc_data.td_pnr," ","") = replace(air_invoice_details.pnr," ","")'); $this->db->join('reconciler_test.gstr2a_data', 'air_invoice_details.invoice_no = gstr2a_data.gd_inv_no'); - $this->db->join('reconciler_test.tmc_data', 'tmc_data.td_tkt = gstr2a_data.gd_tkt_no'); $query = $this->db->get(); $result['data'] = $query->result(); + $this->load->view('corporate/tmc_gst_inv',$result); } @@ -5128,3 +5148,5 @@ public function upload_tmc(){ } + + diff --git a/application/views/admin/includes/top_nav.php b/application/views/admin/includes/top_nav.php index 8ca2302..c2d88b2 100644 --- a/application/views/admin/includes/top_nav.php +++ b/application/views/admin/includes/top_nav.php @@ -3,6 +3,11 @@