diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index fcb992f9..0449de0f 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -24,7 +24,7 @@ class TransactionResource extends JsonResource return [ 'id' => $this->id, - 'owner' => ($this->owner instanceof Transaction) ? new TransactionResource($this->owner) : '', + 'order' => ($this->owner instanceof Transaction) ? new OrderResource($this->owner->owner) : new OrderResource($this->owner), 'documents' => DocumentResource::collection($this->documents), 'type' => (int) $this->type, 'bill_no' => $this->bill_no, @@ -40,7 +40,7 @@ class TransactionResource extends JsonResource 'currency_rate' => (double) $this->currency_rate, 'status' => (int) $this->status, 'details' => TransactionDetailResource::collection($this->transactionDetails), - 'transactions' => TransactionResource::collection($this->whenLoaded('transactions')), + 'transactions' => TransactionResource::collection($this->transactions), 'payment_attempts' => TransactionResource::collection( $this->transactions() ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION) diff --git a/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue index f9a1df97..baa09799 100644 --- a/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue +++ b/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue @@ -15,7 +15,7 @@