diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php index b05b625f..faae5b43 100644 --- a/app/Http/Resources/GroupResource.php +++ b/app/Http/Resources/GroupResource.php @@ -33,7 +33,7 @@ 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' => $this->transactions()->count(), + 'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'), 'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){ return $query->whereHas('booking', function($query){ return $query->whereHas('transactions', function($query){ diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue index badeb3fa..7150f9a0 100644 --- a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue +++ b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue @@ -61,7 +61,7 @@ -

{{item.complete_transactions}}/{{item.transactions}}

+

{{item.complete_transactions.length}}/{{item.transactions.length}}

@@ -109,6 +109,17 @@ +
+
+ +
+