diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 493fbc9..dd36702 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -288,7 +288,7 @@ class MasterController extends BaseController $data['clientdata'] = $this->ClientBranchModel->select('client.name as client_name , client_branch.name as client_branch_name , client_branch.id as client_branch_id') ->join('client', 'client_branch.client_id = client.client_id', 'left') - ->where('client.business_id',$this->session->get('logged_in_staff_business_id')) + // ->where('client.business_id',$this->session->get('logged_in_staff_business_id')) ->findAll(); $data['serviceGroupData'] = $this->ServiceGroupModel->findAll(); diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php index 6c495f7..c919bb9 100644 --- a/app/Controllers/StaffController.php +++ b/app/Controllers/StaffController.php @@ -163,11 +163,7 @@ class StaffController extends BaseController if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - $data['clientList'] = $this->ClientModel->select('client.* , COUNT(client_docs.id) as docs_count') - ->join('client_docs', 'client.client_id = client_docs.client_branch_id', 'left') - ->where('client.branch_id',$this->session->get('logged_in_staff_branch_id')) - ->groupBy('client.client_id') - ->findAll(); + $data['clientList'] = $this->ClientModel->findAll(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 1593c6c..10bb87b 100644 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -46,7 +46,6 @@