From 2f0f96fd794fc2b2d28c2df3ab782c15ef217543 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 12 Dec 2025 14:16:52 +0800 Subject: [PATCH] E-Invoice - EXC2005, Test Result FeedBack 01 fixes --- .../ControllersLogic/UpdateBookingAmountOnHoldLogic.php | 7 +++---- .../ControllersLogic/UpdateBookingAmountWithPOLogic.php | 3 ++- app/Classes/ValueObjects/Constants/KVPKey.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountOnHoldLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountOnHoldLogic.php index 80e43945..3588909f 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountOnHoldLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountOnHoldLogic.php @@ -14,6 +14,7 @@ use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Accounts\DataTransferObjects\KeyValuePairObject; +use App\Classes\ValueObjects\Constants\KVPKey; use App\Http\Resources\BookingResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -90,10 +91,8 @@ class UpdateBookingAmountOnHoldLogic extends AbstractControllerLogic throw new MalformedRequestException('Booking Amount cannot be less than '. $minimum_amount .'.'); } - $key = "BOOKING_AMOUNT_UPDATE"; - - $keyValuePairObject = new KeyValuePairObject($key, $input_amount); - $metadata = $booking->attributesKVP()->where('key', $key)->first(); + $keyValuePairObject = new KeyValuePairObject(KVPKey::BOOKING_AMOUNT_UPDATE, $input_amount); + $metadata = $booking->attributesKVP()->where('key', KVPKey::BOOKING_AMOUNT_UPDATE)->first(); if($metadata){ $this->updatesKeyValuePair->execute($metadata, $keyValuePairObject); } diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php index b97a2667..48cc7d94 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php @@ -14,6 +14,7 @@ use App\Classes\Modules\Bookings\Services\UpdatesBookingInvoiceStatus; use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionV2Processor; use App\Classes\Modules\Bookings\DataTransferObjects\UpdateBookingInvoiceStatusObject; use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Classes\ValueObjects\Constants\KVPKey; use App\Classes\ValueObjects\Constants\TransactionType; use App\Http\Resources\BookingResource; use App\Models\Booking; @@ -88,7 +89,7 @@ class UpdateBookingAmountWithPOLogic extends AbstractControllerLogic /** @var Booking $booking */ $booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]); $outstandingAmount = $this->calculatesBookingOutstanding->execute($booking); - $bookingAttribute = $booking->attributesKVP()->where('key', "BOOKING_AMOUNT_UPDATE")->first(); + $bookingAttribute = $booking->attributesKVP()->where('key', KVPKey::BOOKING_AMOUNT_UPDATE)->first(); // cief todo: 90 - BEFORE REVERT diff --git a/app/Classes/ValueObjects/Constants/KVPKey.php b/app/Classes/ValueObjects/Constants/KVPKey.php index 0eebe6bc..1ab5f1bd 100644 --- a/app/Classes/ValueObjects/Constants/KVPKey.php +++ b/app/Classes/ValueObjects/Constants/KVPKey.php @@ -28,6 +28,6 @@ class KVPKey public const AUTOCOUNT_DOCNO_SALES_DEPOSIT_BY_WALLET_REFUND = 'AUTOCOUNT_DOCNO_SALES_DEPOSIT_BY_WALLET_RF'; - + public const BOOKING_AMOUNT_UPDATE = 'BOOKING_AMOUNT_UPDATE'; }