From 4d79571f48be9f4ab99e9ba0c64ca7cafb311e12 Mon Sep 17 00:00:00 2001 From: Edmond Lang Date: Thu, 3 Jul 2025 10:26:24 +0800 Subject: [PATCH] order profile pagination --- app/Http/Resources/OrderV2Resource.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Resources/OrderV2Resource.php b/app/Http/Resources/OrderV2Resource.php index 3fa607c6..77b32661 100644 --- a/app/Http/Resources/OrderV2Resource.php +++ b/app/Http/Resources/OrderV2Resource.php @@ -54,10 +54,10 @@ class OrderV2Resource extends JsonResource 'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()), 'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()), 'invoices' => $invoicePerPage ? - $this->whenLoaded('packingLists', function () { + [] + : $this->whenLoaded('packingLists', function () { return TransactionWithStorageResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get()); - }) - : null, + }), 'storages' => $this->storages ? $this->storages : null, //from middleware 'remarks' => RemarkResource::collection($this->remarks), 'supplier_tax_rebate' => SupplierTaxRebateResource::collection($this->supplierTaxRebate),