cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-23 06:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update replica packages logic and over weight price announcement

Browse Source
This commit is contained in:
omair saleh
2022-01-21 14:39:46 +08:00
parent e6eb05739c
commit d0a873e065
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/PackingListResource.php
+1 -2
View File
@@ -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,
app/Models/PackingList.php
+1 -23
View File
@@ -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;
});
}
}