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 @@ @@ -107,43 +74,27 @@