mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interim fix for drop downs, BROKEN FIX, interinm fix

Browse Source
This commit is contained in:
Mark Gregory
2026-07-07 12:20:27 +01:00
parent d2c1f744c3
commit a12372963a
6 changed files with 132 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Company/Http/Controllers/CompanyController.php
+4 -4
View File
@@ -20,7 +20,7 @@ class CompanyController extends Controller
'companies' => Company::query()
->with(['address.country', 'country'])
->withCount(['users', 'warehouses', 'licenseKeys', 'divisions'])
->latest('id')
->orderBy('name')
->paginate(20),
'countries' => $this->countries(),
]);
@@ -73,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' => Country::query()->active()->orderBy('sort_order')->orderBy('name')->get(['id', 'alpha2', 'name', 'display_name', 'common_name']),
'countries' => $this->countries(),
'companyUsers' => $company->users()->orderBy('name')->get(['id', 'name', 'email', 'company_id']),
'unassignedWarehouses' => $company->warehouses()->whereNull('division_id')->orderBy('name')->get(),
]);
@@ -135,7 +135,7 @@ class CompanyController extends Controller
{
return Country::query()
->active()
->ordered()
->get(['id', 'alpha2', 'name', 'display_name', 'common_name', 'sort_order']);
->orderByRaw("LOWER(COALESCE(NULLIF(display_name, ''), NULLIF(common_name, ''), name)) ASC")
->get(['id', 'alpha2', 'name', 'display_name', 'common_name']);
}
}