diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2f6048d..2a491a7 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -62,4 +62,9 @@ $routes->get('vehicle_index/', 'Vehicle::vehicle_index');
$routes->post("add_vehicle", "Vehicle::add_vehicle");
$routes->get("new_vehicle/(:any)", "Vehicle::new_vehicle/$1");
$routes->get("delete_vehicle/(:any)", "Vehicle::delete_vehicle/$1");
-//end Vehicle
\ No newline at end of file
+//end Vehicle
+
+
+
+//dashboard
+$routes->get('dashboard', 'Users::dashboard');
\ No newline at end of file
diff --git a/app/Controllers/Client.php b/app/Controllers/Client.php
index c8116f1..b4ce784 100644
--- a/app/Controllers/Client.php
+++ b/app/Controllers/Client.php
@@ -4,16 +4,25 @@ namespace App\Controllers;
use App\Models\ClientModel;
use App\Models\RoleModel;
+use App\Models\UsersModel;
class Client extends BaseController
{
+
+ public $session;
+ public function __construct()
+ {
+
+ $this->session = session();
+ $this->UsersModel = new UsersModel();
+ }
public function client_index()
{
$ClientModel = new ClientModel();
- $client=$ClientModel->findAll();
+ $client = $ClientModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll();
$data['client']=$client;
return view('client_list',$data);
@@ -57,7 +66,8 @@ class Client extends BaseController
'state' => $this->request->getPost('state'),
'postal_code' => $this->request->getPost('postalcode'),
'country' => $this->request->getPost('country'),
- 'isactive' => 1 // Assuming this is a default value or handled separately
+ 'isactive' => 1 ,
+ 'branch_id' => $this->session->get('logged_user_branch_id')
];
// print_r($data);die;
diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index 3c75c7c..212b229 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -13,7 +13,7 @@ class Login extends BaseController
$this->session = session();
$this->UsersModel = new UsersModel();
-}
+ }
public function index()
{
return view('login_form');
@@ -37,6 +37,7 @@ class Login extends BaseController
// echo $user['password'];die;
if ($user && password_verify($password, $user['password'])) {
+
$Data = $this->UsersModel->select('users.* , roles.roles')
->join('roles', 'users.role = roles.role_id', 'left')
->where('users.email',$email)
@@ -49,7 +50,7 @@ class Login extends BaseController
$this->session->set('logged_user_name',$Data[0]['name']);
- return redirect()->to('business_index');
+ return redirect()->to('dashboard');
} else {
// echo "Stored Password: " . $user['password'] . "
";
// echo "Input Password: " . $password . "
";
diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php
index 95e9229..c007829 100644
--- a/app/Controllers/Users.php
+++ b/app/Controllers/Users.php
@@ -11,11 +11,19 @@ use App\Models\BranchModel;
class Users extends BaseController
{
+
+ public function dashboard()
+ {
+ return view('dashboard');
+
+ }
+
+
## For User Listing
public function index()
{
$UsersModel = new UsersModel();
- $users=$UsersModel->findAll();
+ $users = $UsersModel->findAll();
$data['users']=$users;
$roleModel = new RoleModel();
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index d6e23c8..2e0dd03 100644
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -5,7 +5,7 @@ class ClientModel extends Model
{
protected $table = 'client';
protected $primaryKey = 'client_id';
- protected $allowedFields = ['client_id','client_name','email','mobile_no','address','city','state','postal_code','country','description','isactive'];
+ protected $allowedFields = ['client_id','client_name','email','mobile_no','address','city','state','postal_code','country','description','isactive','branch_id'];
}
\ No newline at end of file
diff --git a/app/Views/client_form.php b/app/Views/client_form.php
index 312f8d2..6689cd3 100644
--- a/app/Views/client_form.php
+++ b/app/Views/client_form.php
@@ -21,43 +21,46 @@