From 4c1c8db0e438e85be92b765a1888676654aeda6d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 22 Feb 2022 01:20:36 +0800
Subject: [PATCH] fix bill seeder

---
 .../Services/CalculatesBookingCurrencyAverageRate.php  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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');
+                });
         }
     }