diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 8f98ea3..6eda99e 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5107,4 +5107,22 @@ public function upload_tmc(){ echo json_encode($data); } -} \ No newline at end of file + + 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_tkt as tmc_tkt , 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.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(); + + $this->load->view('corporate/tmc_gst_inv',$result); + } + +} + + diff --git a/application/views/corporate/gstr2a_recon.php b/application/views/corporate/gstr2a_recon.php index c9c6298..a63eed4 100644 --- a/application/views/corporate/gstr2a_recon.php +++ b/application/views/corporate/gstr2a_recon.php @@ -186,7 +186,7 @@ INVOICE FILE ACTION REFID - REFID + SEARCH MANUAL TKT NO TICKET NO INVOICE @@ -526,9 +526,10 @@ function() { async: false, success: function(data){ var pdata = JSON.parse(data); - var d = pdata; - d.counter++; - oTable.row(tr).data(d); + // var d = pdata; + // d.counter++; + // oTable.row(tr).data(d); + $(".btn-primary").click(); }, error:function(){ alert('Request failed. Kindly try after sometime'); @@ -616,7 +617,7 @@ function() { { extend: "csvHtml5", exportOptions: { - columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18] + columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,22] } } @@ -683,7 +684,7 @@ function() { ], "columnDefs": [ { - "targets": [0,1,2,,3,22 ], + "targets": [0,1,2,,3 ], "visible": false }, { diff --git a/application/views/corporate/includes/top_nav.php b/application/views/corporate/includes/top_nav.php index 8e02011..e577bbf 100644 --- a/application/views/corporate/includes/top_nav.php +++ b/application/views/corporate/includes/top_nav.php @@ -87,6 +87,7 @@ GSTR2A TMC AIRLINE INVOICE + TEST
  • diff --git a/application/views/corporate/tmc.php b/application/views/corporate/tmc.php index 1c8e607..d8fe8cb 100644 --- a/application/views/corporate/tmc.php +++ b/application/views/corporate/tmc.php @@ -530,7 +530,7 @@ }); $("#usrforma").submit(function(e) { - console.log("aaaaaaaa"); + // alert('sdd') $('#loading1').show(); $('#submit1').hide(); e.preventDefault(); // avoid to execute the actual submit of the form. @@ -545,9 +545,11 @@ cache: false, async: false, success: function(data) { + console.log(data); $('#loading1').hide(); $('#submit1').show(); var pdata = JSON.parse(data); + console.log(pdata); if (pdata.status == 1) { $('#addclose').trigger('click'); usrforma.reset(); diff --git a/application/views/corporate/tmc_gst_inv.php b/application/views/corporate/tmc_gst_inv.php new file mode 100644 index 0000000..21f0d82 --- /dev/null +++ b/application/views/corporate/tmc_gst_inv.php @@ -0,0 +1,353 @@ + + + + + TMC GST INV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + +
    +
    + + +
    + + +
    +
    +
    +

    TMC GST INV

    +
    +
      +
    1. Files
      2. +
    2. TMC GST INV
      3. +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    + + + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TICKET NO (TMC)INV NO (GST)INV NOPNR NOTICKET NOTOTAL (INV)
    tmc_tkt; ?>gstr2a_inv; ?>inv_invoice_no; ?>inv_pnr; ?>inv_tkt_no; ?>total_values; ?>
    + +
    +
    +
    + + +
    + +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/tmc/dashboard.php b/application/views/tmc/dashboard.php index 2c83191..ac97c3e 100644 --- a/application/views/tmc/dashboard.php +++ b/application/views/tmc/dashboard.php @@ -98,7 +98,7 @@
    - +
    @@ -464,6 +464,10 @@ datesArr1 = []; var startDate = new Date($('#from').val()); + + +// alert($('#from').val()); + var endDate = new Date($('#to').val()); while (startDate <= endDate) { diff --git a/uploads/1/airline_invoice/400_1689855351___299_1687760660___dummy.pdf b/uploads/1/airline_invoice/400_1689855351___299_1687760660___dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/uploads/1/airline_invoice/400_1689855351___299_1687760660___dummy.pdf differ diff --git a/uploads/1/airline_invoice/401_1689855308___299_1687760660___dummy.pdf b/uploads/1/airline_invoice/401_1689855308___299_1687760660___dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/uploads/1/airline_invoice/401_1689855308___299_1687760660___dummy.pdf differ diff --git a/uploads/1/airline_invoice/402_1689855176___299_1687760660___dummy.pdf b/uploads/1/airline_invoice/402_1689855176___299_1687760660___dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/uploads/1/airline_invoice/402_1689855176___299_1687760660___dummy.pdf differ diff --git a/uploads/1/airline_invoice/404_1689855121___352_1689568333___299_1687760660___dummy.pdf b/uploads/1/airline_invoice/404_1689855121___352_1689568333___299_1687760660___dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/uploads/1/airline_invoice/404_1689855121___352_1689568333___299_1687760660___dummy.pdf differ diff --git a/uploads/1/airline_invoice/404_1689855140___299_1687760660___dummy.pdf b/uploads/1/airline_invoice/404_1689855140___299_1687760660___dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/uploads/1/airline_invoice/404_1689855140___299_1687760660___dummy.pdf differ diff --git a/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855004.xlsx b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855004.xlsx new file mode 100644 index 0000000..30eb65b Binary files /dev/null and b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855004.xlsx differ diff --git a/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855034.xlsx b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855034.xlsx new file mode 100644 index 0000000..30eb65b Binary files /dev/null and b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855034.xlsx differ diff --git a/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855061.xlsx b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855061.xlsx new file mode 100644 index 0000000..030ab43 Binary files /dev/null and b/uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Nov-2022-1689855061.xlsx differ diff --git a/uploads/1/tmc/TMC-testagent-May-2020-1689912798.xlsx b/uploads/1/tmc/TMC-testagent-May-2020-1689912798.xlsx new file mode 100644 index 0000000..7e27f29 Binary files /dev/null and b/uploads/1/tmc/TMC-testagent-May-2020-1689912798.xlsx differ diff --git a/uploads/1/tmc/TMC-testagent-May-2020-1689913215.xlsx b/uploads/1/tmc/TMC-testagent-May-2020-1689913215.xlsx new file mode 100644 index 0000000..7e27f29 Binary files /dev/null and b/uploads/1/tmc/TMC-testagent-May-2020-1689913215.xlsx differ diff --git a/uploads/1/tmc/TMC-testagent-May-2020-1689913329.xlsx b/uploads/1/tmc/TMC-testagent-May-2020-1689913329.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/1/tmc/TMC-testagent-May-2020-1689913329.xlsx differ diff --git a/uploads/1/tmc/TMC-testagent-May-2020-1689913633.xlsx b/uploads/1/tmc/TMC-testagent-May-2020-1689913633.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/1/tmc/TMC-testagent-May-2020-1689913633.xlsx differ diff --git a/uploads/1/tmc/TMC-testagent-May-2020-1689913752.xlsx b/uploads/1/tmc/TMC-testagent-May-2020-1689913752.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/1/tmc/TMC-testagent-May-2020-1689913752.xlsx differ diff --git a/uploads/4/tmc/TMC-TEST-May-2020-1689854231.xlsx b/uploads/4/tmc/TMC-TEST-May-2020-1689854231.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/4/tmc/TMC-TEST-May-2020-1689854231.xlsx differ diff --git a/uploads/4/tmc/TMC-TEST-May-2020-1689854245.xlsx b/uploads/4/tmc/TMC-TEST-May-2020-1689854245.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/4/tmc/TMC-TEST-May-2020-1689854245.xlsx differ diff --git a/uploads/4/tmc/TMC-TEST-May-2020-1689854336.xlsx b/uploads/4/tmc/TMC-TEST-May-2020-1689854336.xlsx new file mode 100644 index 0000000..6bba71c Binary files /dev/null and b/uploads/4/tmc/TMC-TEST-May-2020-1689854336.xlsx differ