diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 3964041..d4004d6 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5111,12 +5111,15 @@ public function upload_tmc(){ public function tmc_gst_inv(){ $this->checksess(); $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 , 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->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.gstr2a_data', 'air_invoice_details.invoice_no = gstr2a_data.gd_inv_no'); $query = $this->db->get(); $result['data'] = $query->result(); + $this->load->view('corporate/tmc_gst_inv',$result); } diff --git a/application/controllers/recon.code-workspace b/application/controllers/recon.code-workspace new file mode 100644 index 0000000..407c760 --- /dev/null +++ b/application/controllers/recon.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "../.." + } + ], + "settings": {} +} \ No newline at end of file