cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-e' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2025-10-24 15:28:48 +08:00
parent a6be34f4af 4f413d62f6
commit a909a725ad
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/Services/CalculatesBookingOutstanding.php
+10 -2
View File
@@ -3,6 +3,7 @@
namespace App\Classes\Modules\Bookings\Services;
use App\Models\Booking;
use Illuminate\Support\Facades\Log;
class CalculatesBookingOutstanding
{
@@ -31,10 +32,17 @@ class CalculatesBookingOutstanding
public function execute(Booking $booking){
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);
$originalBookingAmount = $booking->fix_amount;
$refundedAmount = $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
if($originalBookingAmount === $refundedAmount){
return $originalBookingAmount - $this->calculatesBookingFloatingAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id);
}
else{
return $originalBookingAmount - $this->calculatesBookingFloatingAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) + $refundedAmount;
}
}
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/Bookings/Services/CalculatesBookingPayableAmount.php
+16 -4
View File
@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Booking;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class CalculatesBookingPayableAmount
{
@@ -19,10 +20,21 @@ class CalculatesBookingPayableAmount
->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') :
$booking->transactions()->payments()->where('status', ApprovalStatus::REFUNDED)->sum('original_amount');
}
return $type === 1 ?
$booking->transactions()->payments()->complete()
->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') :
$booking->transactions()->payments()->complete()->sum('original_amount');
else{
$returnAmount = $type === 1 ?
$booking->transactions()->payments()->complete()
->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') :
$booking->transactions()->payments()->complete()->sum('original_amount');
if($returnAmount === 0){
$returnAmount = $type === 1 ?
$booking->transactions()->payments()->where('status', ApprovalStatus::REFUNDED)
->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') :
$booking->transactions()->payments()->where('status', ApprovalStatus::REFUNDED)->sum('original_amount');
}
return $returnAmount;
}
}
}
app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
+6
View File
@@ -13,6 +13,12 @@ class CalculatesBookingRefundAmount
return $this->calculateRefundAmount($payment, $type);
});
if ($refundAmounts->isEmpty()) {
$refundAmounts = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::REFUNDED])->get()->map(function ($payment) use ($type) {
return $this->calculateRefundAmount($payment, $type);
});
}
$totalRefundAmount = $refundAmounts->sum();
return $totalRefundAmount;