countries selection fixed

This commit is contained in:
Mark Gregory
2026-07-07 15:55:17 +01:00
parent d90c945e83
commit ec27834043
20 changed files with 945 additions and 299 deletions
+1 -1
View File
@@ -10,8 +10,8 @@ use Illuminate\Database\Eloquent\Relations\MorphOne;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
use Modules\Platform\app\Models\LicenseKey;
use Modules\Platform\app\Models\Payment;
use Modules\Countries\Models\Country;
use Modules\Platform\app\Models\Payment;
use Modules\Warehouse\app\Models\Warehouse;
class Company extends Model
+28 -1
View File
@@ -6,13 +6,21 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Modules\Countries\Models\Country;
use Modules\Countries\Models\CountrySubdivision;
class CompanyAddress extends Model
{
protected $guarded = [];
protected $fillable = [
'addressable_type', 'addressable_id', 'label', 'attention', 'line_1', 'line_2', 'line_3',
'locality', 'administrative_area', 'postal_code', 'country_id', 'country_subdivision_id',
'latitude', 'longitude', 'is_primary', 'metadata',
];
protected $casts = [
'is_primary' => 'boolean',
'metadata' => 'array',
'latitude' => 'decimal:7',
'longitude' => 'decimal:7',
];
public function addressable(): MorphTo
@@ -24,4 +32,23 @@ class CompanyAddress extends Model
{
return $this->belongsTo(Country::class);
}
public function subdivision(): BelongsTo
{
return $this->belongsTo(CountrySubdivision::class, 'country_subdivision_id');
}
public function getFormattedAttribute(): string
{
return collect([
$this->attention,
$this->line_1,
$this->line_2,
$this->line_3,
$this->locality,
$this->administrative_area,
$this->postal_code,
$this->country?->effective_name ?? $this->country?->name,
])->filter()->implode(', ');
}
}
@@ -8,20 +8,27 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
class CompanyDirectorAssignment extends Model
{
protected $guarded = [];
protected $fillable = [
'company_id', 'company_division_id', 'user_id', 'coverage_type', 'starts_at', 'ends_at', 'notes',
];
protected $casts = [
'starts_at' => 'date',
'ends_at' => 'date',
];
public function company(): BelongsTo
{
return $this->belongsTo(Company::class);
}
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
public function division(): BelongsTo
{
return $this->belongsTo(CompanyDivision::class, 'company_division_id');
}
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}
+30 -3
View File
@@ -5,13 +5,33 @@ namespace Modules\Company\Models;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphOne;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
use Modules\Warehouse\app\Models\Warehouse;
class CompanyDivision extends Model
{
protected $guarded = [];
use SoftDeletes;
protected $fillable = [
'company_id', 'uuid', 'name', 'code', 'slug', 'status', 'description', 'metadata',
];
protected $casts = [
'metadata' => 'array',
];
protected static function booted(): void
{
static::creating(function (CompanyDivision $division): void {
$division->uuid ??= (string) Str::uuid();
$division->slug ??= Str::slug($division->name);
$division->status ??= 'active';
});
}
public function company(): BelongsTo
{
@@ -23,13 +43,20 @@ class CompanyDivision extends Model
return $this->morphOne(CompanyAddress::class, 'addressable');
}
public function users(): BelongsToMany
{
return $this->belongsToMany(User::class, 'company_division_user')
->withPivot(['company_id', 'role', 'is_director'])
->withTimestamps();
}
public function warehouses(): HasMany
{
return $this->hasMany(Warehouse::class, 'division_id');
}
public function users(): HasMany
public function directorAssignments(): HasMany
{
return $this->hasMany(User::class, 'division_id');
return $this->hasMany(CompanyDirectorAssignment::class, 'company_division_id');
}
}