From 51eb0d54be8f0687d2376f5c07fe474e278655b7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Feb 2022 01:15:53 +0800 Subject: [PATCH] fix bill seeder --- .../Bookings/Services/CalculatesBookingTransferredAmount.php | 4 +++- .../Processors/CreateInvoiceTransactionProcessor.php | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php index 57a5525c..fc355d64 100644 --- a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php +++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php @@ -12,7 +12,9 @@ class CalculatesBookingTransferredAmount { public function execute(Booking $booking){ - return $booking->transactions()->bills()->complete()->sum('original_amount'); + return $booking->transactions()->payments()->complete()->whereHas('transactions', function($query){ + return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]); + })->sum('original_amount'); } } \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index fc481c92..bb022317 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -109,7 +109,6 @@ class CreateInvoiceTransactionProcessor } $payable_amount = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id); - dd($payable_amount); $booking_amount = $booking->fix_amount; // confirm that booking amount has been fully paid