diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index d69e11b5..87b87950 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -136,11 +136,12 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
-                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-            })->orWhere(function($query){
-                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
+//        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
+//                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+//            })->orWhere(function($query){
+//                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+//            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 
         $total_service_charge = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)