diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php index 2a6de8d2..8decedcb 100644 --- a/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php +++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php @@ -31,7 +31,15 @@ class CalculatesBookingCurrencyAverageRate } else if ($type == TransactionType::BILL) { - return $booking->transactions()->bills()->complete()->sum('original_amount') / $booking->transactions()->bills()->complete()->sum('amount'); + return $booking->transactions()->payments()->complete()->whereHas('transactions', function($query){ + return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]); + })->sum(function($query){ + return $query->transactions()->sum('original_amount'); + }) / $booking->transactions()->payments()->complete()->whereHas('transactions', function($query){ + return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]); + })->sum(function($query){ + return $query->transactions()->sum('amount'); + }); } }