cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 13:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fully refund bug

Browse Source
This commit is contained in:
Edmond Lang
2025-06-17 21:29:27 +08:00
parent 37ce03cc55
commit 68898ee685
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+4 -4
View File
@@ -100,6 +100,10 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
$billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
$refund = $transaction->transactions()->refunds()->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->sum('original_amount');
$isFullyRefund = round($refund + $request->input('amount'), 2) == round((float) $transaction->original_amount, 2);
if ($isFullyRefund) {
$request->merge(['amount' => $transaction->original_amount]);
}
$refundInPending = $transaction->transactions()->refunds()->where('status', ApprovalStatus::PENDING_VERIFICATION)->sum('original_amount');
@@ -120,10 +124,6 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
$bookingAmountAfterRefunded = $booking->fix_amount - $refundInPending - $request->input('amount');
$refundAmount = round($refund + $request->input('amount'), 2);
$originalAmount = round((float) $transaction->original_amount, 2);
$isFullyRefund = $refundAmount == $originalAmount;
$voucherCode = null;
$redemptionId = null;
app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountLogic.php
+4 -1
View File
@@ -21,6 +21,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use App\Classes\Exceptions\MalformedRequestException;
use Illuminate\Support\Facades\Log;
class UpdateBookingAmountLogic extends AbstractControllerLogic
{
@@ -82,7 +83,9 @@ class UpdateBookingAmountLogic extends AbstractControllerLogic
$minimum_amount = $booking->fix_amount - $this->calculatesBookingOutstanding->execute($booking);
if (((float)$input_amount + 0.01) < (float)$minimum_amount) {
throw new MalformedRequestException('Booking Amount cannot be less than '. $minimum_amount .'.');
$input_amount = 0;
// throw new MalformedRequestException('Booking Amount cannot be less than '. $minimum_amount .'.');
Log::warning('Booking ID: '. $booking->id .'. Booking Marking: '. $booking->marking .'. Booking Amount cannot be less than '. $minimum_amount .'.');
}
$poTransaction = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();