Zettai-Backup/recon
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
suseendhiran17 2023-07-24 14:49:53 +05:30
commit 2f3500139a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Corporate.php
View File

@ -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);
}

8
application/controllers/recon.code-workspace Normal file
View File

@ -0,0 +1,8 @@
{
"folders": [
{
"path": "../.."
}
],
"settings": {}
}

2
application/views/corporate/tmc_gst_inv.php
View File

@ -354,7 +354,7 @@
{
extend: "csvHtml5",
exportOptions: {
columns: [ 0, 1, 2, 3, 4,5,6,7,8,9,10,11,12,13,14,15]
columns: [ 0, 1, 2, 3, 4,5,6,7,8,9,10,11]
}
}