diff --git a/app/Http/Resources/PackingListWithStorageResource.php b/app/Http/Resources/PackingListWithStorageResource.php index ccc22e98..192baab1 100644 --- a/app/Http/Resources/PackingListWithStorageResource.php +++ b/app/Http/Resources/PackingListWithStorageResource.php @@ -22,7 +22,7 @@ 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; + //$packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages; //cief todo: debugging $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 = []; @@ -44,7 +44,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), + 'packages' => [], //PackageResource::collection($packages), //cief todo: debugging $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]), diff --git a/vapor.yml b/vapor.yml index 2a52ee52..2002fd43 100644 --- a/vapor.yml +++ b/vapor.yml @@ -47,7 +47,7 @@ environments: - shipping-portal-high_priority-development # gateway-version: 2 database: cief-rds-mysql - storage: shipping-portal-production + storage: shipping-portal-development runtime: 'docker' timeout: 180 build: