From 16bf854bea5e5f8f65134984fd0756bec9fcab1d Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:01:58 +0530 Subject: [PATCH] susee --- application/controllers/Corporate.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index d4004d6..55ef48c 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5113,9 +5113,7 @@ public function upload_tmc(){ $this->load->database('second', TRUE); $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', 'tmc_data.td_tkt = air_invoice_details.ticket_no or tmc_data.td_pnr = air_invoice_details.pnr'); - + $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'); $query = $this->db->get(); $result['data'] = $query->result();