diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index b90790d4..63a240d1 100644 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1119,10 +1119,11 @@ class EmployeeServiceController extends AdminController public function getFileMetaDataByFileId($file_id, $status = 'success'){ $data = $this->fileModel - ->select('files.*, clients.client_name, clients.short_name, policies.name as policy_name') + ->select('files.*, clients.client_name, clients.short_name, policies.name as policy_name,client_branch.branch_code') ->join('clients', 'clients.id = files.client_id') ->join('client_policy', 'client_policy.id = files.policy_id') ->join('policies', 'policies.id = client_policy.policy_id') + ->join('client_branch', 'client_branch.id = files.client_branch_id') ->where('files.id', $file_id) ->first(); @@ -1135,7 +1136,7 @@ class EmployeeServiceController extends AdminController $msg_title = 'File Upload Failure'; } - $msg_txt = $data['client_name'] . ' - ' . $data['policy_name'] . ' - ' . ucfirst($data['action']); + $msg_txt = $data['client_name'] . ' ('.$data['branch_code'].') - ' . $data['policy_name'] . ' - ' . ucfirst($data['action']); $user_id = $data['created_by']; $url = 'employee/upload'; diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php index 9482c63b..bee2b626 100644 --- a/app/Views/policy_grid.php +++ b/app/Views/policy_grid.php @@ -38,10 +38,13 @@ - + Copy from excel