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

E-Invoice - Do not allow customer to edit PO when customer already has made partial payment

Browse Source
This commit is contained in:
Dillon Ngo
2025-05-15 23:46:36 +08:00
parent c373e2b9bb
commit df193fd737
15 changed files with 152 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+7 -7
View File
@@ -16,10 +16,10 @@ use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
use App\Classes\Modules\Rules\DataTransferObjects\ConfirmBookingDTO;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedPurchaseOrderRule;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedTINRule;
use App\Classes\Modules\Bookings\DataTransferObjects\ConfirmBookingDTO;
use App\Classes\Modules\Rules\Standards\Rules\CanPassEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassPurchaseOrderRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassTINRule;
use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProcessor;
use App\Classes\Modules\Wallets\Services\RecalculatesWalletBalance;
@@ -131,9 +131,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
{
$dto = new ConfirmBookingDTO($request->all());
$result = $this->ruleEvaluator->evaluate([
App()->make(CanProceedEInvoicePromptedRule::class),
App()->make(CanProceedTINRule::class),
App()->make(CanProceedPurchaseOrderRule::class),
App()->make(CanPassEInvoicePromptedRule::class),
App()->make(CanPassTINRule::class),
App()->make(CanPassPurchaseOrderRule::class),
], $dto);
if ($result->failed()) {
app/Classes/Modules/Rules/DataTransferObjects/ConfirmBookingDTO.php → app/Classes/Modules/Bookings/DataTransferObjects/ConfirmBookingDTO.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Classes\Modules\Rules\DataTransferObjects;
namespace App\Classes\Modules\Bookings\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
+3 -3
View File
@@ -12,9 +12,9 @@ use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\Companies\Services\UpdatesCompanyEInvoiceInfo;
use App\Classes\Modules\Rules\DataTransferObjects\EInvoiceInfoDTO;
use App\Classes\Modules\Companies\DataTransferObjects\EInvoiceInfoDTO;
use App\Classes\Modules\Rules\Services\RuleEvaluator;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassEInvoicePromptedRule;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -85,7 +85,7 @@ class UpdateCompanyEInvoiceInfoLogic extends AbstractControllerLogic
{
$dto = new EInvoiceInfoDTO($request->all());
$result = $this->ruleEvaluator->evaluate([
App()->make(CanProceedEInvoicePromptedRule::class),
App()->make(CanPassEInvoicePromptedRule::class),
], $dto);
if ($result->failed()) {
app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceRequestLogic.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Companies\Services\UpdatesCompanyEInvoiceRequest;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\Rules\DataTransferObjects\EInvoiceRequestDTO;
use App\Classes\Modules\Companies\DataTransferObjects\EInvoiceRequestDTO;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
app/Classes/Modules/Rules/DataTransferObjects/EInvoiceInfoDTO.php → app/Classes/Modules/Companies/DataTransferObjects/EInvoiceInfoDTO.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Classes\Modules\Rules\DataTransferObjects;
namespace App\Classes\Modules\Companies\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
app/Classes/Modules/Rules/DataTransferObjects/EInvoiceRequestDTO.php → app/Classes/Modules/Companies/DataTransferObjects/EInvoiceRequestDTO.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Classes\Modules\Rules\DataTransferObjects;
namespace App\Classes\Modules\Companies\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
+4 -4
View File
@@ -7,8 +7,8 @@ use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Rules\DataTransferObjects\CheckEInvoiceRuleDTO;
use App\Classes\Modules\Rules\Services\RuleEvaluator;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedTINRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassTINRule;
use App\Http\Resources\RuleResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -49,8 +49,8 @@ class CheckEInvoiceRuleLogic extends AbstractControllerLogic
$dto = new CheckEInvoiceRuleDTO($request->all());
$result = $this->ruleEvaluator->evaluate([
App()->make(CanProceedEInvoicePromptedRule::class),
App()->make(CanProceedTINRule::class),
App()->make(CanPassEInvoicePromptedRule::class),
App()->make(CanPassTINRule::class),
], $dto);
if ($result->failed()) {
app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php
+4 -4
View File
@@ -7,8 +7,8 @@ use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Rules\DataTransferObjects\CheckPurchaseOrderRuleDTO;
use App\Classes\Modules\Rules\Services\RuleEvaluator;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanProceedPurchaseOrderRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassEInvoicePromptedRule;
use App\Classes\Modules\Rules\Standards\Rules\CanPassPurchaseOrderRule;
use App\Http\Resources\RuleResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -49,8 +49,8 @@ class CheckPurchaseOrderRuleLogic extends AbstractControllerLogic
$dto = new CheckPurchaseOrderRuleDTO($request->all());
$result = $this->ruleEvaluator->evaluate([
App()->make(CanProceedEInvoicePromptedRule::class),
App()->make(CanProceedPurchaseOrderRule::class),
App()->make(CanPassEInvoicePromptedRule::class),
App()->make(CanPassPurchaseOrderRule::class),
], $dto);
if ($result->failed()) {
app/Classes/Modules/Rules/Standards/Rules/CanProceedEInvoicePromptedRule.php → app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php
+3 -3
View File
@@ -6,14 +6,14 @@ use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractRule;
use App\Classes\Modules\Companies\Services\FetchesCompany;
class CanProceedEInvoicePromptedRule extends AbstractRule
class CanPassEInvoicePromptedRule extends AbstractRule
{
/** @var FetchesCompany */
private $fetchesCompany;
/**
* CanProceedEInvoicePromptedRule constructor.
* CanPassEInvoicePromptedRule constructor.
* @param FetchesCompany $fetchesCompany
*/
public function __construct(FetchesCompany $fetchesCompany)
@@ -48,7 +48,7 @@ class CanProceedEInvoicePromptedRule extends AbstractRule
//Check if account requires E-Invoice
$company = $this->fetchesCompany->execute(['id' => $object->companyId]);
if($company->e_invoice === null){
throw new CriteriaNotFulfilledException("Please refresh page to answer question related to E-Invoice.");
throw new CriteriaNotFulfilledException("Please refresh page and click 'Make Payment' first to answer question related to E-Invoice.");
}
return true;
}
app/Classes/Modules/Rules/Standards/Rules/CanPassEditingPORule.php
+67
View File
@@ -0,0 +1,67 @@
<?php
namespace App\Classes\Modules\Rules\Standards\Rules;
use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractRule;
use App\Classes\Modules\Bookings\Services\FetchesBooking;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
use App\Classes\ValueObjects\Constants\TransactionType;
class CanPassEditingPORule extends AbstractRule
{
/** @var FetchesBooking */
private $fetchesBooking;
/** @var FetchesCompany */
private $fetchesCompany;
/**
* CanPassEditingPORule constructor.
* @param FetchesBooking $fetchesBooking
* @param FetchesCompany $fetchesCompany
*/
public function __construct(FetchesBooking $fetchesBooking, FetchesCompany $fetchesCompany)
{
$this->fetchesBooking = $fetchesBooking;
$this->fetchesCompany = $fetchesCompany;
}
/**
* @return bool
*/
protected function authorized($object): bool
{
return true;
}
/**
* @return bool
*/
protected function validators($object): bool
{
return true;
}
/**
* @return bool
*/
protected function criteria($object): bool
{
//Check if user is allow to edit purchase order
$booking = $this->fetchesBooking->execute(['id' => $object->bookingId]);
$paidAmount = floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($booking, $booking->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($booking, $booking->fix_currency_id));
if($paidAmount > 0){
throw new CriteriaNotFulfilledException("Purchase order form is no longer allow to be edited.");
}
return true;
}
}
app/Classes/Modules/Rules/Standards/Rules/CanProceedPurchaseOrderRule.php → app/Classes/Modules/Rules/Standards/Rules/CanPassPurchaseOrderRule.php
+2 -2
View File
@@ -13,7 +13,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\ServiceType;
use Illuminate\Support\Facades\Log;
class CanProceedPurchaseOrderRule extends AbstractRule
class CanPassPurchaseOrderRule extends AbstractRule
{
/** @var FetchesBooking */
@@ -23,7 +23,7 @@ class CanProceedPurchaseOrderRule extends AbstractRule
private $fetchesCompany;
/**
* CanProceedPurchaseOrderRule constructor.
* CanPassPurchaseOrderRule constructor.
* @param FetchesBooking $fetchesBooking
* @param FetchesCompany $fetchesCompany
*/
app/Classes/Modules/Rules/Standards/Rules/CanProceedTINRule.php → app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.php
+2 -2
View File
@@ -7,14 +7,14 @@ use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractRule;
use App\Classes\Modules\Companies\Services\FetchesCompany;
class CanProceedTINRule extends AbstractRule
class CanPassTINRule extends AbstractRule
{
/** @var FetchesCompany */
private $fetchesCompany;
/**
* CanProceedTINRule constructor.
* CanPassTINRule constructor.
* @param FetchesCompany $fetchesCompany
*/
public function __construct(FetchesCompany $fetchesCompany)
app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php
+26 -4
View File
@@ -3,9 +3,11 @@
namespace App\Classes\Modules\Transactions\ControllersLogic;
use App\Classes\Exceptions\CriteriaNotFulfilledException;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Bookings\Services\FetchesBooking;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\Transactions\DataTransferObjects\CreatePurchaseOrderDTO;
use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
use App\Classes\Modules\Transactions\Services\CreatesTransaction;
@@ -15,6 +17,8 @@ use App\Classes\Modules\Transactions\Services\FetchesTransaction;
use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
use App\Classes\Modules\Rules\Services\RuleEvaluator;
use App\Classes\Modules\Rules\Standards\Rules\CanPassEditingPORule;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\PaymentMethodType;
use App\Classes\ValueObjects\Constants\TransactionType;
@@ -46,17 +50,27 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic
/** @var CreatePurchaseOrderTransactionProcessor */
private $createPurchaseOrderTransactionProcessor;
/** @var RuleEvaluator */
private $ruleEvaluator;
/** @var CanPassEditingPORule */
private $canPassEditingPORule;
/**
* CreatePurchaseOrderTransactionLogic constructor.
* @param FetchesBooking $fetchesBooking
* @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
* @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
* @param RuleEvaluator $ruleEvaluator
* @param CanPassEditingPORule $canPassEditingPORule
*/
public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor)
public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, RuleEvaluator $ruleEvaluator, CanPassEditingPORule $canPassEditingPORule)
{
$this->fetchesBooking = $fetchesBooking;
$this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
$this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
$this->ruleEvaluator = $ruleEvaluator;
$this->canPassEditingPORule = $canPassEditingPORule;
}
/**
@@ -64,9 +78,20 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic
* @param string $id
* @return JsonResponse
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\CriteriaNotFulfilledException
*/
public function logic(Request $request, $id = '') : JsonResponse
{
$dto = new CreatePurchaseOrderDTO($request->all());
$result = $this->ruleEvaluator->evaluate([
$this->canPassEditingPORule
], $dto);
if ($result->failed()) {
throw new CriteriaNotFulfilledException("- " . implode("<br>- ", $result->messages()));
}
/** @var Booking $booking */
$booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]);
@@ -87,7 +112,4 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic
return $this->resourceResponse(new TransactionResource($transaction));
}
}
app/Classes/Modules/Transactions/DataTransferObjects/CreatePurchaseOrderDTO.php
+25
View File
@@ -0,0 +1,25 @@
<?php
namespace App\Classes\Modules\Transactions\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
class CreatePurchaseOrderDTO implements DataTransferObject
{
public int $bookingId;
public int $companyId;
public function __construct(array $data)
{
$this->bookingId = $data['booking_id'];
$this->companyId = $data['company_id'];
}
public function toArray(): array
{
return [
'booking_id' => $this->bookingId,
'company_id' => $this->companyId,
];
}
}
resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+5 -3
View File
@@ -188,12 +188,12 @@
<div class="col" v-if="submitted">
<div class="alert alert-success padding-15" role="alert">
<div class="font-heading fs-12 all-caps bold m-b-15">Your Purchase Order {{data.purchase_order.status === 1 ? 'is Being Processed for Verification' : 'has been Approved' }}</div>
<div class="row m-b-15">
<div class="row m-b-15" v-if="(Math.round((data.paid_amount + Number.EPSILON) * 100) / 100) === 0">
<div class="col">
<div class="font-heading fs-10">If you would like to still edit your Purchase Order you can do that by clicking on the edit button below, but your purchase order verification request will be reset.</div>
</div>
</div>
<button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest w-100" @click="submitted = false">Edit Purchase Order</button>
<button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest w-100" @click="submitted = false" v-if="(Math.round((data.paid_amount + Number.EPSILON) * 100) / 100) === 0">Edit Purchase Order</button>
<button class="btn btn-xs all-caps b-rad-none btn-complete w-100 m-t-5" v-if="!data.documents.proforma_invoice && data.outstanding_amount != 0" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Generate Proforma Invoice</button>
</div>
</div>
@@ -281,7 +281,9 @@
submitForm(){
this.uploadFiles = false;
this.parameters = {
products: this.products
products: this.products,
booking_id: this.data.id,
company_id: this.data.company.id,
};
this.submit(route('api.transaction.po.create', this.data.id), 'post', this.section, true, true);