diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php index 0403042c..36824d9f 100644 --- a/app/Http/Resources/PackingListResource.php +++ b/app/Http/Resources/PackingListResource.php @@ -16,9 +16,8 @@ class PackingListResource extends JsonResource */ public function toArray($request) { - $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]); - $packages = $this->packingLists()->exists() || $exceptionUsers ? $this->originalPackages : $this->replicatedPackages; + $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists()->first()->packages; return [ 'id' => $this->id, diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php index 4710d006..1e00ccfc 100644 --- a/app/Models/PackingList.php +++ b/app/Models/PackingList.php @@ -53,18 +53,11 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac /** * @return HasMany */ - public function originalPackages(): hasMany + public function packages(): hasMany { return $this->hasMany(Package::class, 'packing_list_id'); } - /** - * @return HasManyDeep - */ - public function replicatedPackages(): HasManyDeep - { - return $this->hasManyDeep(Package::class, [PackingList::class, PackingList::class.' as alias'], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']); - } /** * @return morphMany @@ -135,19 +128,4 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac }); } - /** - * @param $query - * @return mixed - */ - public function scopePackages($query){ - - $exceptionUsers = !in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]); - - return $query->when($query->has('packingLists') && !$exceptionUsers, function($query){ - return $query->replicatedPackages; - })->when($query->doesntHave('packingLists') || $exceptionUsers, function($query){ - return $query->originalPackages; - }); - - } }