From e7cb64b1f8839d35abe3c9aa6bb95a876bb35e0f Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 13 Aug 2024 16:51:29 +0530 Subject: [PATCH] GWM : app config --- app/Controllers/Employeedetails.php | 6 +++--- app/Models/AppConfigModel.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index c7c93734..77791d58 100644 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -429,9 +429,9 @@ class Employeedetails extends BaseController $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['Location'] = $this->employeedetails_model->getConfigValue($LocationConfigID); $data['Department'] = $this->employeedetails_model->getDepartment(); - $data['hra_rate'] = $this->appConfig->where('key',1)->get()->getRow()->value; - $data['pf_rate'] = $this->appConfig->where('key',2)->get()->getRow()->value; - $data['esi_rate'] = $this->appConfig->where('key',3)->get()->getRow()->value; + $data['hra_rate'] = $this->appConfig->where('config_key',1)->get()->getRow()->config_value; + $data['pf_rate'] = $this->appConfig->where('config_key',2)->get()->getRow()->config_value; + $data['esi_rate'] = $this->appConfig->where('config_key',3)->get()->getRow()->config_value; $this->global['pageTitle'] = 'Add New Employee'; // if($this->role == ROLE_ADMIN || $this->DEPCode == HR) diff --git a/app/Models/AppConfigModel.php b/app/Models/AppConfigModel.php index 40cff6ad..46dd4dc1 100644 --- a/app/Models/AppConfigModel.php +++ b/app/Models/AppConfigModel.php @@ -11,9 +11,9 @@ class AppConfigModel extends Model protected $primaryKey = 'id'; protected $allowedFields = [ "id", - "key", + "config_key", "config", - "value", + "config_value", "is_active", "createdDate", "uploadedby",