From ea35db21643b608514491ea56646d6e191959118 Mon Sep 17 00:00:00 2001 From: aanol Date: Thu, 8 May 2025 13:03:09 +0545 Subject: [PATCH] fixed logo --- .../Http/Controllers/CompanyController.php | 39 +++++++++++-------- crm-panel/app/Models/Company.php | 5 +++ crm-panel/app/Models/Employee.php | 5 +++ .../resources/views/companies/index.blade.php | 2 +- .../resources/views/employees/index.blade.php | 8 +++- 5 files changed, 41 insertions(+), 18 deletions(-) diff --git a/crm-panel/app/Http/Controllers/CompanyController.php b/crm-panel/app/Http/Controllers/CompanyController.php index 8870904..9d18602 100644 --- a/crm-panel/app/Http/Controllers/CompanyController.php +++ b/crm-panel/app/Http/Controllers/CompanyController.php @@ -28,7 +28,7 @@ class CompanyController extends Controller ]); if ($request->hasFile('logo')) { - $path = $request->file('logo')->store('public/logos'); + $filename = $request->file('logo')->store('logos', 'public'); $request->merge(['logo' => $path]); } @@ -48,24 +48,31 @@ class CompanyController extends Controller } public function update(Request $request, Company $company) - { - $request->validate([ - 'name' => 'required', - 'email' => 'nullable|email', - 'logo' => 'nullable|image|dimensions:min_width=100,min_height=100', - 'website' => 'nullable|url', - ]); +{ + $request->validate([ + 'name' => 'required', + 'email' => 'nullable|email', + 'logo' => 'nullable|image|dimensions:min_width=100,min_height=100', + 'website' => 'nullable|url', + ]); - if ($request->hasFile('logo')) { - $path = $request->file('logo')->store('public/logos'); - $company->logo = $path; - } - - $company->update($request->all()); - - return redirect()->route('companies.index')->with('success', 'Company updated successfully.'); + // Handle logo update + if ($request->hasFile('logo')) { + // Store the file in 'public/logos' and get the path + $path = $request->file('logo')->store('logos', 'public'); + $company->logo = $path; } + // Update other fields + $company->name = $request->name; + $company->email = $request->email; + $company->website = $request->website; + + $company->save(); // Save the changes + + return redirect()->route('companies.index')->with('success', 'Company updated successfully.'); +} + public function destroy(Company $company) { $company->delete(); diff --git a/crm-panel/app/Models/Company.php b/crm-panel/app/Models/Company.php index 3fb045c..2b6262f 100644 --- a/crm-panel/app/Models/Company.php +++ b/crm-panel/app/Models/Company.php @@ -16,4 +16,9 @@ class Company extends Model 'logo', 'website', ]; + + public function employees() + { + return $this->hasMany(Employee::class); + } } diff --git a/crm-panel/app/Models/Employee.php b/crm-panel/app/Models/Employee.php index 0526dd9..0e4a46c 100644 --- a/crm-panel/app/Models/Employee.php +++ b/crm-panel/app/Models/Employee.php @@ -17,4 +17,9 @@ class Employee extends Model 'email', 'phone', ]; + public function company() + { + return $this->belongsTo(Company::class); + } + } diff --git a/crm-panel/resources/views/companies/index.blade.php b/crm-panel/resources/views/companies/index.blade.php index 1fcc3f6..95963eb 100644 --- a/crm-panel/resources/views/companies/index.blade.php +++ b/crm-panel/resources/views/companies/index.blade.php @@ -26,7 +26,7 @@ {{ $company->email }} @if($company->logo) - Logo + Logo @else N/A @endif diff --git a/crm-panel/resources/views/employees/index.blade.php b/crm-panel/resources/views/employees/index.blade.php index 1165742..3c36312 100644 --- a/crm-panel/resources/views/employees/index.blade.php +++ b/crm-panel/resources/views/employees/index.blade.php @@ -21,7 +21,13 @@ {{ $employee->first_name }} {{ $employee->last_name }} - {{ $employee->company->name ?? 'N/A' }} + + @if ($employee->company) + {{ $employee->company->name }} + @else + N/A + @endif + {{ $employee->email }} {{ $employee->phone }}