diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php index d27b2708..fa809cee 100644 --- a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php +++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php @@ -12,11 +12,8 @@ class CalculatesBookingTransferredAmount { public function execute(Booking $booking, int $type){ - $rate = $booking->transactions()->payments()->avg('currency_rate'); - dd($booking->transactions()->bills()->transferred()->sum('original_amount') * (1/$rate)); return $type === 1 ? - $booking->transactions()->bills()->transferred() - ->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') : + $booking->transactions()->bills()->transferred()->sum('original_amount') * (1/$booking->transactions()->payments()->avg('currency_rate')) : $booking->transactions()->bills()->transferred()->sum('original_amount'); }