diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php index 63eea75b..8b72130a 100644 --- a/app/Http/Resources/OrderResource.php +++ b/app/Http/Resources/OrderResource.php @@ -51,7 +51,6 @@ class OrderResource extends JsonResource ]; }), 'invoices' => $this->whenLoaded('packingLists', function() use ($orderId) { -// return TransactionResource::collection(Transaction::whereHas('owner', function($query) use ($orderId) { return $query->where('owner_id', $orderId); })->get()); return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get()); }), 'remarks' => RemarkResource::collection($this->remarks), diff --git a/app/Http/Resources/OrderV2Resource.php b/app/Http/Resources/OrderV2Resource.php index 6aa1ecb6..c8b82e19 100644 --- a/app/Http/Resources/OrderV2Resource.php +++ b/app/Http/Resources/OrderV2Resource.php @@ -32,8 +32,6 @@ class OrderV2Resource extends JsonResource 'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()), 'invoices' => $this->whenLoaded('packingLists', function() { return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get()); - -// return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get()); }), 'remarks' => RemarkResource::collection($this->remarks), 'created_at' => $this->created_at->format('d-m-Y')