bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Enable merging address in a domain that has flatten set

Browse Source
This commit is contained in:
Deon George
2023-09-11 22:57:29 +10:00
parent ab7f661800
commit e553bb4ce6
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/AddressMerge.php
View File

@@ -42,7 +42,11 @@ class AddressMerge extends FormRequest
$dst = Address::withTrashed()->findOrFail($value);
$src = Address::withTrashed()->findOrFail($request->src);
if ($src->ftn !== $dst->ftn)
if ($src->zone->domain->flatten && $dst->zone->domain->flatten) {
if ((! $src->zone->domain->zones->pluck('id')->contains($dst->zone_id)) || (! $dst->zone->domain->zones->pluck('id')->contains($src->zone_id)))
$fail('Source must be Destination\'s domain zone');
} elseif ($src->ftn !== $dst->ftn)
$fail('Source and Destination must be the same FTN');
},
],