From fdbebc73451aae02b361f6acd37caa3ad8358590 Mon Sep 17 00:00:00 2001 From: heama Date: Fri, 21 Jul 2023 19:03:49 +0530 Subject: [PATCH] heama --- application/controllers/Corporate.php | 2 +- .../views/corporate/includes/top_nav.php | 3 +- application/views/corporate/tmc_gst_inv.php | 104 ++++++++++++++---- .../GSTR2A-TESTNEW-Jun-2020-1689934395.xlsx | Bin 0 -> 19659 bytes 4 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 uploads/1/gstr2a/GSTR2A-TESTNEW-Jun-2020-1689934395.xlsx diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 6eda99e..aa6f651 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5113,7 +5113,7 @@ public function upload_tmc(){ $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->select('tmc_data.td_pax as tmc_pax,tmc_data.td_carrier as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt as tmc_tkt,tmc_data.td_tkt_fare as tmc_ticket_fare, gstr2a_data.gd_inv_no as gstr2a_inv ,gstr2a_data.gd_inv_value as gstr2a_value, 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'); diff --git a/application/views/corporate/includes/top_nav.php b/application/views/corporate/includes/top_nav.php index e577bbf..d8a1cdd 100644 --- a/application/views/corporate/includes/top_nav.php +++ b/application/views/corporate/includes/top_nav.php @@ -87,7 +87,7 @@ GSTR2A TMC AIRLINE INVOICE - TEST +
  • @@ -107,6 +107,7 @@
    GSTR2A TMC + DATA RECON
    • session->flashdata('corporate_id') != 1) { ?> diff --git a/application/views/corporate/tmc_gst_inv.php b/application/views/corporate/tmc_gst_inv.php index 21f0d82..a660cbf 100644 --- a/application/views/corporate/tmc_gst_inv.php +++ b/application/views/corporate/tmc_gst_inv.php @@ -2,7 +2,7 @@ - TMC GST INV + DATA RECON @@ -76,11 +76,11 @@
    -

    TMC GST INV

    +

    DATA RECON

      -
    1. Files
      2. -
    2. TMC GST INV
      3. +
    3. Reconciliation
      4. +
    4. DATA RECON
    @@ -126,12 +126,19 @@