From be3119b33ce501a8b17708489c6afeb3a3e47398 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 5 Apr 2024 15:12:46 +0530 Subject: [PATCH] GWM:RoleBasedChanes --- app/Config/App.php | 2 +- app/Controllers/Login.php | 1 + app/Controllers/Products.php | 2 +- app/Views/layout/header.php | 547 ++---------------- app/Views/login_form.php | 33 +- app/Views/product_form.php | 31 +- app/Views/product_list.php | 10 +- public/assets/images/The-Mechanic-Yellow.png | Bin 0 -> 1143 bytes public/assets/images/favicon-2.ico | Bin 0 -> 115109 bytes public/assets/images/favicon.ico | Bin 115109 -> 15406 bytes public/assets/images/logo.png | Bin 0 -> 95086 bytes .../debugbar/debugbar_1712296719.950601.json | 1 - .../debugbar/debugbar_1712296744.129129.json | 1 - .../debugbar/debugbar_1712296746.319508.json | 1 - .../debugbar/debugbar_1712296750.561307.json | 1 - .../debugbar/debugbar_1712296754.194082.json | 1 - .../debugbar/debugbar_1712296821.477808.json | 1 - .../debugbar/debugbar_1712296840.221486.json | 1 - .../debugbar/debugbar_1712296841.686525.json | 1 - .../debugbar/debugbar_1712296862.677663.json | 1 - .../debugbar/debugbar_1712296864.206355.json | 1 - .../debugbar/debugbar_1712296865.933646.json | 1 - .../debugbar/debugbar_1712296870.810559.json | 1 - .../debugbar/debugbar_1712297209.962349.json | 1 - .../debugbar/debugbar_1712297214.623622.json | 1 - .../debugbar/debugbar_1712297288.203445.json | 1 - .../debugbar/debugbar_1712297862.584486.json | 1 - .../debugbar/debugbar_1712297976.342980.json | 1 - .../debugbar/debugbar_1712297981.289566.json | 1 - .../debugbar/debugbar_1712298258.999938.json | 1 - .../debugbar/debugbar_1712298260.639641.json | 1 - .../debugbar/debugbar_1712307910.603378.json | 1 + .../debugbar/debugbar_1712307938.546699.json | 1 + .../debugbar/debugbar_1712307948.421234.json | 1 + .../debugbar/debugbar_1712307997.025116.json | 1 + .../debugbar/debugbar_1712308052.396481.json | 1 + .../debugbar/debugbar_1712308067.796202.json | 1 + .../debugbar/debugbar_1712308144.541404.json | 1 + .../debugbar/debugbar_1712308723.766553.json | 1 + .../debugbar/debugbar_1712309483.390286.json | 1 + .../debugbar/debugbar_1712309487.050672.json | 1 + .../debugbar/debugbar_1712309525.569693.json | 1 + .../debugbar/debugbar_1712309802.943969.json | 1 + .../debugbar/debugbar_1712309828.517860.json | 1 + .../debugbar/debugbar_1712309882.659642.json | 1 + .../debugbar/debugbar_1712309887.690027.json | 1 + .../debugbar/debugbar_1712310026.381417.json | 1 + .../debugbar/debugbar_1712310027.033208.json | 1 + .../debugbar/debugbar_1712310069.345564.json | 1 + .../debugbar/debugbar_1712310115.387073.json | 1 + .../debugbar/debugbar_1712310116.299467.json | 1 + ...ci_session2573q24h3a7or3a5s3tt0as5repui0el | 1 + ...ci_session3f859v0nus6k39e69dg1m99ojisvj74t | 1 + ...ci_session5b5op4fvemsle98bgrdcd40i7o8jiopj | 1 + ...ci_sessionbnspmr17nu9h24ll86oljlj6khpn3e3q | 1 + ...ci_sessionc99vsrmvrqgjchvou88p9epmrrt6bh79 | 1 + ...ci_sessiond4er71c2kdir7v8uscuiuga0l2lehfj5 | 1 + ...ci_sessioneom0t8j0q24i1ev8gj05n8qqtrn4963d | 1 + ...ci_sessionhhmc3lcdt4jsmbscp8fr04gvcm7cu5ud | 1 + ...ci_sessionl5o29hh8ojuol0v9g06so9q610bmre4g | 1 + ...ci_sessionnaqfqbtgl7tdufb4o3rdosab2936lf09 | 1 + ...ci_sessionpq87lm7tav83fgrfn8p3lkb1ltbtpkk5 | 1 + ...ci_sessionq4u3u6svoq6lavjn5652k08ppfpckcta | 1 + ...ci_sessionsb1l1pnrmvtv6sl32kaosv8h4rje889e | 1 + ...ci_sessionu34udkaq41iognskel723blhet0a7l17 | 1 + ...ci_sessionuafouapbpij1v1cvu2qmr04njrc1aehp | 1 + ...ci_sessionuq8hf85r3dfg4npd6g60r4fn3b7qm3st | 1 + ...ci_sessionv9e5mqgqeuliu0tg9ian6rvacm8f8omf | 1 + 68 files changed, 118 insertions(+), 565 deletions(-) create mode 100644 public/assets/images/The-Mechanic-Yellow.png create mode 100644 public/assets/images/favicon-2.ico create mode 100644 public/assets/images/logo.png delete mode 100644 writable/debugbar/debugbar_1712296719.950601.json delete mode 100644 writable/debugbar/debugbar_1712296744.129129.json delete mode 100644 writable/debugbar/debugbar_1712296746.319508.json delete mode 100644 writable/debugbar/debugbar_1712296750.561307.json delete mode 100644 writable/debugbar/debugbar_1712296754.194082.json delete mode 100644 writable/debugbar/debugbar_1712296821.477808.json delete mode 100644 writable/debugbar/debugbar_1712296840.221486.json delete mode 100644 writable/debugbar/debugbar_1712296841.686525.json delete mode 100644 writable/debugbar/debugbar_1712296862.677663.json delete mode 100644 writable/debugbar/debugbar_1712296864.206355.json delete mode 100644 writable/debugbar/debugbar_1712296865.933646.json delete mode 100644 writable/debugbar/debugbar_1712296870.810559.json delete mode 100644 writable/debugbar/debugbar_1712297209.962349.json delete mode 100644 writable/debugbar/debugbar_1712297214.623622.json delete mode 100644 writable/debugbar/debugbar_1712297288.203445.json delete mode 100644 writable/debugbar/debugbar_1712297862.584486.json delete mode 100644 writable/debugbar/debugbar_1712297976.342980.json delete mode 100644 writable/debugbar/debugbar_1712297981.289566.json delete mode 100644 writable/debugbar/debugbar_1712298258.999938.json delete mode 100644 writable/debugbar/debugbar_1712298260.639641.json create mode 100644 writable/debugbar/debugbar_1712307910.603378.json create mode 100644 writable/debugbar/debugbar_1712307938.546699.json create mode 100644 writable/debugbar/debugbar_1712307948.421234.json create mode 100644 writable/debugbar/debugbar_1712307997.025116.json create mode 100644 writable/debugbar/debugbar_1712308052.396481.json create mode 100644 writable/debugbar/debugbar_1712308067.796202.json create mode 100644 writable/debugbar/debugbar_1712308144.541404.json create mode 100644 writable/debugbar/debugbar_1712308723.766553.json create mode 100644 writable/debugbar/debugbar_1712309483.390286.json create mode 100644 writable/debugbar/debugbar_1712309487.050672.json create mode 100644 writable/debugbar/debugbar_1712309525.569693.json create mode 100644 writable/debugbar/debugbar_1712309802.943969.json create mode 100644 writable/debugbar/debugbar_1712309828.517860.json create mode 100644 writable/debugbar/debugbar_1712309882.659642.json create mode 100644 writable/debugbar/debugbar_1712309887.690027.json create mode 100644 writable/debugbar/debugbar_1712310026.381417.json create mode 100644 writable/debugbar/debugbar_1712310027.033208.json create mode 100644 writable/debugbar/debugbar_1712310069.345564.json create mode 100644 writable/debugbar/debugbar_1712310115.387073.json create mode 100644 writable/debugbar/debugbar_1712310116.299467.json create mode 100644 writable/session/ci_session2573q24h3a7or3a5s3tt0as5repui0el create mode 100644 writable/session/ci_session3f859v0nus6k39e69dg1m99ojisvj74t create mode 100644 writable/session/ci_session5b5op4fvemsle98bgrdcd40i7o8jiopj create mode 100644 writable/session/ci_sessionbnspmr17nu9h24ll86oljlj6khpn3e3q create mode 100644 writable/session/ci_sessionc99vsrmvrqgjchvou88p9epmrrt6bh79 create mode 100644 writable/session/ci_sessiond4er71c2kdir7v8uscuiuga0l2lehfj5 create mode 100644 writable/session/ci_sessioneom0t8j0q24i1ev8gj05n8qqtrn4963d create mode 100644 writable/session/ci_sessionhhmc3lcdt4jsmbscp8fr04gvcm7cu5ud create mode 100644 writable/session/ci_sessionl5o29hh8ojuol0v9g06so9q610bmre4g create mode 100644 writable/session/ci_sessionnaqfqbtgl7tdufb4o3rdosab2936lf09 create mode 100644 writable/session/ci_sessionpq87lm7tav83fgrfn8p3lkb1ltbtpkk5 create mode 100644 writable/session/ci_sessionq4u3u6svoq6lavjn5652k08ppfpckcta create mode 100644 writable/session/ci_sessionsb1l1pnrmvtv6sl32kaosv8h4rje889e create mode 100644 writable/session/ci_sessionu34udkaq41iognskel723blhet0a7l17 create mode 100644 writable/session/ci_sessionuafouapbpij1v1cvu2qmr04njrc1aehp create mode 100644 writable/session/ci_sessionuq8hf85r3dfg4npd6g60r4fn3b7qm3st create mode 100644 writable/session/ci_sessionv9e5mqgqeuliu0tg9ian6rvacm8f8omf diff --git a/app/Config/App.php b/app/Config/App.php index 0f0c070..743a61c 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -16,7 +16,7 @@ class App extends BaseConfig * * E.g., http://example.com/ */ - public string $baseURL = 'http://localhost/mechanics/public'; + public string $baseURL = 'http://localhost/the_mechanic/public'; /** * Allowed Hostnames in the Site URL other than the hostname in the baseURL. diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php index 2757f37..3c75c7c 100644 --- a/app/Controllers/Login.php +++ b/app/Controllers/Login.php @@ -46,6 +46,7 @@ class Login extends BaseController $this->session->set('logged_user_branch_id',$Data[0]['branch_id']); $this->session->set('logged_user_business_id',$Data[0]['business_id']); $this->session->set('logged_user_role',$Data[0]['roles']); + $this->session->set('logged_user_name',$Data[0]['name']); return redirect()->to('business_index'); diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index 5707dd3..990cbf0 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -43,7 +43,7 @@ class Products extends BaseController } $data['product_id'] = $product_id; - return view('product_form',$data); + echo view('product_form',$data); } diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 2200bfc..e9bf007 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -41,21 +41,21 @@
@@ -64,40 +64,7 @@
- user-img - -

Admin Head

+

get("logged_user_role") ?>

@@ -107,43 +74,27 @@ -
  • - - - 3 - Dashboards - -
    - -
    -
  • -
  • - - - Client - - -
    - -
    -
  • + get('logged_user_role') == 'Floor Manager' || + session()->get('logged_user_role') == 'Job Card Manager' || + session()->get('logged_user_role') == 'Store Manager') { ?> +
  • + + + Client + +
  • + + + get('logged_user_role') == 'Floor Manager' || + session()->get('logged_user_role') == 'Job Card Manager') { ?> +
  • + + + Vehicle + +
  • + +
  • @@ -152,38 +103,33 @@
  • - - - + + get('logged_user_role') == 'Floor Manager' || + session()->get('logged_user_role') == 'Job Card Manager') { ?> +
  • + + + Staff + +
  • + + + + + get('logged_user_role') == 'Administrator') { ?> - -
  • - - - User - -
  • -
  • - - - Business - - - -
  • +
  • Business
  • + @@ -224,9 +170,9 @@