diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index c578e2a..8f98ea3 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 5cf13c7..9430eac 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 @@ -
+