diff --git a/app/Http/Resources/PackingListWithStorageResource.php b/app/Http/Resources/PackingListWithStorageResource.php index 192baab1..386af053 100644 --- a/app/Http/Resources/PackingListWithStorageResource.php +++ b/app/Http/Resources/PackingListWithStorageResource.php @@ -22,19 +22,18 @@ class PackingListWithStorageResource extends JsonResource public function toArray($request) { $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]); - //$packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages; //cief todo: debugging + $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages; $shippingTransaction = $this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first(); $transactions = $this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get(); $storages = []; - //cief todo: debugging - // if($this->storages){ - // $transactionId = $shippingTransaction->id; - // $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) { - // return isset($storage['parentInvoiceId']) && $storage['parentInvoiceId'] == $transactionId; - // }); - // $storages = $filteredStorages; - // } + if($this->storages){ + $transactionId = $shippingTransaction->id; + $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) { + return isset($storage['parentInvoiceId']) && $storage['parentInvoiceId'] == $transactionId; + }); + $storages = $filteredStorages; + } return [ 'id' => $this->id, @@ -44,7 +43,7 @@ class PackingListWithStorageResource extends JsonResource 'transport' => new TransportResource($this->transports()->first()), 'type' => $this->type, 'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListResource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first())), - 'packages' => [], //PackageResource::collection($packages), //cief todo: debugging + 'packages' => PackageResource::collection($packages), $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]),