cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 05:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vapor/production' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development

Browse Source
This commit is contained in:
Edmond Lang
2025-07-15 14:25:05 +08:00
parent a8a92e7297 f313d975dd
commit a373ffa16b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/Services/CalculatesBookingOutstanding.php
+3
View File
@@ -34,4 +34,7 @@ class CalculatesBookingOutstanding
return $booking->fix_amount - $this->calculatesBookingFloatingAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) + $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
}
public function executeWithoutFloatingAmount(Booking $booking){
return $booking->fix_amount - $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) + $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
}
}
app/Classes/Modules/Transactions/Services/CalculatesTransactionExpiryDateTime.php
+1 -1
View File
@@ -113,7 +113,7 @@ class CalculatesTransactionExpiryDateTime
private function getNewBookingExpiresAt2($booking, $paymentAttemptLimit){
$newBookingExpiresAt = null;
$amountOutstanding = $this->calculatesBookingOutstanding->execute($booking);
$amountOutstanding = $this->calculatesBookingOutstanding->executeWithoutFloatingAmount($booking);
$amountPaid = $this->calculatesBookingPaidAmount->execute($booking);
if($amountPaid > 0.01 && $amountOutstanding > 0){
$newBookingExpiresAt = Carbon::now()->addMinutes($paymentAttemptLimit);