Merge branch 'main' of bitbucket.org:venbainformationtechnology/recon

This commit is contained in:
heama 2023-07-28 17:35:34 +05:30
commit 5c8420f0d8

View File

@ -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', '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();