From 8565131ef3e2ec469c4e0109a567a7da9ec0383f Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:04:20 +0530 Subject: [PATCH] susee --- application/controllers/Corporate.php | 3 +- application/models/Corporate_model.php | 5 + application/views/admin/includes/top_nav.php | 2 +- application/views/corporate/dashboard.php | 39 +-- application/views/corporate/gstr2a_recon.php | 16 +- .../views/corporate/includes/top_nav.php | 2 +- application/views/tmc/includes/top_nav.php | 2 +- assets/css/app-corporate-rtl.min.css.map | 2 +- assets/css/app-corporate.min.css.map | 2 +- assets/css/app-creative-dark-rtl.css | 284 ++++++++--------- assets/css/app-creative-dark-rtl.min.css | 4 +- assets/css/app-creative-dark-rtl.min.css.map | 2 +- assets/css/app-creative-dark.css | 282 ++++++++--------- assets/css/app-creative-dark.min.css | 4 +- assets/css/app-creative-dark.min.css.map | 2 +- assets/css/app-creative-rtl.css | 294 +++++++++--------- assets/css/app-creative-rtl.min.css | 4 +- assets/css/app-creative-rtl.min.css.map | 2 +- assets/css/app-creative.css | 292 ++++++++--------- assets/css/app-creative.min.css | 4 +- assets/css/app-creative.min.css.map | 2 +- assets/css/app-modern-dark-rtl.min.css.map | 2 +- assets/css/app-modern-dark.min.css.map | 2 +- assets/css/app-modern-rtl.min.css.map | 2 +- assets/css/app-modern.min.css.map | 2 +- assets/css/app-saas-dark-rtl.min.css.map | 2 +- assets/css/app-saas-dark.min.css.map | 2 +- assets/css/app-saas-rtl.min.css.map | 2 +- assets/css/app-saas.min.css.map | 2 +- assets/css/bootstrap-corporate-dark.css | 16 +- assets/css/bootstrap-corporate-dark.min.css | 2 +- .../css/bootstrap-corporate-dark.min.css.map | 2 +- assets/css/bootstrap-corporate.css | 16 +- assets/css/bootstrap-corporate.min.css | 2 +- assets/css/bootstrap-corporate.min.css.map | 2 +- assets/css/bootstrap-creative-dark.css | 138 ++++---- assets/css/bootstrap-creative-dark.min.css | 2 +- .../css/bootstrap-creative-dark.min.css.map | 2 +- assets/css/bootstrap-creative.css | 138 ++++---- assets/css/bootstrap-creative.min.css | 2 +- assets/css/bootstrap-creative.min.css.map | 2 +- assets/css/bootstrap-dark.css | 16 +- assets/css/bootstrap-dark.min.css | 2 +- assets/css/bootstrap-dark.min.css.map | 2 +- assets/css/bootstrap-modern-dark.css | 16 +- assets/css/bootstrap-modern-dark.min.css | 2 +- assets/css/bootstrap-modern-dark.min.css.map | 2 +- assets/css/bootstrap-modern.css | 16 +- assets/css/bootstrap-modern.min.css | 2 +- assets/css/bootstrap-modern.min.css.map | 2 +- assets/css/bootstrap-saas-dark.css | 16 +- assets/css/bootstrap-saas-dark.min.css | 2 +- assets/css/bootstrap-saas-dark.min.css.map | 2 +- assets/css/bootstrap-saas.css | 16 +- assets/css/bootstrap-saas.min.css | 2 +- assets/css/bootstrap-saas.min.css.map | 2 +- assets/css/bootstrap.css | 16 +- assets/css/bootstrap.min.css | 2 +- assets/css/bootstrap.min.css.map | 2 +- assets/images/favicon.ico | Bin 115109 -> 1199 bytes assets/images/favicon_old.ico | Bin 0 -> 115109 bytes assets/js/pages/dashboard-sales.init.js | 2 +- ...7501751___GSTR2A_Aujas_Nov22_REUPLOAD.xlsx | Bin 0 -> 26781 bytes .../246_1687501970___air_invoice_details.xlsx | Bin 0 -> 9449 bytes .../299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...48_1689568928___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...49_1689568361___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...50_1689568561___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...A-12DWWPD9503H135-Dec-2022-1687501371.xlsx | Bin 0 -> 26781 bytes ...A-12DWWPD9503H135-Jan-2020-1687419620.xlsx | Bin 0 -> 24868 bytes ...A-12DWWPD9503H135-Jan-2023-1687497946.xlsx | Bin 0 -> 25948 bytes ...A-12DWWPD9503H135-Jan-2023-1687498050.xlsx | Bin 0 -> 25948 bytes ...A-12DWWPD9503H135-Jan-2023-1687500303.xlsx | Bin 0 -> 19659 bytes ...A-12DWWPD9503H135-Jun-2023-1687504338.xlsx | Bin 0 -> 9500 bytes ...A-12DWWPD9503H135-Jun-2023-1687760003.xlsx | Bin 0 -> 19659 bytes ...A-12DWWPD9503H135-Jun-2023-1687762439.xlsx | Bin 0 -> 19659 bytes ...A-12DWWPD9503H135-Oct-2022-1687501287.xlsx | Bin 0 -> 25948 bytes .../TMC-testagent-Jun-2023-1687760068.xlsx | Bin 0 -> 82250 bytes .../TMC-testagent-Jun-2023-1687762567.xlsx | Bin 0 -> 82250 bytes .../TMC-testagent-May-2020-1687773551.xlsx | Bin 0 -> 82250 bytes .../TMC-testagent-May-2020-1687775850.xlsx | Bin 0 -> 12788 bytes .../TMC-testagent-May-2020-1687775907.xlsx | Bin 0 -> 12788 bytes .../TMC-testagent-May-2020-1687775962.xlsx | Bin 0 -> 12788 bytes .../TMC-testagent-May-2020-1689567811.xlsx | Bin 0 -> 82239 bytes 96 files changed, 863 insertions(+), 848 deletions(-) create mode 100644 assets/images/favicon_old.ico create mode 100644 uploads/1/airline_invoice/246_1687501751___GSTR2A_Aujas_Nov22_REUPLOAD.xlsx create mode 100644 uploads/1/airline_invoice/246_1687501970___air_invoice_details.xlsx create mode 100644 uploads/1/airline_invoice/299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/343_1689571453___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/344_1689570769___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/345_1689570633___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/346_1689570392___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/347_1689569914___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/348_1689568928___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/349_1689568361___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/349_1689571194___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/350_1689568561___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/350_1689571181___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/351_1689571105___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/351_1689575224___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/352_1689570896___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/352_1689571446___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Dec-2022-1687501371.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jan-2020-1687419620.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jan-2023-1687497946.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jan-2023-1687498050.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jan-2023-1687500303.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jun-2023-1687504338.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jun-2023-1687760003.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Jun-2023-1687762439.xlsx create mode 100644 uploads/1/gstr2a/GSTR2A-12DWWPD9503H135-Oct-2022-1687501287.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-Jun-2023-1687760068.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-Jun-2023-1687762567.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-May-2020-1687773551.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-May-2020-1687775850.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-May-2020-1687775907.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-May-2020-1687775962.xlsx create mode 100644 uploads/1/tmc/TMC-testagent-May-2020-1689567811.xlsx diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index ac4c4a9..b933b62 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -225,7 +225,8 @@ class Corporate extends CI_Controller { // $fary['status'] = 1; // $fary['refid'] = $filename; - $this->gen_gstr2a_recon($gdid); + // $this->gen_gstr2a_recon($gdid); + echo true; } } // echo json_encode($fary); diff --git a/application/models/Corporate_model.php b/application/models/Corporate_model.php index afdbcbf..279a883 100644 --- a/application/models/Corporate_model.php +++ b/application/models/Corporate_model.php @@ -134,6 +134,7 @@ class Corporate_model extends CI_Model { $this->db->from('gstr2a_data'); $this->db->where('gd_inv_date >=', $from_date); $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('is_active ', 1); $query = $this->db->count_all_results(); return $query; } @@ -145,6 +146,7 @@ class Corporate_model extends CI_Model { $this->db->from('gstr2a_data'); $this->db->where('gd_inv_date >=', $from_date); $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('is_active ', 1); $this->db->where('inv_status', 0); $query = $this->db->count_all_results(); return $query; @@ -157,6 +159,7 @@ class Corporate_model extends CI_Model { $this->db->from('gstr2a_data'); $this->db->where('gd_inv_date >=', $from_date); $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('is_active ', 1); $this->db->where('inv_status', 1); $query = $this->db->count_all_results(); return $query; @@ -168,6 +171,7 @@ class Corporate_model extends CI_Model { $this->db->from('gstr2a_data'); $this->db->where('gd_inv_date >=', $from_date); $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('is_active ', 1); $this->db->where('inv_status', 2); $query = $this->db->count_all_results(); return $query; @@ -179,6 +183,7 @@ class Corporate_model extends CI_Model { $this->db->from('gstr2a_data'); $this->db->where('gd_inv_date >=', $from_date); $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('is_active ', 1); $this->db->where('inv_status', 3); $query = $this->db->count_all_results(); return $query; diff --git a/application/views/admin/includes/top_nav.php b/application/views/admin/includes/top_nav.php index 5e09cb8..8ca2302 100644 --- a/application/views/admin/includes/top_nav.php +++ b/application/views/admin/includes/top_nav.php @@ -1,5 +1,5 @@ -
+