diff --git a/application/core/MY_Model.php b/application/core/MY_Model.php index edd976f..f47c619 100644 --- a/application/core/MY_Model.php +++ b/application/core/MY_Model.php @@ -265,7 +265,13 @@ function getData($table,$id,$business_id) $this->db->select(); $this->db->from($table); if($business_id != NULL) { - $this->db->where('business_id', $business_id); + if($table == 'business') + { + $this->db->where('uid', $business_id); + } + else { + $this->db->where('business_id', $business_id); + } } $this->db->where('id', $id); $query = $this->db->get(); diff --git a/application/modules/Asset/views/asset_sub_value_list.php b/application/modules/Asset/views/asset_sub_value_list.php index 144126f..ab4d692 100644 --- a/application/modules/Asset/views/asset_sub_value_list.php +++ b/application/modules/Asset/views/asset_sub_value_list.php @@ -67,8 +67,8 @@   asset_id;?>" style="font-size: 16px;"> -   - + + diff --git a/application/modules/Business/views/edit_business.php b/application/modules/Business/views/edit_business.php index 6d96d34..5970b72 100644 --- a/application/modules/Business/views/edit_business.php +++ b/application/modules/Business/views/edit_business.php @@ -57,12 +57,7 @@ -
- -
- -
-
+

diff --git a/application/modules/Dashboard/controllers/Dashboard.php b/application/modules/Dashboard/controllers/Dashboard.php index af405b4..c705200 100644 --- a/application/modules/Dashboard/controllers/Dashboard.php +++ b/application/modules/Dashboard/controllers/Dashboard.php @@ -37,7 +37,7 @@ public function __construct() */ public function index() { - //echo date('Y-m-d', strtotime('+60 day', strtotime(date("Y-m-d")))); die(); + if(is_admin()) { $asset_count = $this->Dashboard_model->get_assets_count(user()->business_id); @@ -58,19 +58,12 @@ public function index() $expired_insurance_count = $this->Dashboard_model->get_expired_insurance_count(user()->business_id); $this->layout->set('expired_insurance_count', $expired_insurance_count); - - $amc = $this->Dashboard_model->get_amc(user()->business_id); - //print_r(json_encode($amc)); $this->layout->set('amc', $amc); - //echo "


"; + $insurence = $this->Dashboard_model->get_insurence(user()->business_id); - //print_r(json_encode($insurence));die(); $this->layout->set('insurence', $insurence); } - - - else if(is_superadmin()) { $user_count = $this->Dashboard_model->get_users_count(user()->business_id);