interim fix for drop downs, BROKEN FIX

Modules/Company/Http/Controllers/CompanyController.php

@@ -18,11 +18,11 @@ class CompanyController extends Controller
     {
         return view('company::index', [
             'companies' => Company::query()
-                ->with(['address.country'])
+                ->with(['address.country', 'country'])
                 ->withCount(['users', 'warehouses', 'licenseKeys', 'divisions'])
                 ->latest('id')
                 ->paginate(20),
-            'countries' => $this->countriesForSelect(),
+            'countries' => $this->countries(),
         ]);
     }
 
@@ -36,7 +36,7 @@ class CompanyController extends Controller
                 'status' => 'active',
                 'timezone' => 'Europe/London',
             ]),
-            'countries' => $this->countriesForSelect(),
+            'countries' => $this->countries(),
         ]);
     }
 
@@ -45,10 +45,7 @@ class CompanyController extends Controller
      */
     public function store(Request $request)
     {
-        $validated = $this->validated($request);
-
-        $company = Company::create($validated['company']);
-        $this->syncAddressCountry($company, $validated['country_id']);
+        $company = Company::create($this->validated($request));
 
         return redirect()
             ->route('platform.companies.index')
@@ -76,7 +73,7 @@ class CompanyController extends Controller
             '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' => $this->countriesForSelect(),
+            '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(),
         ]);
@@ -88,8 +85,8 @@ class CompanyController extends Controller
     public function edit(Company $company)
     {
         return view('company::edit', [
-            'company' => $company->loadMissing('address.country'),
-            'countries' => $this->countriesForSelect(),
+            'company' => $company->loadMissing(['address.country', 'country']),
+            'countries' => $this->countries(),
         ]);
     }
 
@@ -98,10 +95,7 @@ class CompanyController extends Controller
      */
     public function update(Request $request, Company $company)
     {
-        $validated = $this->validated($request, $company);
-
-        $company->update($validated['company']);
-        $this->syncAddressCountry($company, $validated['country_id']);
+        $company->update($this->validated($request, $company));
 
         return redirect()
             ->route('platform.companies.show', $company)
@@ -128,44 +122,20 @@ class CompanyController extends Controller
             'name' => ['required', 'string', 'max:255'],
             'billing_email' => ['nullable', 'email', 'max:255'],
             'status' => ['required', Rule::in(['active', 'suspended', 'inactive'])],
-            'country_id' => ['nullable', 'integer', Rule::exists('countries', 'id')],
+            'country_id' => ['nullable', Rule::exists('countries', 'id')->where('is_active', true)],
         ]);
 
-        return [
-            'company' => [
-                'name' => $data['name'],
-                'billing_email' => $data['billing_email'] ?? null,
-                'status' => $data['status'],
-                'slug' => Str::slug($data['name']),
-                'timezone' => $company?->timezone ?: 'Europe/London',
-            ],
-            'country_id' => $data['country_id'] ?? null,
-        ];
+        $data['slug'] = Str::slug($data['name']);
+        $data['timezone'] = $company?->timezone ?: 'Europe/London';
+
+        return $data;
     }
 
-    private function countriesForSelect()
+    private function countries()
     {
         return Country::query()
             ->active()
-            ->orderByRaw("LOWER(COALESCE(NULLIF(display_name, ''), NULLIF(common_name, ''), name)) ASC")
-            ->get(['id', 'alpha2', 'name', 'display_name', 'common_name']);
-    }
-
-    private function syncAddressCountry(Company $company, ?int $countryId): void
-    {
-        if ($countryId === null) {
-            $company->address()?->delete();
-
-            return;
-        }
-
-        $company->address()->updateOrCreate(
-            [],
-            [
-                'country_id' => $countryId,
-                'label' => 'Registered address',
-                'is_primary' => true,
-            ]
-        );
+            ->ordered()
+            ->get(['id', 'alpha2', 'name', 'display_name', 'common_name', 'sort_order']);
     }
 }