From 85c9853b156bef4e22d0c78abda8ef851894e05d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 00:52:05 +0800 Subject: [PATCH 1/9] fix bill seeder --- app/Http/Resources/BookingResource.php | 2 +- app/Http/Resources/TransactionResource.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index 4524fc29..9eee712c 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -57,7 +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->payments(); + $query->payments()->where('status', '!=', ApprovalStatus::PENDING_SUBMISSION); })->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 c92fe411..5d7059d1 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -23,7 +23,7 @@ class TransactionResource extends JsonResource 'bill_no' => $this->bill_no, 'payment_reference' => $this->payment_reference, 'payment_method' => (float) $this->payment_method, - 'recipient_bank_account' => new BankResource($this->when((int) $this->type === TransactionType::BILL, $this->booking->bank)), + 'recipient_bank_account' => new BankResource($this->recipientBankAccount), 'issuer_name' => $this->issuerCompany->name, 'amount' => (double) $this->amount, 'original_amount' => (double) $this->original_amount, @@ -35,7 +35,6 @@ class TransactionResource extends JsonResource 'status' => (int) $this->status, 'details' => TransactionDetailResource::collection($this->transactionDetails), 'documents' => new DocumentResource($this->documents()->first()), -// 'transaction_payment' => new TransactionResource($this->when((int) $this->type === TransactionType::BILL, $this->owner)), 'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT, $this->transactions()->first())), 'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'), 'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'), From 97fb9397911ad1c7d26430a023f6ddd6975d0585 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 00:54:20 +0800 Subject: [PATCH 2/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 5d7059d1..1879cce1 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -18,7 +18,7 @@ class TransactionResource extends JsonResource { return [ 'id' => $this->id, - 'booking' => new BookingResource($this->booking), + 'booking' => new BookingResource($this->type === TransactionType::BILL ? $this->owner->booking : $this->booking), 'type' => (int) $this->type, 'bill_no' => $this->bill_no, 'payment_reference' => $this->payment_reference, From 91a6aabd1af4c66b82e54b7e96a4e2acc074678a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 00:55:14 +0800 Subject: [PATCH 3/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 1879cce1..6b00f063 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -18,7 +18,7 @@ class TransactionResource extends JsonResource { return [ 'id' => $this->id, - 'booking' => new BookingResource($this->type === TransactionType::BILL ? $this->owner->booking : $this->booking), + 'booking' => new BookingResource($this->type === TransactionType::BILL ? $this->owner->owner : $this->booking), 'type' => (int) $this->type, 'bill_no' => $this->bill_no, 'payment_reference' => $this->payment_reference, From 53ec4b1174546d15838afd8f1649b96ac91893de Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:00:08 +0800 Subject: [PATCH 4/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 6b00f063..19f8f434 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -16,14 +16,16 @@ class TransactionResource extends JsonResource */ public function toArray($request) { + $booking = $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; + return [ 'id' => $this->id, - 'booking' => new BookingResource($this->type === TransactionType::BILL ? $this->owner->owner : $this->booking), + 'booking' => new BookingResource($booking), 'type' => (int) $this->type, 'bill_no' => $this->bill_no, 'payment_reference' => $this->payment_reference, 'payment_method' => (float) $this->payment_method, - 'recipient_bank_account' => new BankResource($this->recipientBankAccount), + 'recipient_bank_account' => new BankResource($booking->bank), 'issuer_name' => $this->issuerCompany->name, 'amount' => (double) $this->amount, 'original_amount' => (double) $this->original_amount, From 7b590eba2334734e1bd65888af31a121452c75ab Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:02:00 +0800 Subject: [PATCH 5/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 19f8f434..c5c52f1b 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -17,7 +17,9 @@ class TransactionResource extends JsonResource public function toArray($request) { $booking = $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; - + if(!$booking){ + dd($this->id); + } return [ 'id' => $this->id, 'booking' => new BookingResource($booking), From 13a2aa8ec2ed3cb84dd0514b7d61776f38f1fdb0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:04:02 +0800 Subject: [PATCH 6/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index c5c52f1b..116ef8ba 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -18,7 +18,7 @@ class TransactionResource extends JsonResource { $booking = $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; if(!$booking){ - dd($this->id); + dd($this->owner); } return [ 'id' => $this->id, From 43f63cf24c46e5f6e64c0d04f4f2a68433999e84 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:04:40 +0800 Subject: [PATCH 7/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 116ef8ba..c08f11c7 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -18,6 +18,7 @@ class TransactionResource extends JsonResource { $booking = $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; if(!$booking){ + dd($this->type); dd($this->owner); } return [ From aa97a990ebbd8e0cab2ca401cbb0b1b510f8d283 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:05:23 +0800 Subject: [PATCH 8/9] fix bill seeder --- app/Http/Resources/TransactionResource.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index c08f11c7..909fd6c3 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -16,11 +16,8 @@ class TransactionResource extends JsonResource */ public function toArray($request) { - $booking = $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; - if(!$booking){ - dd($this->type); - dd($this->owner); - } + $booking = (int) $this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; + return [ 'id' => $this->id, 'booking' => new BookingResource($booking), From 1c13b2e40baa8ec308ed26f6241d24b5f0256e39 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:07:29 +0800 Subject: [PATCH 9/9] fix bill seeder --- .../vue/components/bookings/elements/PaymentProofComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue index f1cd5988..97480ac0 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue @@ -41,7 +41,7 @@ -
+
Cancel this order?