diff --git a/Modules/Company/Http/Controllers/CompanyController.php b/Modules/Company/Http/Controllers/CompanyController.php index dcb586a8..36911dc6 100644 --- a/Modules/Company/Http/Controllers/CompanyController.php +++ b/Modules/Company/Http/Controllers/CompanyController.php @@ -16,48 +16,56 @@ class CompanyController extends Controller public function index() { return view('company::index', [ - 'companies' => Company::withCount(['users', 'warehouses', 'licenseKeys'])->latest('id')->paginate(20), + 'companies' => Company::query() + ->withCount(['users', 'warehouses', 'licenseKeys']) + ->latest('id') + ->paginate(20), ]); } /** - * Create a company tenant. + * Show the create company screen. + */ + public function create() + { + return view('company::create', [ + 'company' => new Company([ + 'status' => 'active', + 'timezone' => 'Europe/London', + ]), + ]); + } + + /** + * Store a company tenant. */ public function store(Request $request) { - $data = $request->validate([ - 'name' => ['required', 'string', 'max:255'], - 'billing_email' => ['nullable', 'email', 'max:255'], - 'status' => ['required', 'in:active,suspended'], - ]); - - Company::create([ - ...$data, - 'slug' => Str::slug($data['name']), - 'timezone' => 'Europe/London', - ]); - - return back()->with('status', 'Company created.'); - } - - public function create() - { - - return view('company::create', [ - - 'company' => new Company, - - ]); + $company = Company::create($this->validated($request)); + return redirect() + ->route('platform.companies.show', $company) + ->with('status', 'Company created.'); } + /** + * Display a company workbench. + */ public function show(Company $company) { + $company->loadCount(['users', 'warehouses', 'licenseKeys', 'payments']); + return view('company::show', [ 'company' => $company, + 'recentUsers' => $company->users()->latest('id')->limit(5)->get(), + 'recentWarehouses' => $company->warehouses()->latest('id')->limit(5)->get(), + 'recentLicenseKeys' => $company->licenseKeys()->latest('id')->limit(5)->get(), ]); } + /** + * Show the edit company screen. + */ public function edit(Company $company) { return view('company::edit', [ @@ -65,6 +73,9 @@ class CompanyController extends Controller ]); } + /** + * Update a company tenant. + */ public function update(Request $request, Company $company) { $company->update($this->validated($request, $company)); @@ -74,8 +85,13 @@ class CompanyController extends Controller ->with('status', 'Company updated.'); } + /** + * Delete a company tenant. + */ public function destroy(Company $company) { + abort_if($company->is_system_company, 403, 'The system company cannot be deleted.'); + $company->delete(); return redirect() @@ -85,10 +101,16 @@ class CompanyController extends Controller private function validated(Request $request, ?Company $company = null): array { - return $request->validate([ + $data = $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'billing_email' => ['required', 'email', 'max:255'], - 'status' => ['required', Rule::in(['active', 'inactive'])], + 'billing_email' => ['nullable', 'email', 'max:255'], + 'status' => ['required', Rule::in(['active', 'suspended', 'inactive'])], + 'timezone' => ['nullable', 'string', 'max:64'], ]); + + $data['slug'] = Str::slug($data['name']); + $data['timezone'] = $data['timezone'] ?: ($company?->timezone ?: 'Europe/London'); + + return $data; } } diff --git a/Modules/Company/Resources/views/_form.blade.php b/Modules/Company/Resources/views/_form.blade.php index cf989ca7..5ddfb4b0 100644 --- a/Modules/Company/Resources/views/_form.blade.php +++ b/Modules/Company/Resources/views/_form.blade.php @@ -1,47 +1,75 @@ -{{-- Modules/Company/resources/views/companies/_form.blade.php --}} - @csrf -
+
- + - @error('name')

{{ $message }}

@enderror + @error('name') +

{{ $message }}

+ @enderror
- + - @error('billing_email')

{{ $message }}

@enderror + @error('billing_email') +

{{ $message }}

+ @enderror
- - + - @error('status')

{{ $message }}

@enderror + @error('status') +

{{ $message }}

+ @enderror
-
- - - - Cancel - +
+ + + @error('timezone') +

{{ $message }}

+ @enderror
+ +
+ + + + Cancel + +
diff --git a/Modules/Company/Resources/views/create.blade.php b/Modules/Company/Resources/views/create.blade.php index 1f6e641e..a9274e88 100644 --- a/Modules/Company/Resources/views/create.blade.php +++ b/Modules/Company/Resources/views/create.blade.php @@ -1,9 +1,16 @@ -{{-- Modules/Company/resources/views/companies/create.blade.php --}} - - +
+ -
- @include('company::companies._form') -
+
+
+ @include('company::_form') +
+
+
diff --git a/Modules/Company/Resources/views/edit.blade.php b/Modules/Company/Resources/views/edit.blade.php index 42ec6a62..1fd4ea26 100644 --- a/Modules/Company/Resources/views/edit.blade.php +++ b/Modules/Company/Resources/views/edit.blade.php @@ -3,12 +3,12 @@
-
+ @method('PUT') @include('company::_form')
diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php index 54a1fb18..7feb94e2 100644 --- a/Modules/Company/Resources/views/show.blade.php +++ b/Modules/Company/Resources/views/show.blade.php @@ -1,51 +1,143 @@
-
-
-
-
Billing email
-
{{ $company->billing_email ?? '—' }}
-
+
+
+

Users

+

{{ $company->users_count }}

+
-
-
Status
-
+
+

Warehouses

+

{{ $company->warehouses_count }}

+
+ +
+

Licences

+

{{ $company->license_keys_count }}

+
+ +
+

Payments

+

{{ $company->payments_count }}

+
+
+ +
+
+
+
+

Company profile

+

Core tenant identity and operational status.

+
+ + {{ $company->is_system_company ? 'System' : ucfirst($company->status) }} - +
-
-
Timezone
-
{{ $company->timezone }}
+
+
+
Billing email
+
{{ $company->billing_email ?? '—' }}
+
+ +
+
Timezone
+
{{ $company->timezone }}
+
+ +
+
Slug
+
{{ $company->slug }}
+
+ +
+
Created
+
{{ $company->created_at?->format('d M Y') }}
+
+
+
+ +
+

Quick actions

+
+ + Edit company + + + + Back to companies + + + @unless ($company->is_system_company) +
+ @csrf + @method('DELETE') + +
+ @endunless
+
+
-
-
Slug
-
{{ $company->slug }}
+
+
+

Recent users

+
+ @forelse ($recentUsers as $user) +
+

{{ $user->name }}

+

{{ $user->email }}

+
+ @empty +

No users found.

+ @endforelse
-
+
-
- - Edit - +
+

Recent warehouses

+
+ @forelse ($recentWarehouses as $warehouse) +
+

{{ $warehouse->name }}

+

{{ $warehouse->code ?? '—' }}

+
+ @empty +

No warehouses found.

+ @endforelse +
+
- - Back - +
+

Recent licences

+
+ @forelse ($recentLicenseKeys as $license) +
+

{{ ucfirst($license->plan ?? 'Licence') }}

+

{{ ucfirst($license->status ?? 'unknown') }}

+
+ @empty +

No licences found.

+ @endforelse +
diff --git a/Modules/Company/changelog.yaml b/Modules/Company/changelog.yaml index e69de29b..070ca780 100644 --- a/Modules/Company/changelog.yaml +++ b/Modules/Company/changelog.yaml @@ -0,0 +1,14 @@ +latest: 1.1.0 + +versions: + - version: 1.1.0 + date: 2026-07-02 + changes: + - Added full company create, show, edit, update and delete workflow. + - Added company workbench show page with profile, KPI cards, recent users, warehouses and licences. + - Added guarded deletion so the system company cannot be deleted. + - Standardised Company module views on x-layouts::app and company::_form includes. + - version: 1.0.0 + date: 2026-07-02 + changes: + - Initial Company module skeleton. diff --git a/Modules/Company/module.json b/Modules/Company/module.json index 503c66e5..b11a0fb5 100644 --- a/Modules/Company/module.json +++ b/Modules/Company/module.json @@ -1,7 +1,7 @@ { "name": "Company", "alias": "company", - "version": "1.0.0", + "version": "1.1.0", "description": "", "keywords": [], "priority": 0, diff --git a/Modules/Helpdesk/Tests/Feature/TicketConversationTest.php b/Modules/Helpdesk/Tests/Feature/TicketConversationTest.php index 872890f0..988ccbb2 100644 --- a/Modules/Helpdesk/Tests/Feature/TicketConversationTest.php +++ b/Modules/Helpdesk/Tests/Feature/TicketConversationTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Modules\Helpdesk\Tests\Feature; -use Modules\Company\Models\Company +use Modules\Company\Models\Company; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Mail;