From 1e2b039ba88f982ebeee8acedad1ae1f9ad928f5 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 18 Feb 2022 09:53:10 +0800 Subject: [PATCH] fix bill seeder --- app/Http/Resources/BookingResource.php | 6 +----- app/Http/Resources/TransactionResource.php | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index 80199df9..4524fc29 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -57,11 +57,7 @@ class BookingResource extends JsonResource 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '<', Carbon::now())->get()), 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){ $query->where(function($query){ - $query->where(function($query){ - $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]); - })->orWhere(function($query){ - $query->where('type', TransactionType::BILL)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]); - }); + $query->payments(); })->orWhere(function($query){ $query->where(function($query){ $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]); diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 4d4724b8..3ce9f6c7 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -41,14 +41,7 @@ class TransactionResource extends JsonResource 'interval' => [ 'value' => (Carbon::parse($this->created_at)->addDays(3)->gt(Carbon::now()) ) ? '+' : '-' , 'duration' => Carbon::parse($this->created_at)->addDays(3)->diff(Carbon::now())->format('%d'), - ], - new TransactionResource($this->when((int) $this->type === TransactionType::BILL, function(){ - $key = 0; - $bills = $this->booking->transactions()->bills()->where('original_amount', '=', $this->original_amount)->get(); - if(count($bills) > 1){ $key = $bills->search(function($bill){ return $bill->id === $this->id; }); } - return $this->booking->transactions()->payments()->complete()->where('original_amount', '=', $this->original_amount)->skip($key)->first(); - - })) + ] ]; } }