diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 06706f5..3964041 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5111,12 +5111,10 @@ 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_pax as tmc_pax,tmc_data.td_carrier as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt as tmc_tkt,tmc_data.td_tkt_fare as tmc_ticket_fare, gstr2a_data.gd_inv_no as gstr2a_inv ,gstr2a_data.gd_inv_value as gstr2a_value, 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 , tmc_data.td_tkt as tmc_tkt , tmc_data.td_pnr as tmc_pnr , 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', 'tmc_data.td_tkt = air_invoice_details.ticket_no or tmc_data.td_pnr = 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();