added complex address and devisions to company

2026-07-03 10:12:04 +01:00
parent 6be15611eb
commit 0e067a15f3
25 changed files with 972 additions and 134 deletions
@@ -0,0 +1,61 @@
+<?php
+
+namespace Modules\Company\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use Modules\Company\Models\Company;
+use Modules\Company\Models\CompanyDivision;
+use Modules\Warehouse\app\Models\Warehouse;
+
+class CompanyAddressController extends Controller
+{
+    public function updateCompany(Request $request, Company $company)
+    {
+        $this->upsertAddress($request, $company);
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Company address updated.');
+    }
+
+    public function updateDivision(Request $request, Company $company, CompanyDivision $division)
+    {
+        abort_unless($division->company_id === $company->id, 404);
+
+        $this->upsertAddress($request, $division, 'Operating address');
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Division address updated.');
+    }
+
+    public function updateWarehouse(Request $request, Company $company, Warehouse $warehouse)
+    {
+        abort_unless($warehouse->company_id === $company->id, 404);
+
+        $this->upsertAddress($request, $warehouse, 'Warehouse address');
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Warehouse address updated.');
+    }
+
+    private function upsertAddress(Request $request, object $owner, string $defaultLabel = 'Registered office'): void
+    {
+        $data = $request->validate([
+            'label' => ['nullable', 'string', 'max:80'],
+            'attention' => ['nullable', 'string', 'max:255'],
+            'line_1' => ['required', 'string', 'max:255'],
+            'line_2' => ['nullable', 'string', 'max:255'],
+            'line_3' => ['nullable', 'string', 'max:255'],
+            'locality' => ['required', 'string', 'max:255'],
+            'administrative_area' => ['nullable', 'string', 'max:255'],
+            'postal_code' => ['nullable', 'string', 'max:32'],
+            'country_id' => ['required', Rule::exists('countries', 'id')->where('is_active', true)],
+            'country_subdivision_id' => ['nullable', 'exists:country_subdivisions,id'],
+            'latitude' => ['nullable', 'numeric', 'between:-90,90'],
+            'longitude' => ['nullable', 'numeric', 'between:-180,180'],
+        ]);
+
+        $data['label'] = $data['label'] ?: $defaultLabel;
+        $data['is_primary'] = true;
+
+        $owner->address()->updateOrCreate([], $data);
+    }
+}
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use Modules\Company\Models\Company;
+use Modules\Countries\Models\Country;

 class CompanyController extends Controller
 {
@@ -17,7 +18,8 @@ class CompanyController extends Controller
    {
        return view('company::index', [
            'companies' => Company::query()
-                ->withCount(['users', 'warehouses', 'licenseKeys'])
+                ->with(['address.country'])
+                ->withCount(['users', 'warehouses', 'licenseKeys', 'divisions'])
                ->latest('id')
                ->paginate(20),
        ]);
@@ -53,13 +55,25 @@ class CompanyController extends Controller
     */
    public function show(Company $company)
    {
-        $company->loadCount(['users', 'warehouses', 'licenseKeys', 'payments']);
+        $company->load([
+            'address.country',
+            'divisions.address.country',
+            'divisions.warehouses',
+            'divisions.users',
+            'warehouses.address.country',
+            'warehouses.division',
+            'directorAssignments.user',
+            'directorAssignments.division',
+        ])->loadCount(['users', 'warehouses', 'licenseKeys', 'payments', 'divisions']);

        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(),
+            'countries' => Country::query()->active()->orderBy('sort_order')->orderBy('name')->get(['id', 'alpha2', 'name', 'display_name', 'common_name']),
+            'companyUsers' => $company->users()->orderBy('name')->get(['id', 'name', 'email', 'company_id']),
+            'unassignedWarehouses' => $company->warehouses()->whereNull('division_id')->orderBy('name')->get(),
        ]);
    }

@@ -0,0 +1,54 @@
+<?php
+
+namespace Modules\Company\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use Modules\Company\Models\Company;
+use Modules\Company\Models\CompanyDivision;
+
+class CompanyDivisionController extends Controller
+{
+    public function store(Request $request, Company $company)
+    {
+        $division = $company->divisions()->create($this->validated($request, $company));
+
+        return redirect()->route('platform.companies.show', $company)->with('status', "Division {$division->name} created.");
+    }
+
+    public function update(Request $request, Company $company, CompanyDivision $division)
+    {
+        abort_unless($division->company_id === $company->id, 404);
+
+        $division->update($this->validated($request, $company, $division));
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Division updated.');
+    }
+
+    public function destroy(Company $company, CompanyDivision $division)
+    {
+        abort_unless($division->company_id === $company->id, 404);
+
+        abort_if($division->warehouses()->exists(), 422, 'Move warehouses before deleting this division.');
+
+        $division->delete();
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Division deleted.');
+    }
+
+    private function validated(Request $request, Company $company, ?CompanyDivision $division = null): array
+    {
+        $data = $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'code' => ['nullable', 'string', 'max:40', Rule::unique('company_divisions', 'code')->where('company_id', $company->id)->ignore($division?->id)],
+            'status' => ['required', Rule::in(['active', 'suspended', 'inactive'])],
+            'description' => ['nullable', 'string', 'max:2000'],
+        ]);
+
+        $data['slug'] = Str::slug($data['name']);
+
+        return $data;
+    }
+}
@@ -0,0 +1,83 @@
+<?php
+
+namespace Modules\Company\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use Modules\Company\Models\Company;
+use Modules\Company\Models\CompanyDivision;
+use Modules\Company\Models\CompanyDirectorAssignment;
+
+class CompanyMembershipController extends Controller
+{
+    public function assignDivision(Request $request, Company $company)
+    {
+        $data = $request->validate([
+            'user_id' => ['required', Rule::exists('users', 'id')->where('company_id', $company->id)],
+            'company_division_id' => ['required', Rule::exists('company_divisions', 'id')->where('company_id', $company->id)],
+            'role' => ['nullable', 'string', 'max:80'],
+            'is_director' => ['nullable', 'boolean'],
+        ]);
+
+        $division = CompanyDivision::where('company_id', $company->id)->findOrFail($data['company_division_id']);
+        $division->users()->syncWithoutDetaching([
+            $data['user_id'] => [
+                'company_id' => $company->id,
+                'role' => $data['role'] ?? 'member',
+                'is_director' => (bool) ($data['is_director'] ?? false),
+            ],
+        ]);
+
+        if ((bool) ($data['is_director'] ?? false)) {
+            CompanyDirectorAssignment::updateOrCreate([
+                'company_id' => $company->id,
+                'company_division_id' => $division->id,
+                'user_id' => $data['user_id'],
+            ], ['coverage_type' => 'division']);
+        }
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Division membership updated.');
+    }
+
+    public function assignDirector(Request $request, Company $company)
+    {
+        $data = $request->validate([
+            'user_id' => ['required', Rule::exists('users', 'id')->where('company_id', $company->id)],
+            'coverage_type' => ['required', Rule::in(['company', 'division'])],
+            'company_division_id' => ['nullable', Rule::exists('company_divisions', 'id')->where('company_id', $company->id)],
+            'starts_at' => ['nullable', 'date'],
+            'ends_at' => ['nullable', 'date', 'after_or_equal:starts_at'],
+            'notes' => ['nullable', 'string', 'max:2000'],
+        ]);
+
+        if ($data['coverage_type'] === 'company') {
+            $data['company_division_id'] = null;
+        } else {
+            abort_if(empty($data['company_division_id']), 422, 'Division coverage requires a division.');
+        }
+
+        CompanyDirectorAssignment::updateOrCreate([
+            'company_id' => $company->id,
+            'company_division_id' => $data['company_division_id'],
+            'user_id' => $data['user_id'],
+        ], [
+            'coverage_type' => $data['coverage_type'],
+            'starts_at' => $data['starts_at'] ?? null,
+            'ends_at' => $data['ends_at'] ?? null,
+            'notes' => $data['notes'] ?? null,
+        ]);
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Director coverage updated.');
+    }
+
+    public function removeDirector(Company $company, CompanyDirectorAssignment $assignment)
+    {
+        abort_unless($assignment->company_id === $company->id, 404);
+
+        $assignment->delete();
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Director coverage removed.');
+    }
+}
@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Company\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use Modules\Company\Models\Company;
+use Modules\Warehouse\app\Models\Warehouse;
+
+class CompanyWarehouseAssignmentController extends Controller
+{
+    public function update(Request $request, Company $company, Warehouse $warehouse)
+    {
+        abort_unless($warehouse->company_id === $company->id, 404);
+
+        $data = $request->validate([
+            'division_id' => ['nullable', Rule::exists('company_divisions', 'id')->where('company_id', $company->id)],
+        ]);
+
+        $warehouse->update(['division_id' => $data['division_id'] ?? null]);
+
+        return redirect()->route('platform.companies.show', $company)->with('status', 'Warehouse division assignment updated.');
+    }
+}