From 9dce1ee9d3f879fc862d39b58dc86dfb3867c253 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 30 Sep 2022 13:43:58 +0800 Subject: [PATCH] fix proforma invoice currency rate --- .../CreateProformaInvoiceTransactionProcessor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php index 6b68bc53..21902f9c 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php @@ -135,11 +135,11 @@ class CreateProformaInvoiceTransactionProcessor $transaction = $booking->transactions() ->where('type', TransactionType::PAYMENT) ->first(); -dd($booking->transactions()->payments()->where(function($query){ - $query->where(function($query){ +dd($booking->transactions()->payments() + ->where(function($query){ $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now()); - }); -})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total')); + })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total')); + $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){ return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get(); })->orWhere(function($query){