diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php index ea7405c4..9f07675d 100644 --- a/app/Http/Resources/GroupResource.php +++ b/app/Http/Resources/GroupResource.php @@ -17,6 +17,11 @@ class GroupResource extends JsonResource */ public function toArray($request) { + $transactions = $this->transactions()->get(); + $complete_transactions = []; + foreach($transactions as $transaction){ + $complete_transactions[] = $transaction->owner()->owner()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED)->get(); + } return [ 'id' => $this->id, 'original_amount' => (float) $this->original_amount, @@ -25,8 +30,8 @@ class GroupResource extends JsonResource 'currency' => new CurrencyResource($this->currency), 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), 'currency_rate' => (float) $this->currency_rate, - 'transactions' => TransactionResource::collection($this->transactions()->get()), - 'complete_transactions' => TransactionResource::collection($this->transactions()->owner()->owner()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', ApprovalStatus::APPROVED)->get()), + 'transactions' => TransactionResource::collection($transactions), + 'complete_transactions' => TransactionResource::collection($complete_transactions), ]; } }