From 8559332d343083ea2683550b3e0ee12f978a7563 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 10 May 2025 00:48:20 +0800
Subject: [PATCH] E-Invoice - Initial commit main feature integration

---
 .../CriteriaNotFulfilledException.php         |  14 +
 .../General/Abstracts/AbstractRule.php        |   5 +-
 .../Services/UpdatesAddressMetadata.php       |  25 +
 .../Addresses/Services/UpsertsAddress.php     |  36 +
 .../CreateBookingPaymentLogic.php             |  26 +-
 .../FetchCompanyEInvoiceInfoLogic.php         |  68 ++
 .../UpdateCompanyDetailsLogic.php             | 132 +++
 .../UpdateCompanyEInvoiceInfoLogic.php        | 112 +++
 .../UpdateCompanyEInvoiceRequestLogic.php     |  59 ++
 .../UpdateCompanyNameAndDebtorLogic.php       |   6 +-
 .../UpdateCompanyDetailsDTO.php               |  61 ++
 .../Services/UpdatesCompanyEInvoiceInfo.php   |  25 +
 .../UpdatesCompanyEInvoiceRequest.php         |  27 +
 .../Services/ExportsEInvoiceDebtorSummary.php |   9 +-
 .../CheckEInvoiceRuleLogic.php                |  62 ++
 .../CheckPurchaseOrderRuleLogic.php           |  62 ++
 .../CheckEInvoiceRuleDTO.php                  |  22 +
 .../CheckPurchaseOrderRuleDTO.php             |  25 +
 .../DataTransferObjects/ConfirmBookingDTO.php |  25 +
 .../DataTransferObjects/EInvoiceInfoDTO.php   |  40 +
 .../EInvoiceRequestDTO.php                    |  25 +
 .../Modules/Rules/Services/RuleEvaluator.php  |  44 +
 .../Rules/CanProceedEInvoicePromptedRule.php  |  56 ++
 .../Rules/CanProceedPurchaseOrderRule.php     |  96 ++
 .../Standards/Rules/CanProceedTINRule.php     |  55 ++
 .../Constants/SegmentNameConstants.php        |   7 +
 .../Constants/ServiceTypeNameConstants.php    |   9 +
 .../Response/RuleEvaluationResult.php         |  30 +
 .../FetchCompanyEInvoiceInfoController.php    |  20 +
 .../UpdateCompanyDetailsController.php        |  21 +
 .../UpdateCompanyEInvoiceInfoController.php   |  29 +
 .../Controllers/Rules/CheckRuleController.php |  29 +
 app/Http/Resources/CompanyResource.php        |   4 +
 app/Http/Resources/EInvoiceInfoResource.php   |  31 +
 app/Http/Resources/RuleResource.php           |  22 +
 ...150726_add_einvoice_to_addresses_table.php |  32 +
 ...5_04_150735_add_tin_to_companies_table.php |  38 +
 .../forms/EInvoiceInfoFormComponent.vue       | 213 +++++
 .../elements/EInvoiceInfoComponent.vue        |  68 ++
 .../BookingPaymentQuotationV2Component.vue    | 833 ++++++++++++++++++
 .../forms/ConfirmQuotationFormComponent.vue   |  12 +-
 .../BookingDetailsSectionComponent.vue        |  18 +-
 .../elements/CustomerProfileComponent.vue     |   3 +-
 ...ngeCustomerCompanyDetailsFormComponent.vue | 147 ++++
 .../forms/EInvoiceRequestFormComponent.vue    |  65 ++
 .../assets/vue/general/mixins/request.js      |   8 +-
 routes/api.php                                |   2 +
 routes/company.php                            |   7 +
 routes/rule.php                               |  11 +
 routes/web.php                                |   2 +-
 50 files changed, 2757 insertions(+), 21 deletions(-)
 create mode 100644 app/Classes/Exceptions/CriteriaNotFulfilledException.php
 create mode 100644 app/Classes/Modules/Addresses/Services/UpdatesAddressMetadata.php
 create mode 100644 app/Classes/Modules/Addresses/Services/UpsertsAddress.php
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyDetailsLogic.php
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceRequestLogic.php
 create mode 100644 app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php
 create mode 100644 app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceInfo.php
 create mode 100644 app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php
 create mode 100644 app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
 create mode 100644 app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php
 create mode 100644 app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php
 create mode 100644 app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php
 create mode 100644 app/Classes/Modules/Rules/DataTransferObjects/ConfirmBookingDTO.php
 create mode 100644 app/Classes/Modules/Rules/DataTransferObjects/EInvoiceInfoDTO.php
 create mode 100644 app/Classes/Modules/Rules/DataTransferObjects/EInvoiceRequestDTO.php
 create mode 100644 app/Classes/Modules/Rules/Services/RuleEvaluator.php
 create mode 100644 app/Classes/Modules/Rules/Standards/Rules/CanProceedEInvoicePromptedRule.php
 create mode 100644 app/Classes/Modules/Rules/Standards/Rules/CanProceedPurchaseOrderRule.php
 create mode 100644 app/Classes/Modules/Rules/Standards/Rules/CanProceedTINRule.php
 create mode 100644 app/Classes/ValueObjects/Constants/SegmentNameConstants.php
 create mode 100644 app/Classes/ValueObjects/Constants/ServiceTypeNameConstants.php
 create mode 100644 app/Classes/ValueObjects/Response/RuleEvaluationResult.php
 create mode 100644 app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php
 create mode 100644 app/Http/Controllers/Companies/UpdateCompanyDetailsController.php
 create mode 100644 app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php
 create mode 100644 app/Http/Controllers/Rules/CheckRuleController.php
 create mode 100644 app/Http/Resources/EInvoiceInfoResource.php
 create mode 100644 app/Http/Resources/RuleResource.php
 create mode 100644 database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php
 create mode 100644 database/migrations/2025_05_04_150735_add_tin_to_companies_table.php
 create mode 100644 resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
 create mode 100644 resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
 create mode 100644 resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue
 create mode 100644 resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
 create mode 100644 resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
 create mode 100644 routes/rule.php

diff --git a/app/Classes/Exceptions/CriteriaNotFulfilledException.php b/app/Classes/Exceptions/CriteriaNotFulfilledException.php
new file mode 100644
index 00000000..da105690
--- /dev/null
+++ b/app/Classes/Exceptions/CriteriaNotFulfilledException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+
+final class CriteriaNotFulfilledException extends ServiceApiException {
+    public function __construct(?string $message = null) {
+        parent::__construct(
+            $message ?? 'One or more required criteria were not fulfilled.',
+            HttpStatus::VALIDATION_FAILED
+        );
+    }
+}
diff --git a/app/Classes/General/Abstracts/AbstractRule.php b/app/Classes/General/Abstracts/AbstractRule.php
index 5b424df0..7d78108e 100644
--- a/app/Classes/General/Abstracts/AbstractRule.php
+++ b/app/Classes/General/Abstracts/AbstractRule.php
@@ -4,6 +4,7 @@ namespace App\Classes\General\Abstracts;
 
 
 use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Interfaces\DataTransferObject;
 
@@ -35,12 +36,14 @@ abstract class AbstractRule
 
             return true;
 
+
         } catch(AccessForbiddenException $exception){
             throw new AccessForbiddenException('You don\'t have permission to perform this action');
+        } catch(CriteriaNotFulfilledException $exception){
+            throw new CriteriaNotFulfilledException($exception->getMessage());
         } catch(\Exception $exception){
             throw new RequestValidationException($exception->getMessage());
         }
 
     }
-
 }
diff --git a/app/Classes/Modules/Addresses/Services/UpdatesAddressMetadata.php b/app/Classes/Modules/Addresses/Services/UpdatesAddressMetadata.php
new file mode 100644
index 00000000..cfecb739
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/UpdatesAddressMetadata.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Address;
+
+class UpdatesAddressMetadata extends AbstractUpdateRecord
+{
+    /**
+     * @param Address $model
+     * @param bool $billing
+     * @param bool $eInvoice
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Address $model, bool $billing, bool $eInvoice) {
+
+        $model->billing = $billing;
+        $model->e_invoice = $eInvoice;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Addresses/Services/UpsertsAddress.php b/app/Classes/Modules/Addresses/Services/UpsertsAddress.php
new file mode 100644
index 00000000..ec130189
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/UpsertsAddress.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Models\Address;
+use App\Models\Company;
+
+class UpsertsAddress extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * Create or update the company's address.
+     *
+     * @param Company $company
+     * @param AddressObject $object
+     * @param int $id
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, AddressObject $object, int $id)
+    {
+        //Create new or update?
+        $model = $company->addresses()->where('id', $id)->first() ?? new Address();
+
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->country_id = $object->getCountryId();
+        $model->state_id = $object->getStateId();
+        $model->district_id = $object->getDistrictId();
+        $model->postcode = $object->getPostCode();
+
+        return $this->handler($company->addresses(), $model);
+    }
+}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index 478c71a4..6b75dd49 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
@@ -16,9 +16,14 @@ 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\Transactions\Processors\CreateCashBackTransactionProcessor;
 use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProcessor;
 use App\Classes\Modules\Wallets\Services\RecalculatesWalletBalance;
+use App\Classes\Modules\Rules\Services\RuleEvaluator;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
@@ -80,6 +85,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     /** @var CalculatesBookingRefundAmount */
     private $calculatesBookingRefundAmount;
 
+    /** @var RuleEvaluator */
+    private $ruleEvaluator;
+
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -94,8 +102,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      * @param RecalculatesWalletBalance $recalculatesWalletBalance
      * @param BookingToVoucherifyProcessor $bookingToVoucherifyProcessor
      * @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
+     * @param RuleEvaluator $ruleEvaluator
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor, CalculatesBookingRefundAmount $calculatesBookingRefundAmount, RuleEvaluator $ruleEvaluator)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
@@ -109,15 +118,28 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $this->recalculatesWalletBalance = $recalculatesWalletBalance;
         $this->bookingToVoucherifyProcessor = $bookingToVoucherifyProcessor;
         $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
+        $this->ruleEvaluator = $ruleEvaluator;
     }
 
     /**
      * @param Request $request
      * @return JsonResponse
      * @throws MalformedRequestException
+     * @throws CriteriaNotFulfilledException
      */
     public function logic(Request $request) : JsonResponse
     {
+        $dto = new ConfirmBookingDTO($request->all());
+        $result = $this->ruleEvaluator->evaluate([
+            App()->make(CanProceedEInvoicePromptedRule::class),
+            App()->make(CanProceedTINRule::class),
+            App()->make(CanProceedPurchaseOrderRule::class),
+        ], $dto);
+
+        if ($result->failed()) {
+            throw new CriteriaNotFulfilledException("- " . implode("<br>- ", $result->messages()));
+        }
+
         $voucherCode = $request->input('voucher_code');
 
         $booking = Booking::find($request->route('id'));
diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php
new file mode 100644
index 00000000..ebb2d275
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanFetchCompany;
+use App\Http\Resources\EInvoiceInfoResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchCompanyEInvoiceInfoLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Company E-Invoice Info',
+            'message' => 'You have successfully retrieved a Company E-Invoice Info'
+        ];
+    }
+
+    /** @var CanFetchCompany */
+    private $canFetchCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * FetchCompanyEInvoiceInfoLogic constructor.
+     * @param CanFetchCompany $canFetchCompany
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(CanFetchCompany $canFetchCompany, FetchesCompany $fetchesCompany)
+    {
+        $this->canFetchCompany = $canFetchCompany;
+        $this->fetchesCompany = $fetchesCompany;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchCompany->passes();
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $eInvoiceInfo = $company->addresses()->where('billing', '=', false)->where('e_invoice', '=', true)->latest()->first();
+
+        if($eInvoiceInfo){
+            $eInvoiceInfo->tin = $company->tin;
+            $eInvoiceInfo->msic_code = $company->msic_code;
+            $eInvoiceInfo->e_invoice = $company->e_invoice;
+        }
+        else{
+            return $this->response([]);
+        }
+
+        return $this->resourceResponse(new EInvoiceInfoResource($eInvoiceInfo));
+    }
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyDetailsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyDetailsLogic.php
new file mode 100644
index 00000000..7cb9c3c8
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyDetailsLogic.php
@@ -0,0 +1,132 @@
+<?php
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Classes\Modules\Addresses\Services\UpsertsAddress;
+use App\Classes\Modules\Addresses\Services\FetchesDistrict;
+use App\Classes\Modules\Addresses\Services\UpdatesAddressMetadata;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyEInvoiceInfo;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\UpdateCompanyDetailsDTO;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyDetailsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Company Details',
+            'message' => 'You have successfully updated the Company Details'
+        ];
+    }
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var UpsertsAddress */
+    private $upsertsAddress;
+
+    /** @var UpdatesCompanyEInvoiceInfo */
+    private $updatesCompanyEInvoiceInfo;
+
+    /** @var UpdatesAddressMetadata */
+    private $updatesAddressMetadata;
+
+
+    /**
+     * UpdateCompanyDetailsLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
+     * @param UpsertsAddress $upsertsAddress
+     * @param UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo;
+     * @param UpdatesAddressMetadata $updatesAddressMetadata
+     */
+    public function __construct(
+        CanUpdateCompany $canUpdateCompany,
+        UpdatesCompany $updatesCompany,
+        FetchesCompany $fetchesCompany,
+        UpdatesCompanyDebtor $updatesCompanyDebtor,
+        CanCreateAddress $canCreateAddress,
+        FetchesDistrict $fetchesDistrict,
+        UpsertsAddress $upsertsAddress,
+        UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo,
+        UpdatesAddressMetadata $updatesAddressMetadata
+    )
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->upsertsAddress = $upsertsAddress;
+        $this->updatesCompanyEInvoiceInfo = $updatesCompanyEInvoiceInfo;
+        $this->updatesAddressMetadata = $updatesAddressMetadata;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new UpdateCompanyDetailsDTO($request->all());
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $object = new CompanyObject($dto->name, $dto->reference, $company->business_type, $dto->type);
+
+        $this->canUpdateCompany->passes($object);
+
+         //Update Name and Debtor
+        $company = $this->updatesCompany->execute($company, $object);
+        if ($dto->debtor|| $company->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($company, $dto->debtor);
+        }
+
+        //Update EInvoice Related Info
+        if($company->e_invoice){
+            $district = $this->fetchesDistrict->execute(['id' => $dto->districtId]);
+            $addObj = new AddressObject($dto->streetOne, $dto->streetTwo, $district->country_id, $district->state_id, $district->id, $dto->postCode);
+            $this->canCreateAddress->passes($addObj);
+
+            $address = $this->upsertsAddress->execute($company, $addObj, $dto->addressId);
+            $query = $this->updatesAddressMetadata->execute($address, false, true);
+            $this->updatesCompanyEInvoiceInfo->execute($company, $dto->tin, $dto->msicCode);
+        }
+
+        return $this->resourceResponse(new CompanyResource($company));
+    }
+}
+
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
new file mode 100644
index 00000000..9978006f
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesDistrict;
+use App\Classes\Modules\Addresses\Services\UpdatesAddressMetadata;
+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\Rules\Services\RuleEvaluator;
+use App\Classes\Modules\Rules\Standards\Rules\CanProceedEInvoicePromptedRule;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyEInvoiceInfoLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'EInvoice Info Update',
+            'message' => 'You have successfully updated company E-Invoice information'
+        ];
+    }
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var RuleEvaluator */
+    private $ruleEvaluator;
+
+    /** @var UpdatesCompanyEInvoiceInfo */
+    private $updatesCompanyEInvoiceInfo;
+
+    /** @var UpdatesAddressMetadata */
+    private $updatesAddressMetadata;
+
+    /**
+     * UpdateCompanyEInvoiceInfoLogic constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesAddress $createsAddress
+     * @param RuleEvaluator $ruleEvaluator;
+     * @param UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo;
+     * @param UpdatesAddressMetadata $updatesAddressMetadata
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress, RuleEvaluator $ruleEvaluator, UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo, UpdatesAddressMetadata $updatesAddressMetadata)
+    {
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsAddress = $createsAddress;
+        $this->ruleEvaluator = $ruleEvaluator;
+        $this->updatesCompanyEInvoiceInfo = $updatesCompanyEInvoiceInfo;
+        $this->updatesAddressMetadata = $updatesAddressMetadata;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new EInvoiceInfoDTO($request->all());
+        $result = $this->ruleEvaluator->evaluate([
+            App()->make(CanProceedEInvoicePromptedRule::class),
+        ], $dto);
+
+        if ($result->failed()) {
+            throw new CriteriaNotFulfilledException("- " . implode("<br>- ", $result->messages()));
+        }
+
+        $district = $this->fetchesDistrict->execute(['id' => $dto->districtId]);
+        $object = new AddressObject($dto->streetOne, $dto->streetTwo, $district->country_id, $district->state_id, $district->id, $dto->postCode);
+
+        //Update Address
+        $this->canCreateAddress->passes($object);
+        $company = $this->fetchesCompany->execute(['id' => $dto->companyId]);
+        $address = $this->createsAddress->execute($company, $object);
+        $query = $this->updatesAddressMetadata->execute($address, false, true);
+
+        //Update tin, msic code
+        $this->updatesCompanyEInvoiceInfo->execute($company, $dto->tin, $dto->msicCode);
+
+        $query->tin = $dto->tin;
+        $query->msic_code = $dto->msicCode;
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceRequestLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceRequestLogic.php
new file mode 100644
index 00000000..86051447
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceRequestLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+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 Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyEInvoiceRequestLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated EInvoice Request',
+            'message' => 'You have successfully updated company E-Invoice request'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyEInvoiceRequest */
+    private $updatesCompanyEInvoiceRequest;
+
+
+    /**
+     * UpdateCompanyEInvoiceRequestLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyEInvoiceRequest $updatesCompanyEInvoiceRequest
+     */
+    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyEInvoiceRequest $updatesCompanyEInvoiceRequest)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyEInvoiceRequest = $updatesCompanyEInvoiceRequest;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new EInvoiceRequestDTO($request->all());
+        $company = $this->fetchesCompany->execute(['id' => $dto->companyId]);
+        $this->updatesCompanyEInvoiceRequest->execute($company, $dto->eInvoiceRequest);
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
index 05fb0746..5a110d85 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
@@ -20,8 +20,8 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Update Company Account Status',
-            'message' => 'You have successfully updated the Company Account Status'
+            'title' => 'Update Company Details',
+            'message' => 'You have successfully updated the Company Details'
         ];
     }
     /** @var CanUpdateCompany */
@@ -77,6 +77,4 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
 
         return $this->resourceResponse(new CompanyResource($query));
     }
-
 }
-
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php b/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php
new file mode 100644
index 00000000..5a16f12c
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Companies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UpdateCompanyDetailsDTO implements DataTransferObject
+{
+    public int $id;
+    public string $name;
+    public string $debtor;
+    public string $reference;
+    public int $type;
+
+    public int $tin;
+    public int $msicCode;
+    public int $addressId;
+    public int $districtId;
+    public int $companyId;
+    public string $streetOne;
+    public string $streetTwo;
+    public int $postCode;
+
+    public function __construct(array $data)
+    {
+        $this->id = (int) ($data['id'] ?? 0);
+        $this->name = (string) ($data['name'] ?? '');
+        $this->debtor = (string) ($data['debtor'] ?? '');
+        $this->reference = (string) ($data['reference'] ?? '');
+        $this->type = (int) ($data['type'] ?? 0);
+
+        $this->tin = (int) ($data['tin'] ?? 0);
+        $this->msicCode = (int) ($data['msic_code'] ?? 0);
+        $this->addressId = (int) ($data['address_id'] ?? 0);
+        $this->districtId = (int) ($data['district_id'] ?? 0);
+        $this->companyId = (int) ($data['company_id'] ?? 0);
+        $this->streetOne = (string) ($data['street_one'] ?? '');
+        $this->streetTwo = (string) ($data['street_two'] ?? '');
+        $this->postCode = (int) ($data['post_code'] ?? 0);
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'debtor' => $this->debtor,
+            'reference' => $this->reference,
+            'type' => $this->type,
+
+            'tin' => $this->tin,
+            'msic_code' => $this->msicCode,
+            'address_id' => $this->addressId,
+            'district_id' => $this->districtId,
+            'company_id' => $this->companyId,
+            'street_one' => $this->streetOne,
+            'street_two' => $this->streetTwo,
+            'post_code' => $this->postCode,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceInfo.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceInfo.php
new file mode 100644
index 00000000..0a2c5cc5
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceInfo.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Company;
+
+class UpdatesCompanyEInvoiceInfo extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param string $tin
+     * @param string $msicCode
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, string $tin, string $msicCode)
+    {
+        $model->tin = $tin;
+        $model->msic_code = $msicCode;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php
new file mode 100644
index 00000000..780f8150
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Company;
+
+class UpdatesCompanyEInvoiceRequest extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param bool $eInvoice
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, bool $eInvoice)
+    {
+        if (is_null($model->e_invoice) && is_null($model->e_invoice_requested_at)) {
+            $model->e_invoice_requested_at = now();
+        }
+        $model->e_invoice = $eInvoice;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsEInvoiceDebtorSummary.php b/app/Classes/Modules/Exports/Services/ExportsEInvoiceDebtorSummary.php
index 69e237fb..7edf2d72 100644
--- a/app/Classes/Modules/Exports/Services/ExportsEInvoiceDebtorSummary.php
+++ b/app/Classes/Modules/Exports/Services/ExportsEInvoiceDebtorSummary.php
@@ -57,7 +57,8 @@ class ExportsEInvoiceDebtorSummary implements FromQuery, WithHeadings, WithHeadi
     public function query()
     {
         return Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
+            // $query->whereNull('debtor')->orWhere('debtor', '');
+            $query->whereNotNull('e_invoice');
         })->whereNotIn('id', [2207, 2248, 2029])->where('business_type', BusinessType::IMPORTER)->where('status', ApprovalStatus::APPROVED)->where(function($query){
             $query->whereHas('transactions', function($query){
                 return $query->whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP])->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED, ApprovalStatus::PENDING_VERIFICATION]);
@@ -76,9 +77,9 @@ class ExportsEInvoiceDebtorSummary implements FromQuery, WithHeadings, WithHeadi
     {
         return [
             '<<New>>',                        // Code
-            'TODO',                           // Need Tax INV?
-            'TODO',                           // Request Date
-            'TODO',                           // TIN NO.
+            $company->e_invoice,              // Need Tax INV?
+            $company->e_invoice_requested_at, // Request Date
+            $company->tin,                    // TIN NO.
             '300-0000',                       // DebtorControlAcc
             '300-0000',                       // ControlAccount
             $company->name.' (PURCHASE)',     // CompanyName
diff --git a/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php b/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
new file mode 100644
index 00000000..dd19bec1
--- /dev/null
+++ b/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\Rules\ControllersLogic;
+
+
+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\Http\Resources\RuleResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CheckEInvoiceRuleLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Rule Check E-Invoice',
+            'message' => 'You have successfully passed all rules evaluated'
+        ];
+    }
+
+    /** @var RuleEvaluator */
+    private $ruleEvaluator;
+
+    /**
+     * CheckEInvoiceRuleLogic constructor.
+     */
+    public function __construct(RuleEvaluator $ruleEvaluator)
+    {
+        $this->ruleEvaluator = $ruleEvaluator;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new CheckEInvoiceRuleDTO($request->all());
+
+        $result = $this->ruleEvaluator->evaluate([
+            App()->make(CanProceedEInvoicePromptedRule::class),
+            App()->make(CanProceedTINRule::class),
+        ], $dto);
+
+        if ($result->failed()) {
+            throw new CriteriaNotFulfilledException("- " . implode("<br>- ", $result->messages()));
+        }
+
+        return $this->resourceResponse(new RuleResource((object)$result));
+    }
+}
diff --git a/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php b/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php
new file mode 100644
index 00000000..577e4618
--- /dev/null
+++ b/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\Rules\ControllersLogic;
+
+
+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\Http\Resources\RuleResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CheckPurchaseOrderRuleLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Rule Check Purchase Order',
+            'message' => 'You have successfully passed all rules evaluated'
+        ];
+    }
+
+    /** @var RuleEvaluator */
+    private $ruleEvaluator;
+
+    /**
+     * CheckPurchaseOrderRuleLogic constructor.
+     */
+    public function __construct(RuleEvaluator $ruleEvaluator)
+    {
+        $this->ruleEvaluator = $ruleEvaluator;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new CheckPurchaseOrderRuleDTO($request->all());
+
+        $result = $this->ruleEvaluator->evaluate([
+            App()->make(CanProceedEInvoicePromptedRule::class),
+            App()->make(CanProceedPurchaseOrderRule::class),
+        ], $dto);
+
+        if ($result->failed()) {
+            throw new CriteriaNotFulfilledException("- " . implode("<br>- ", $result->messages()));
+        }
+
+        return $this->resourceResponse(new RuleResource((object)$result));
+    }
+}
diff --git a/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php
new file mode 100644
index 00000000..75726e47
--- /dev/null
+++ b/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Rules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class CheckEInvoiceRuleDTO implements DataTransferObject
+{
+    public int $companyId;
+
+    public function __construct(array $data)
+    {
+        $this->companyId = $data['company_id'];
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'company_id' => $this->companyId,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php
new file mode 100644
index 00000000..2c5c2ab5
--- /dev/null
+++ b/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Rules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class CheckPurchaseOrderRuleDTO 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,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Rules/DataTransferObjects/ConfirmBookingDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/ConfirmBookingDTO.php
new file mode 100644
index 00000000..2c154833
--- /dev/null
+++ b/app/Classes/Modules/Rules/DataTransferObjects/ConfirmBookingDTO.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Rules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ConfirmBookingDTO 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,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceInfoDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceInfoDTO.php
new file mode 100644
index 00000000..f768b2c1
--- /dev/null
+++ b/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceInfoDTO.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Rules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class EInvoiceInfoDTO implements DataTransferObject
+{
+    public int $tin;
+    public int $msicCode;
+    public int $districtId;
+    public int $companyId;
+    public string $streetOne;
+    public string $streetTwo;
+    public int $postCode;
+
+    public function __construct(array $data)
+    {
+        $this->tin = (int) ($data['tin'] ?? '');
+        $this->msicCode = (int) ($data['msic_code'] ?? '');
+        $this->districtId = (int) ($data['district_id'] ?? '');
+        $this->companyId = (int) ($data['company_id'] ?? '');
+        $this->streetOne = (string) ($data['street_one'] ?? '');
+        $this->streetTwo = (string) ($data['street_two'] ?? '');
+        $this->postCode = (int) ($data['post_code'] ?? '');
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'tin' => $this->tin,
+            'msic_code' => $this->msicCode,
+            'district_id' => $this->districtId,
+            'company_id' => $this->companyId,
+            'street_one' => $this->streetOne,
+            'street_two' => $this->streetTwo,
+            'post_code' => $this->postCode,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceRequestDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceRequestDTO.php
new file mode 100644
index 00000000..cbc2b0ea
--- /dev/null
+++ b/app/Classes/Modules/Rules/DataTransferObjects/EInvoiceRequestDTO.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Rules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class EInvoiceRequestDTO implements DataTransferObject
+{
+    public bool $eInvoiceRequest;
+    public int $companyId;
+
+    public function __construct(array $data)
+    {
+        $this->eInvoiceRequest = $data['e_invoice_request'];
+        $this->companyId = $data['company_id'];
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'e_invoice_request' => $this->eInvoiceRequest,
+            'company_id' => $this->companyId,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Rules/Services/RuleEvaluator.php b/app/Classes/Modules/Rules/Services/RuleEvaluator.php
new file mode 100644
index 00000000..ac248a25
--- /dev/null
+++ b/app/Classes/Modules/Rules/Services/RuleEvaluator.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Rules\Services;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\ValueObjects\Response\RuleEvaluationResult;
+
+class RuleEvaluator //For using AbstractRule
+{
+    /**
+     * Evaluate multiple rules.
+     *
+     * @param AbstractRule[] $rules
+     * @param DataTransferObject|null $object
+     * @return RuleEvaluationResult
+     */
+    public function evaluate(array $rules, ?DataTransferObject $object = null): RuleEvaluationResult
+    {
+        $messages = [];
+        $success = true;
+
+        foreach ($rules as $rule) {
+            try {
+                if (!$rule->passes($object)) {
+                    $success = false;
+                    $messages[] = get_class($rule) . ' failed without exception';
+                }
+            } catch (AccessForbiddenException | RequestValidationException | CriteriaNotFulfilledException $e) {
+                $success = false;
+                $messages[] = $e->getMessage();
+            } catch (\Exception $e) {
+                $success = false;
+                $messages[] = 'Unexpected error in ' . get_class($rule) . ': ' . $e->getMessage();
+            }
+        }
+
+        return new RuleEvaluationResult($success, $messages);
+    }
+
+}
diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanProceedEInvoicePromptedRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanProceedEInvoicePromptedRule.php
new file mode 100644
index 00000000..dcddbcdd
--- /dev/null
+++ b/app/Classes/Modules/Rules/Standards/Rules/CanProceedEInvoicePromptedRule.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Rules\Standards\Rules;
+
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+
+class CanProceedEInvoicePromptedRule extends AbstractRule
+{
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * CanProceedEInvoicePromptedRule constructor.
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(FetchesCompany $fetchesCompany)
+    {
+        $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 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.");
+        }
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanProceedPurchaseOrderRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanProceedPurchaseOrderRule.php
new file mode 100644
index 00000000..f9483835
--- /dev/null
+++ b/app/Classes/Modules/Rules/Standards/Rules/CanProceedPurchaseOrderRule.php
@@ -0,0 +1,96 @@
+<?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\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentNameConstants;
+use App\Classes\ValueObjects\Constants\ServiceTypeNameConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\ServiceType;
+use Illuminate\Support\Facades\Log;
+
+class CanProceedPurchaseOrderRule extends AbstractRule
+{
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * CanProceedPurchaseOrderRule 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 the transfer/booking already has purchase order filled
+        $booking = $this->fetchesBooking->execute(['id' => $object->bookingId]);
+        $purchaseOrder = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+
+        $isPOEmptyException = false;
+        if (!$purchaseOrder || $purchaseOrder->status === ApprovalStatus::PENDING_SUBMISSION) {
+            $isPOEmptyException = true;
+        }
+
+        if($isPOEmptyException){ //If PO is indeed empty, there are some scenarios where PO actually can be left empty
+            $ids = ServiceType::whereIn('name', [
+                ServiceTypeNameConstants::PAYMENT_1688,
+                ServiceTypeNameConstants::VIP_1688,
+            ])->get()->pluck('id');
+
+            //It can be left empty when booking is of type 1688: specifcally: 1688 Payment and 1688 VIP
+            if (in_array($booking->service_id, $ids->all())) {
+                $isPOEmptyException = false;
+            }
+
+            //However when the customer falls under the segment '1688 Manual PO Periodic', even if their booking is of type 1688 (1688 Payment and 1688 VIP),
+            //they still must fill up the PO. Confusing?? IKR
+            $company = $this->fetchesCompany->execute(['id' => $object->companyId]);
+            $filteredSegments = $company->segments()->where('name', SegmentNameConstants::MANUAL_PO_PERIODIC_1688)->get();
+            if(!$isPOEmptyException){
+                if (!$filteredSegments->isEmpty()) {
+                    $isPOEmptyException = true;
+                }
+            }
+        }
+
+        if($isPOEmptyException){
+            throw new CriteriaNotFulfilledException("Please complete the purchase order form.");
+        }
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanProceedTINRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanProceedTINRule.php
new file mode 100644
index 00000000..a4adc674
--- /dev/null
+++ b/app/Classes/Modules/Rules/Standards/Rules/CanProceedTINRule.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Rules\Standards\Rules;
+
+
+use App\Classes\Exceptions\CriteriaNotFulfilledException;
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+
+class CanProceedTINRule extends AbstractRule
+{
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * CanProceedTINRule constructor.
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(FetchesCompany $fetchesCompany)
+    {
+        $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 TIN already provided if account requires E-Invoice
+        $company = $this->fetchesCompany->execute(['id' => $object->companyId]);
+        if($company->e_invoice === 1 && !$company->tin){
+            throw new CriteriaNotFulfilledException("Please provide all requested E-Invoice Info.");
+        }
+        return true;
+    }
+
+}
diff --git a/app/Classes/ValueObjects/Constants/SegmentNameConstants.php b/app/Classes/ValueObjects/Constants/SegmentNameConstants.php
new file mode 100644
index 00000000..a8e881d7
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/SegmentNameConstants.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class SegmentNameConstants {
+    public const MANUAL_PO_PERIODIC_1688 = "1688 Manual PO Periodic";
+}
diff --git a/app/Classes/ValueObjects/Constants/ServiceTypeNameConstants.php b/app/Classes/ValueObjects/Constants/ServiceTypeNameConstants.php
new file mode 100644
index 00000000..c3a40b50
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/ServiceTypeNameConstants.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class ServiceTypeNameConstants {
+
+    public const PAYMENT_1688 = '1688 PAYMENT';
+    public const VIP_1688 = '1688 VIP';
+}
diff --git a/app/Classes/ValueObjects/Response/RuleEvaluationResult.php b/app/Classes/ValueObjects/Response/RuleEvaluationResult.php
new file mode 100644
index 00000000..264eaf26
--- /dev/null
+++ b/app/Classes/ValueObjects/Response/RuleEvaluationResult.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\ValueObjects\Response;
+
+class RuleEvaluationResult
+{
+    public bool $success = true;
+    public array $messages = [];
+
+    public function __construct(bool $success = true, array $messages = [])
+    {
+        $this->success = $success;
+        $this->messages = $messages;
+    }
+
+    public function failed(): bool
+    {
+        return ! $this->success;
+    }
+
+    public function passed(): bool
+    {
+        return $this->success;
+    }
+
+    public function messages(): array
+    {
+        return $this->messages;
+    }
+}
diff --git a/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php b/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php
new file mode 100644
index 00000000..d506e24e
--- /dev/null
+++ b/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+
+use App\Classes\Modules\Companies\ControllersLogic\FetchCompanyEInvoiceInfoLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchCompanyEInvoiceInfoController
+{
+    /**
+     * @param Request $request
+     * @param FetchCompanyEInvoiceInfoLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchCompanyEInvoiceInfoLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php b/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php
new file mode 100644
index 00000000..e8cbfd1c
--- /dev/null
+++ b/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyDetailsLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyDetailsController extends Controller
+{
+    /**
+     * @param Request $request
+     * @param UpdateCompanyDetailsLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCompanyDetailsLogic $logic) : JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php b/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php
new file mode 100644
index 00000000..9157e9de
--- /dev/null
+++ b/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyEInvoiceInfoLogic;
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyEInvoiceRequestLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyEInvoiceInfoController
+{
+    /**
+     * @param Request $request
+     * @param UpdateCompanyEInvoiceInfoLogic $logic
+     * @return JsonResponse
+     */
+    public function updateInfo(Request $request, UpdateCompanyEInvoiceInfoLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+     /**
+     * @param Request $request
+     * @param UpdateCompanyEInvoiceRequestLogic $logic
+     * @return JsonResponse
+     */
+    public function updateRequest(Request $request, UpdateCompanyEInvoiceRequestLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Rules/CheckRuleController.php b/app/Http/Controllers/Rules/CheckRuleController.php
new file mode 100644
index 00000000..881c6abe
--- /dev/null
+++ b/app/Http/Controllers/Rules/CheckRuleController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Rules;
+
+use App\Classes\Modules\Rules\ControllersLogic\CheckEInvoiceRuleLogic;
+use App\Classes\Modules\Rules\ControllersLogic\CheckPurchaseOrderRuleLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CheckRuleController
+{
+    /**
+     * @param Request $request
+     * @param CheckEInvoiceRuleLogic $logic
+     * @return JsonResponse
+     */
+    public function checkEInvoiceRule(Request $request, CheckEInvoiceRuleLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+    /**
+     * @param Request $request
+     * @param CheckPurchaseOrderRuleLogic $logic
+     * @return JsonResponse
+     */
+    public function checkPurchaseOrderRule(Request $request, CheckPurchaseOrderRuleLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 82b4cf3e..4e3ac2f0 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -37,11 +37,15 @@ class CompanyResource extends JsonResource
             'name' => $this->name,
             'reference' => $this->reference,
             'debtor' => $this->debtor,
+            'e_invoice' => $this->e_invoice,
+            'tin' => $this->tin,
+            'msic_code' => $this->msic_code,
             'type' => (int) $this->type,
             'business_type' => (int) $this->business_type,
             'status' => (int) $this->status,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
+            'address_einvoice' => $this->e_invoice ? new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', false)->where('e_invoice', true)->sortByDesc('created_at')->first())) : null,
             'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
diff --git a/app/Http/Resources/EInvoiceInfoResource.php b/app/Http/Resources/EInvoiceInfoResource.php
new file mode 100644
index 00000000..9bf8c8c1
--- /dev/null
+++ b/app/Http/Resources/EInvoiceInfoResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class EInvoiceInfoResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'street_one' => $this->street_one,
+            'street_two' => $this->street_two,
+            'district' => $this->district,
+            'state' => $this->state,
+            'post_code' => $this->postcode,
+            'country' => $this->country,
+            'billing' => (int) $this->billing,
+            'msic_code' => (int) $this->msic_code,
+            'tin' => (int) $this->tin,
+            'e_invoice' => (int) $this->e_invoice,
+        ];
+    }
+}
diff --git a/app/Http/Resources/RuleResource.php b/app/Http/Resources/RuleResource.php
new file mode 100644
index 00000000..1fb42181
--- /dev/null
+++ b/app/Http/Resources/RuleResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RuleResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'isPassed' => $this->success,
+            'messages' => $this->messages,
+        ];
+    }
+}
diff --git a/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php b/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php
new file mode 100644
index 00000000..990a9e1c
--- /dev/null
+++ b/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddEinvoiceToAddressesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('addresses', function (Blueprint $table) {
+            $table->boolean('e_invoice')->default(false)->after('billing');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('addresses', function (Blueprint $table) {
+            $table->dropColumn('e_invoice');
+        });
+    }
+}
diff --git a/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php b/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php
new file mode 100644
index 00000000..ed5f2c58
--- /dev/null
+++ b/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTinToCompaniesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->string('tin')->nullable()->after('debtor');
+            $table->string('msic_code')->nullable()->after('debtor')->comment("5-digit code representing business activity");
+            $table->timestamp('e_invoice_requested_at')->nullable()->after('debtor');
+            $table->boolean('e_invoice')->nullable()->default(null)->after('debtor');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->dropColumn('tin');
+            $table->dropColumn('msic_code');
+            $table->dropColumn('e_invoice_requested_at');
+            $table->dropColumn('e_invoice');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
new file mode 100644
index 00000000..5478b2f3
--- /dev/null
+++ b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
@@ -0,0 +1,213 @@
+<template>
+    <div class="row p-t-25 text-left">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row" v-if="step === 1">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-15">
+                                <div class="col text-danger">
+                                    Please check carefully, you will not be able to edit this after confirm
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col-6 p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.tin">
+                                        <label>TIN</label>
+                                        <input class="form-control" name="tin" v-model="parameters.tin">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-6 p-l-5">
+                                    <validation-wrapper-component :validator="$v.parameters.msic_code" v-money="integer">
+                                        <label>
+                                            MSIC Code
+                                            <a href="https://sdk.myinvois.hasil.gov.my/codes/msic-codes/" target="_blank" rel="noopener noreferrer">
+                                                (View List)
+                                            </a>
+                                        </label>
+                                        <input class="form-control" name="msic_code" v-model="parameters.msic_code">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.street_one">
+                                        <label>Address Line 1</label>
+                                        <input class="form-control" name="street_one" v-model="parameters.street_one">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.street_two">
+                                        <label>Address Line 2</label>
+                                        <input class="form-control" name="street_two" v-model="parameters.street_two">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col-7 p-r-5">
+                                    <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                        <label>District</label>
+                                        <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-5 p-l-5">
+                                    <validation-wrapper-component :validator="$v.parameters.post_code" v-money="integer">
+                                        <label>Post Code</label>
+                                        <input class="form-control" name="post_code" v-model="parameters.post_code">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col text-right">
+                                    <button type="button"
+                                        class="btn btn-success btn-block b-rad-none"
+                                        @click="updateStep(2)">Update E-Invoice Info</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="step === 2">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="row m-b-15">
+                                <div class="col text-danger">
+                                    Please check carefully, you will not be able to edit this after confirm
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="padding-15 bg-master-lightest">
+                                        <p class="muted">TIN</p>
+                                        <p class="m-b-0">{{parameters.tin}}</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="padding-15 bg-master-lightest">
+                                        <p class="muted">MSIC Code</p>
+                                        <p class="m-b-0">{{parameters.msic_code}}</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="padding-15 bg-master-lightest">
+                                        <p class="muted">Billing Address</p>
+                                        <p class="m-b-0">{{parameters.street_one}} {{parameters.street_two}}, {{districts[parseFloat(parameters.district_id) - 1].city}} {{parameters.post_code}} {{districts[parseFloat(parameters.district_id) - 1].state.name}}, {{districts[parseFloat(parameters.district_id) - 1].country.name}}</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto p-r-5">
+                                    <button type="button" class="btn bg-master-lighter b-rad-none" @click="updateStep(1)">Edit E-Invoice Info</button>
+                                </div>
+                                <div class="col p-l-0">
+                                    <button type="button" class="btn btn-success btn-block b-rad-none" @click="submitForm()">Confirm E-Invoice Info</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, helpers } from 'vuelidate/lib/validators'
+
+    function notZero(value) {
+        return value !== 0 && value !== '0' && value !== null && value !== undefined
+    }
+
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true
+            },
+        },
+        watch: {
+            'id': function() {
+                this.parameters.company_id = this.id;
+            },
+            'eInvoiceData': function() {
+                this.resetForm();
+                this.parameters = {
+                    company_id: this.id,
+                    street_one:  this.eInvoiceData.street_one,
+                    street_two: this.eInvoiceData.street_two,
+                    district_id: this.eInvoiceData.district.id,
+                    post_code: this.eInvoiceData.post_code,
+                    tin: this.eInvoiceData.tin,
+                    msic_code: this.eInvoiceData.msic_code,
+                }
+            }
+        },
+        computed: {
+            districts () {
+                return this.$store.getters.getSelectableList('original_districtListSection');
+            }
+        },
+        data() {
+			return {
+			    step: 1,
+                parameters : {
+                    company_id: this.id,
+                    street_one:  '',
+                    street_two: '',
+                    district_id: '',
+                    post_code: 0,
+                    tin: '',
+                    msic_code: 0,
+				}
+			}
+		},
+        validations: {
+            parameters: {
+                street_one: { required },
+                street_two: {},
+                district_id: { required },
+                post_code: {
+                    required,
+                    notZero
+                },
+                tin: { required },
+                msic_code: {
+                    required,
+                    notZero
+                }
+            }
+        },
+        methods:{
+            updateStep(step){
+                if(step === 2){
+                    if(!this.validate()){ return; }
+                }
+                this.step = step
+            },
+            submitForm(){
+                this.submit((this.route('api.company.einvoice.info.update')), 'post', this.section, true, true);
+            },
+            successHandler(response){
+                this.$emit('eInvoiceInfoUpdated', response.payload.data);
+                this.closeModal();
+            }
+        },
+        mixins: [ModalFormHandler],
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
new file mode 100644
index 00000000..0f803545
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="row p-t-25 text-left">
+      <div class="col bg-white padding-40 b-rad-lg">
+        <div class="row m-b-10">
+            <div class="col text-center">
+                <h3>E-Invoice Info</h3>
+            </div>
+        </div>
+        <div class="row" v-if="eInvoiceData && eInvoiceData.district">
+          <div class="col">
+            <div class="padding-15 bg-master-lightest m-b-10">
+              <p class="muted">TIN</p>
+              <p class="m-b-0">{{ eInvoiceData.tin }}</p>
+            </div>
+            <div class="padding-15 bg-master-lightest m-b-10">
+              <p class="muted">MSIC Code</p>
+              <p class="m-b-0">{{ eInvoiceData.msic_code }}</p>
+            </div>
+            <div class="padding-15 bg-master-lightest">
+                <p class="muted">Billing Address</p>
+                <p class="mb-0">
+                    <a class="ml-2" data-toggle="collapse" href="#billingDetails" role="button" aria-expanded="false" aria-controls="billingDetails">
+                        {{eInvoiceData.street_one}} {{eInvoiceData.street_two}}, {{eInvoiceData.district.name}}, {{eInvoiceData.post_code}} {{eInvoiceData.state.name}}, {{eInvoiceData.country.name}}
+                    </a>
+                </p>
+
+                <div class="collapse mt-2" id="billingDetails">
+                    <ul class="list-unstyled mb-0">
+                    <li><strong>Street 1:</strong> {{eInvoiceData.street_one}}</li>
+                    <li><strong>Street 2:</strong> {{eInvoiceData.street_two}}</li>
+                    <li><strong>District:</strong> {{eInvoiceData.district.name}}</li>
+                    <li><strong>Postcode:</strong> {{eInvoiceData.post_code}}</li>
+                    <li><strong>State:</strong> {{eInvoiceData.state.name}}</li>
+                    <li><strong>Country:</strong> {{eInvoiceData.country.name}}</li>
+                    </ul>
+                </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            companyId: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                eInvoiceData: null,
+            }
+        },
+        created(){
+            this.fetchData();
+        },
+        methods: {
+            fetchData(){
+                this.submit(route('api.company.einvoice.info', this.companyId), 'get', 'eInvoiceInfoViewOnlySection', false, true)
+            },
+            successHandler(response){
+                this.eInvoiceData = response.payload.data;
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue
new file mode 100644
index 00000000..b5858ee3
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue
@@ -0,0 +1,833 @@
+<template>
+    <div class="row no-margin">
+        <div class="col">
+            <div class="row m-b-20 ">
+                <div class="col b-a b-grey padding-15">
+                    <div class="row align-items-center">
+                        <div class="col-auto p-r-0" ><div class="icon-thumbnail icon-35 mr-0 btn-rounded text-white light animate__animated animate__infinite" :class="[{'bg-danger': data.outstanding_amount > 0}, {'animate__pulse': data.outstanding_amount > 0}, {'bg-success': !data.outstanding_amount > 0}]"><span v-if="data.status !==3">3</span><i class='fa fa-check' v-if="data.status ===3"></i></div></div>
+                        <div class="col">
+                            <div class="fs-14 bold all-caps" :class="[{'text-success': !data.outstanding_amount > 0}]">Make full payment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-b-10 align-items-center">
+                <div class="col-auto bg-white p-t-10 p-b-5 p-l-20 p-r-20 text-center">
+                    <div class="row">
+                        <div class="col">
+                            <span class="flag-icon fs-20" :class="'flag-icon-'+data.conversion_currency.country.short_code.toLowerCase()"></span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 bold">{{this.data.conversion_currency.short_code}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding" style="margin-left: -8px;margin-right: -8px;z-index: 1;">
+                    <i class="fa fa-exchange text-master-lighter fs-20"></i>
+                </div>
+                <div class="col-auto bg-white p-t-10 p-b-5 p-l-20 p-r-20 text-center">
+                    <div class="row">
+                        <div class="col">
+                            <span class="flag-icon fs-20" :class="'flag-icon-'+data.convertible_currency.country.short_code.toLowerCase()"></span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 bold">{{this.data.convertible_currency.short_code}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10" v-if="false">
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 muted">
+                                {{ !item.purchase_order ? 'Please fill up purchase order to enjoy the cashback' : 'You have entitled to earn cashbback' }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10">
+                <div class="col">
+                    <recipient-bank-details-component :data="item" :section="section"></recipient-bank-details-component>
+                    <div class="row" style="margin-top: -20px" v-if="$store.getters.isAdmin">
+                        <div class="col-auto">
+                            <p class="text-complete text-underline m-b-0 fs-12 pointer" @click="toggleEditRecipientBankDetailsCollapsed">{{ isEditRecipientBankDetailsCollapsed ? '< Back' : 'Change recipient bank details' }}</p>
+                        </div>
+                    </div>
+                    <div class="row" style="margin-top: -20px" v-if="!$store.getters.isAdmin && isAnyPaymentRecipientBankEdited">
+                        <div class="col-auto">
+                            <p class="text-complete text-underline m-b-0 fs-12 pointer" @click="toggleEditRecipientBankDetailsCollapsed">{{ isEditRecipientBankDetailsCollapsed ? '< Back' : 'Show edited recipient bank details on payment' }}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="collapse" :class="{ show: isEditRecipientBankDetailsCollapsed }" ref="collapseContent" v-if="$store.getters.isAdmin">
+                <recipient-bank-details-component :data="item" :section="section" :isEditButtonHidden="false"></recipient-bank-details-component>
+                <edit-payment-recipient-bank-details-component :data="item" :section="section" :isEditButtonHidden="false"></edit-payment-recipient-bank-details-component>
+            </div>
+
+            <div class="collapse" :class="{ show: isEditRecipientBankDetailsCollapsed }" ref="collapseContent" v-if="!$store.getters.isAdmin && isAnyPaymentRecipientBankEdited">
+                <edit-payment-recipient-bank-details-component :data="item" :section="section" :isEditButtonHidden="true"></edit-payment-recipient-bank-details-component>
+            </div>
+
+            <div class="row">
+                <div class="col bg-white padding-15">
+                    <div class="row" v-if="!expandPayment">
+                        <div class="col">
+                            <div class="row align-items-end m-b-10 text-complete">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-12">Transfer Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12"><i class="fa fa-edit fs-12 pointer fa-fw requestModal" data-type="editBookingAmount" v-if="$store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)"></i> {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editBookingAmount">
+                                    <edit-booking-amount-form-component :data="this.data" :section="section"></edit-booking-amount-form-component>
+                                </modal-component>
+                            </div>
+                            <div class="row align-items-end m-b-10 text-success">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-12">Paid Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end m-b-10  ">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-12">Floating Amount:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bold text-danger">
+                                <div class="col">
+                                    <div class="font-heading all-caps fs-12">OutStanding Total:</div>
+                                </div>
+                                <div class="col-auto text-right">
+                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20" v-if="data.company.employee.status === 2 && data.company.status === 2 && (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100) > 0">
+                                <div class="col">
+                                    <button id="payment-btn" class="btn btn-sm all-caps b-rad-none btn-success btn-block" @click="makePayment()">Make Payment</button>
+                                </div>
+                            </div>
+
+                            <!-- E-Invoice - start -->
+                            <div class="row m-t-10"
+                                v-if="(data.company.e_invoice !== null && data.company.e_invoice === 0) || showModalEInvoiceRequest">
+                                <div class="col text-right">
+                                    <a
+                                        id="e-invoice-request-link"
+                                        href="javascript:void(0);"
+                                        class="fs-12 text-complete text-underline pointer requestModal"
+                                        data-type="requestEInvoice2"
+                                    >
+                                        I need E-Invoice Now
+                                    </a>
+                                    <modal-component
+                                        class="animate__animated animate__fast animate__fadeIn"
+                                        styleType="fill-in" type="requestEInvoice2" size="large">
+                                        <e-invoice-request-form-component
+                                            class="text-center"
+                                            :section="section"
+                                            :company-id="data.company.id"
+                                            @choice-made="handleEInvoiceRequestRespond"
+                                        />
+                                    </modal-component>
+                                </div>
+                            </div>
+                            <modal-component
+                                id="modal-einvoice-request"
+                                class="animate__animated animate__fast animate__fadeIn"
+                                styleType="fill-in" type="requestEInvoiceA" size="large">
+                                <e-invoice-request-form-component
+                                    class="text-center"
+                                    :section="section"
+                                    :company-id="data.company.id"
+                                    @choice-made="handleEInvoiceRequestRespond"
+                                />
+                            </modal-component>
+                            <modal-component
+                                id="modal-einvoice-info"
+                                class="animate__animated animate__fast animate__fadeIn"
+                                styleType="fill-in" type="requestEInvoiceB" size="large">
+                                <e-invoice-info-form-component
+                                    :section="section"
+                                    :id="data.company.id"
+                                    v-on:eInvoiceInfoUpdated="updatedEInvoiceInfo($event)"
+                                    v-on:close="createAddress = !createAddress">
+                                </e-invoice-info-form-component>
+                            </modal-component>
+                            <!-- E-Invoice - end -->
+                        </div>
+                    </div>
+                    <div class="row" v-if="expandPayment && !calculation">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                                        <div class="col">
+                                            <small class="bold fs-10 text-danger">{{error}}</small>
+                                        </div>
+                                    </div>
+                                    <div class="row hide">
+                                        <div class="col-8">
+                                            <div class="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="paymentMethod.status = !paymentMethod.status">
+                                                <div class="row">
+                                                    <div class="col p-t-10 p-b-10">
+                                                        {{paymentMethod.name}}
+                                                    </div>
+                                                    <div class="col-auto bg-complete-light">
+                                                        <div class="row h-100 align-items-center">
+                                                            <div class="col">
+                                                                <i class="fa" :class="[{'fa-angle-down': !paymentMethod.status}, {'fa-angle-up': paymentMethod.status}]"></i>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="relative w-100">
+                                                <div class="absolute w-100 b-l b-b b-r b-complete" :class="[{'hide': !paymentMethod.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                    <div class="row text-left no-margin bg-white">
+                                                        <div class="col no-padding">
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Bank Transfer'}, {'text-white': paymentMethod.name === 'Bank Transfer'}, {'hover-complete': paymentMethod.name !== 'Bank Transfer'}]" @click="updatePaymentType({name: 'Bank Transfer', id: 'cash'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Bank Transfer</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cash Deposit'}, {'text-white': paymentMethod.name === 'Cash Deposit'}, {'hover-complete': paymentMethod.name !== 'Cash Deposit'}]"  @click="updatePaymentType({name: 'Cash Deposit', id: 'cash'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Cash Deposit</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cheque'}, {'text-white': paymentMethod.name === 'Cheque'}, {'hover-complete': paymentMethod.name !== 'Cheque'}]" @click="updatePaymentType({name: 'Cheque', id: 'cheque'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Cheque</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Banker\'s Acceptance'}, {'text-white': paymentMethod.name === 'Banker\'s Acceptance'}, {'hover-complete': paymentMethod.name !== 'Banker\'s Acceptance'}]" @click="updatePaymentType({name: 'Banker\'s Acceptance', id: 'ba'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Banker's Acceptance</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Online Transfer'}, {'text-white': paymentMethod.name === 'Online Transfer'}, {'hover-complete': paymentMethod.name !== 'Online Transfer'}]" @click="updatePaymentType({name: 'Online Transfer', id: 'payment_gateway'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Online Transfer</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0 m-b-15">
+                                        <div class="col p-r-0">
+                                            <validation-wrapper-component :validator="$v.amount">
+                                                <label>Amount</label>
+                                                <input class="form-control" name="amount" v-model.lazy="amount" v-money="{decimal: '.',thousands: ',', precision: 2}">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto b-r b-t b-b b-grey">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted">{{this.data.fixed_currency.short_code}}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0 m-b-5" v-show="showApplyVoucher">
+                                         <div class="col p-r-0">
+                                             <validation-wrapper-component :validator="$v.amount">
+                                                <div class="row" style="padding-bottom: 3px;">
+                                                    <div class="col">
+                                                        <label>Enter Voucher</label>
+                                                        <input class="form-control" name="voucherCode" v-model.lazy="voucherCode" @keyup="updateVoucherFlag($event)">
+                                                    </div>
+                                                    <div class="col-auto p-l-0 p-r-0">
+                                                        <div class="col-auto p-0 h-100">
+                                                            <button @click="applyVoucherCode()" class="h-100 btn btn-sm btn-primary b-rad-none all-caps p-l-30 p-r-30 rounded">
+                                                                Apply
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-auto p-r-10 p-l-10">
+                                                        <div @click="removeVoucher()" class="h-100 btn btn-sm btn-secondary b-rad-none all-caps rounded d-flex justify-content-center align-items-center">
+                                                            <i class="fa fa-times muted"></i>
+                                                        </div>
+                                                    </div>
+                                                    <!-- <div class="col-auto p-r-10 p-l-10">
+                                                        <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
+                                                            <i class="fa fa-list"></i>
+                                                        </button>
+                                                    </div> -->
+                                                </div>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <!-- <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
+                                            <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
+                                        </modal-component> -->
+                                    </div>
+                                    <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher" style="height: 20px">
+                                        <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
+                                        <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
+                                        <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
+                                    </div>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-5">
+                                        <div class="col">
+                                            <div class="row p-l-15 p-r-15">
+                                                <div class="col m-r-5 text-center">
+                                                    <div class="row h-100">
+                                                        <div class="col b-a padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Online Transfer', 'text-primary': paymentMethod.name === 'Online Transfer', 'b-grey': paymentMethod.name !== 'Online Transfer' }" @click="updatePaymentType({name: 'Online Transfer', id: 'payment_gateway'})">
+                                                            <div class="m-b-15 m-t-10 text-center">
+                                                            <img :src="asset('images/fpx-logo-vector-01.png')" alt="logo" height="25">
+                                                            </div>
+                                                            <p id="online-banking" class="no-margin bold all-caps">Online Banking</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="col m-l-5 text-center">
+                                                    <div class="row h-100">
+                                                        <div class="col b-a padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Wallet', 'text-primary': paymentMethod.name === 'Wallet', 'b-grey': paymentMethod.name !== 'Wallet' }" @click="updatePaymentType({name: 'Wallet', id: 'wallet'})">
+                                                            <div class="m-b-10 text-center">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="40" height="40"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="47.41556" y1="114.21875" x2="47.41556" y2="136.68625" gradientUnits="userSpaceOnUse" id="color-1_DGsE9caX0XGr_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="21.78488" x2="86" y2="154.10125" gradientUnits="userSpaceOnUse" id="color-2_DGsE9caX0XGr_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="27.50388" x2="111.53125" y2="49.92569" gradientUnits="userSpaceOnUse" id="color-3_DGsE9caX0XGr_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="63.15625" y1="54.32244" x2="63.15625" y2="64.45969" gradientUnits="userSpaceOnUse" id="color-4_DGsE9caX0XGr_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_2"><path d="M55.9,134.375h-15.5875c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-15.5875c0,-1.075 1.34375,-1.88125 2.41875,-1.075l16.93125,16.93125c0.80625,1.075 0,2.41875 -1.075,2.41875z" fill="url(#color-1_DGsE9caX0XGr_gr1)"></path><path d="M150.5,96.75v-37.625c0,-5.9125 -4.8375,-10.75 -10.75,-10.75h-7.525c1.34375,-2.95625 2.15,-6.18125 2.15,-9.40625c0,-12.63125 -10.2125,-22.84375 -22.84375,-22.84375c-12.63125,0 -22.84375,10.2125 -22.84375,22.84375c0,3.225 0.80625,6.45 2.15,9.40625h-12.9c-4.03125,-3.225 -9.1375,-5.375 -14.78125,-5.375c-5.64375,0 -10.75,2.15 -14.78125,5.375h-21.5c-2.95625,0 -5.64375,1.34375 -7.79375,3.225c-1.88125,2.15 -2.95625,4.8375 -2.95625,7.525v0v83.3125c0,7.525 5.9125,13.4375 13.4375,13.4375h107.5c7.525,0 13.4375,-5.9125 13.4375,-13.4375v-18.8125c2.95625,0 5.375,-2.41875 5.375,-5.375v-16.125c0,-2.95625 -2.41875,-5.375 -5.375,-5.375zM111.53125,21.5c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875zM111.53125,61.8125c6.9875,0 13.16875,-3.225 17.46875,-8.0625h10.75c2.95625,0 5.375,2.41875 5.375,5.375v8.0625c-2.15,-1.6125 -5.10625,-2.6875 -8.0625,-2.6875h-51.0625c-0.26875,-4.03125 -1.34375,-7.525 -3.49375,-10.75h11.55625c4.3,4.8375 10.48125,8.0625 17.46875,8.0625zM80.625,64.5h-34.9375c0.80625,-9.1375 8.33125,-16.125 17.46875,-16.125c9.1375,0 16.6625,6.9875 17.46875,16.125zM23.1125,55.3625c0.80625,-1.075 2.15,-1.6125 3.7625,-1.6125h16.93125c-1.88125,3.225 -3.225,6.71875 -3.49375,10.75h-13.16875c-2.95625,0 -5.375,-2.15 -5.64375,-5.10625c0,-1.34375 0.5375,-2.95625 1.6125,-4.03125zM145.125,142.4375c0,4.56875 -3.49375,8.0625 -8.0625,8.0625h-107.5c-4.56875,0 -8.0625,-3.49375 -8.0625,-8.0625v-74.175c1.6125,1.075 3.7625,1.6125 5.9125,1.6125h13.16875h42.73125h53.75c4.56875,0 8.0625,3.49375 8.0625,8.0625v18.8125h-5.375v-13.4375c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-96.75c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v53.75c0,4.56875 3.49375,8.0625 8.0625,8.0625h96.75c4.56875,0 8.0625,-3.49375 8.0625,-8.0625v-13.4375h5.375zM120.9375,96.75c-7.525,0 -13.4375,5.9125 -13.4375,13.4375c0,7.525 5.9125,13.4375 13.4375,13.4375h13.4375v13.4375c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-53.75c0,-1.6125 1.075,-2.6875 2.6875,-2.6875h96.75c1.6125,0 2.6875,1.075 2.6875,2.6875v13.4375zM129,110.1875c0,4.56875 -3.49375,8.0625 -8.0625,8.0625c-4.56875,0 -8.0625,-3.49375 -8.0625,-8.0625c0,-4.56875 3.49375,-8.0625 8.0625,-8.0625c4.56875,0 8.0625,3.49375 8.0625,8.0625zM131.6875,118.25c1.6125,-2.15 2.6875,-5.10625 2.6875,-8.0625c0,-2.95625 -1.075,-5.9125 -2.6875,-8.0625h18.8125v16.125z" fill="url(#color-2_DGsE9caX0XGr_gr2)"></path><circle cx="41.5" cy="14.5" transform="scale(2.6875,2.6875)" r="4.5" fill="url(#color-3_DGsE9caX0XGr_gr3)"></circle><path d="M74.98125,64.5c-0.80625,-5.9125 -5.64375,-10.75 -11.825,-10.75c-6.18125,0 -11.2875,4.8375 -11.825,10.75z" fill="url(#color-4_DGsE9caX0XGr_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <p class="no-margin bold all-caps">Wallet Credit</p>
+                                                            <p class="no-margin bold text-primary fs-10">(Better Rate)</p>
+                                                        </div>
+                                                        <span class="absolute hide" style="right: 45px;top: 5px;width: 25px;">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><defs><linearGradient x1="69.875" y1="85.484" x2="69.875" y2="94.92788" gradientUnits="userSpaceOnUse" id="color-1_BKgA84HSOQ-V_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="102.125" y1="111.67369" x2="102.125" y2="121.85394" gradientUnits="userSpaceOnUse" id="color-2_BKgA84HSOQ-V_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="15.38056" x2="86" y2="156.09806" gradientUnits="userSpaceOnUse" id="color-3_BKgA84HSOQ-V_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="15.38056" x2="86" y2="156.09806" gradientUnits="userSpaceOnUse" id="color-4_BKgA84HSOQ-V_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="15.38056" x2="69.875" y2="156.09806" gradientUnits="userSpaceOnUse" id="color-5_BKgA84HSOQ-V_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="102.125" y1="15.38056" x2="102.125" y2="156.09806" gradientUnits="userSpaceOnUse" id="color-6_BKgA84HSOQ-V_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="none" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none" fill-rule="nonzero"></path><g id="original-icon"><circle cx="26" cy="34" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_BKgA84HSOQ-V_gr1)" fill-rule="evenodd"></circle><circle cx="38" cy="44" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_BKgA84HSOQ-V_gr2)" fill-rule="evenodd"></circle><path d="M130.88125,42.19375c-1.88125,-2.41875 -4.56875,-4.03125 -7.525,-4.03125c-0.5375,0 -0.80625,0 -1.34375,0c-3.49375,0.5375 -6.45,2.6875 -7.525,5.9125l-2.95625,7.25625c-0.80625,1.88125 -2.15,2.15 -2.6875,2.15c0,0 0,0 -0.26875,0c-0.5375,0 -2.15,-0.26875 -2.95625,-2.15l-10.75,-29.025c-1.34375,-3.7625 -4.8375,-6.18125 -8.86875,-6.18125c-4.03125,0 -7.525,2.41875 -8.86875,6.45l-10.48125,29.29375c-0.80625,1.88125 -2.41875,2.41875 -2.95625,2.41875v0c-0.5375,0 -2.15,-0.26875 -2.95625,-2.15l-2.95625,-7.525c-1.34375,-3.225 -4.3,-5.64375 -7.525,-5.9125c-0.5375,0 -0.80625,0 -1.34375,0c-2.95625,0 -5.9125,1.34375 -7.525,4.03125c-15.5875,20.69375 -15.85625,49.9875 -15.85625,51.33125c0,34.13125 27.14375,61.8125 60.46875,61.8125c33.325,0 60.46875,-27.68125 60.46875,-61.8125c0,-1.34375 -0.26875,-30.6375 -15.5875,-51.86875zM86,150.5c-30.36875,0 -55.09375,-25.2625 -55.09375,-56.4375c0,-1.075 0.26875,-29.025 14.5125,-48.64375c0.80625,-1.075 1.88125,-1.6125 3.225,-1.6125c0.26875,0 0.26875,0 0.5375,0c1.6125,0.26875 2.6875,1.075 3.225,2.6875l2.95625,7.525c1.6125,4.03125 5.10625,5.64375 8.0625,5.64375c2.6875,0 6.45,-1.88125 8.0625,-5.9125l10.48125,-29.29375c0.80625,-1.88125 2.15,-2.95625 4.03125,-2.95625c1.88125,0 3.225,1.075 3.7625,2.6875l10.48125,29.29375c1.34375,4.03125 5.10625,5.64375 7.79375,5.64375h0.26875c2.6875,0 6.18125,-1.34375 7.79375,-5.375l2.95625,-7.25625c0.5375,-1.6125 1.88125,-2.41875 3.225,-2.6875c0.26875,0 0.26875,0 0.5375,0c1.34375,0 2.41875,0.5375 3.225,1.6125c14.24375,19.61875 14.5125,47.56875 14.5125,48.64375c0.5375,31.175 -24.1875,56.4375 -54.55625,56.4375z" fill="url(#color-3_BKgA84HSOQ-V_gr3)" fill-rule="nonzero"></path><path d="M105.35,76.325l-43,53.75l4.3,3.225l43,-53.75z" fill="url(#color-4_BKgA84HSOQ-V_gr4)" fill-rule="nonzero"></path><path d="M80.625,91.375c0,-5.9125 -4.8375,-10.75 -10.75,-10.75c-5.9125,0 -10.75,4.8375 -10.75,10.75c0,5.9125 4.8375,10.75 10.75,10.75c5.9125,0 10.75,-4.8375 10.75,-10.75zM64.5,91.375c0,-2.95625 2.41875,-5.375 5.375,-5.375c2.95625,0 5.375,2.41875 5.375,5.375c0,2.95625 -2.41875,5.375 -5.375,5.375c-2.95625,0 -5.375,-2.41875 -5.375,-5.375z" fill="url(#color-5_BKgA84HSOQ-V_gr5)" fill-rule="nonzero"></path><path d="M102.125,107.5c-5.9125,0 -10.75,4.8375 -10.75,10.75c0,5.9125 4.8375,10.75 10.75,10.75c5.9125,0 10.75,-4.8375 10.75,-10.75c0,-5.9125 -4.8375,-10.75 -10.75,-10.75zM102.125,123.625c-2.95625,0 -5.375,-2.41875 -5.375,-5.375c0,-2.95625 2.41875,-5.375 5.375,-5.375c2.95625,0 5.375,2.41875 5.375,5.375c0,2.95625 -2.41875,5.375 -5.375,5.375z" fill="url(#color-6_BKgA84HSOQ-V_gr6)" fill-rule="nonzero"></path></g></g></svg>
+                                                        </span>
+                                                        <span class="absolute hide" style="right: 15px;top: 5px;width: 25px;">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><defs><linearGradient x1="57.68181" y1="83.3125" x2="57.68181" y2="110.85938" gradientUnits="userSpaceOnUse" id="color-1_49456_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="81.24581" y1="83.3125" x2="81.24581" y2="110.85938" gradientUnits="userSpaceOnUse" id="color-2_49456_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="108.2955" y1="83.3125" x2="108.2955" y2="110.85938" gradientUnits="userSpaceOnUse" id="color-3_49456_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="92.74562" y1="11.42456" x2="80.64919" y2="156.54956" gradientUnits="userSpaceOnUse" id="color-4_49456_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="98.427" y1="11.89756" x2="86.33325" y2="157.02256" gradientUnits="userSpaceOnUse" id="color-5_49456_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M48.375,92.53331c0,-2.408 -0.06987,-3.84581 -0.19888,-6.53331h4.64669l0.258,2.6875h0.129c0.903,0 3.1175,-3.23844 6.60319,-3.23844c3.655,0 7.37719,2.74125 7.37719,9.36594v12.685h-5.375v-12.083c0,-3.01269 -1.0105,-5.29169 -3.89419,-5.29169c-2.107,0 -3.483,1.505 -4.042,3.096c-0.17469,0.47569 -0.129,1.12069 -0.129,1.72269v12.556h-5.375z" fill="url(#color-1_49456_gr1)"></path><path d="M76.68781,99.4375c0.129,2.6875 3.096,4.82944 6.45269,4.82944c2.451,0 4.214,-0.63963 5.80769,-1.24163l0.774,3.50719c-1.806,0.731 -4.30269,1.21744 -7.31269,1.21744c-6.79669,0 -10.79838,-4.20862 -10.79838,-10.61831c0,-5.80769 3.52869,-11.29019 10.23937,-11.29019c6.79669,0 9.03269,6.17319 9.03269,10.77688c0,0.989 -0.086,0.13169 -0.172,2.81919zM85.8925,96.75c0.043,-5.375 -0.817,-7.80719 -4.34569,-7.80719c-3.27069,0 -4.64669,2.43219 -4.86169,7.80719z" fill="url(#color-2_49456_gr2)"></path><path d="M98.18513,86l2.193,9.417c0.47569,2.236 0.94869,4.0205 1.33569,6.708h0.086c0.43,-2.6875 1.118,-4.515 1.72,-6.665l2.709,-9.46h4.30269l2.623,9.202c0.64769,2.451 1.20669,4.2355 1.67969,6.923h0.086c0.344,-2.6875 0.817,-4.472 1.376,-6.923l2.322,-9.202h5.20569l-6.58169,21.5h-4.90469l-2.494,-8.9655c-0.645,-2.19569 -1.118,-4.472 -1.591,-7.1595h-0.086c-0.43,2.6875 -0.989,5.0955 -1.591,7.1595l-2.66869,8.9655h-4.94769l-6.19469,-21.5z" fill="url(#color-3_49456_gr3)"></path><path d="M147.8125,92.35325c0,-4.15219 -2.82994,-8.16463 -7.71044,-11.11819c2.78156,-4.26775 3.53944,-8.557 2.05863,-12.08569c-1.60981,-3.83506 -5.77544,-6.46612 -11.43531,-7.34225c0.92181,-4.99606 -0.03762,-9.245 -2.76812,-11.94325c-2.58538,-2.55581 -6.66769,-3.54212 -11.47025,-2.8165c-1.22819,-4.32956 -3.60394,-7.3745 -6.84237,-8.69944c-4.3645,-1.77913 -10.07544,-0.16125 -15.26769,4.35375l3.52869,4.05813c3.51794,-3.05837 7.31806,-4.40212 9.70456,-3.43462c2.021,0.82775 3.57706,3.56094 4.16562,7.31806l0.46494,2.96431l2.89444,-0.78475c3.999,-1.07769 7.39331,-0.76325 9.04075,0.86537c1.74956,1.73075 1.98606,5.4395 0.61544,9.68306l-1.0965,3.39431l3.56363,0.11825c5.00144,0.16931 8.90369,1.87319 9.94375,4.35106c0.946,2.2575 -0.27681,5.77006 -3.19275,9.17244l-2.33544,2.72781l3.27875,1.47275c4.54725,2.03444 7.48469,5.07669 7.48469,7.74537c0,2.44562 -2.49669,5.23525 -6.51719,7.28581l-3.20081,1.62862l2.46981,2.61225c3.40237,3.59588 4.93156,7.50619 3.89956,9.96794c-1.11531,2.65525 -5.68944,4.48006 -11.03756,4.36719l-4.29194,-0.06719l1.81406,3.8915c1.978,4.24356 2.73587,9.77444 0.34669,12.13138c-1.8275,1.81137 -5.89906,1.98875 -10.37913,0.45687l-3.34056,-1.14219l-0.21231,3.52331c-0.2795,4.64131 -1.99681,8.26944 -4.38063,9.24231c-2.39187,0.98362 -6.22694,-0.387 -9.76906,-3.49375l-2.63644,-2.31125l-1.54531,3.14975c-2.06131,4.19519 -5.06594,6.90419 -7.65669,6.90419c-2.58806,0 -5.59269,-2.71169 -7.65669,-6.90419l-1.548,-3.14706l-2.63375,2.31125c-3.53944,3.10406 -7.37719,4.46931 -9.76906,3.49375c-3.27875,-1.33838 -4.57681,-6.82356 -4.39944,-11.352l0.16931,-4.25162l-3.91031,1.67431c-4.94231,2.10969 -9.84162,2.16881 -11.91369,0.12363c-1.91081,-1.88663 -2.01562,-6.08181 -0.26875,-10.68281l1.27119,-3.33787l-3.56094,-0.29563c-4.52038,-0.37356 -7.91469,-2.01294 -8.86875,-4.28387c-1.032,-2.46175 0.49988,-6.37206 3.89956,-9.96794l2.46981,-2.61225l-3.20081,-1.62863c-4.0205,-2.04787 -6.51719,-4.84019 -6.51719,-7.28581c0,-2.66869 2.93744,-5.71094 7.482,-7.75344l3.27875,-1.47275l-2.33544,-2.72781c-2.91594,-3.40237 -4.13606,-6.91494 -3.19275,-9.17244c0.88956,-2.11506 3.88075,-3.68456 8.00606,-4.20056l3.00194,-0.37356l-0.72831,-2.94013c-0.91106,-3.68456 -0.53481,-6.79131 1.00512,-8.31244c1.83287,-1.81406 5.90713,-1.98875 10.37644,-0.45688l3.34325,1.14487l0.20962,-3.52869c0.2795,-4.644 1.99681,-8.26944 4.38063,-9.24231c2.39994,-0.989 6.22962,0.38969 9.76906,3.49375l3.54213,-4.042c-5.20838,-4.57144 -10.95425,-6.22425 -15.34563,-4.42631c-3.68994,1.51038 -6.31025,5.38575 -7.31269,10.64519c-5.29169,-1.10187 -9.91688,-0.19888 -12.74413,2.59075c-2.48325,2.45369 -3.50181,6.16512 -2.96431,10.62369c-4.70312,1.15025 -8.09744,3.60394 -9.49763,6.9445c-1.4835,3.52869 -0.72562,7.81794 2.05863,12.08569c-4.87781,2.95625 -7.70775,6.96869 -7.70775,11.12088c0,3.81894 2.36231,7.49275 6.58169,10.37913c-3.36744,4.57681 -4.42362,9.35519 -2.8165,13.19294c1.47813,3.526 5.08475,6.02 10.105,7.08962c-1.34106,5.50669 -0.47031,10.32269 2.50475,13.25744c3.58244,3.54481 9.19394,3.60125 14.19,2.25213c0.55631,5.22181 2.73856,10.71238 7.60294,12.7065c3.69531,1.51037 8.31244,0.59394 12.77638,-2.43488c2.96162,4.48275 6.88,7.07888 10.86825,7.07888c3.99094,0 7.90931,-2.59613 10.86825,-7.08156c4.46662,3.02881 9.08912,3.94525 12.77638,2.43488c3.68994,-1.51306 6.30756,-5.38844 7.31,-10.64788c5.29169,1.10725 9.91956,0.19887 12.74412,-2.58537c3.72756,-3.68456 3.62275,-9.57556 2.11775,-14.61463c5.14119,-0.645 10.29044,-2.82994 12.22813,-7.45512c1.6125,-3.83775 0.55363,-8.61613 -2.81381,-13.19294c4.21938,-2.88637 6.58169,-6.56019 6.58169,-10.37912z" fill="url(#color-4_49456_gr4)"></path><path d="M75.25,61.8125c0,5.92862 4.82138,10.75 10.75,10.75c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-4.99606 -3.44,-9.16706 -8.0625,-10.36837v-19.19412c0,-5.92862 4.82137,-10.75 10.75,-10.75c5.92863,0 10.75,4.82138 10.75,10.75v2.6875h5.375v-2.6875c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125v19.19413c-4.6225,1.20131 -8.0625,5.37231 -8.0625,10.36838zM86,56.4375c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-5_49456_gr5)"></path></g></g></svg>
+                                                        </span>
+                                                        <span class="absolute" style="right: 5px;top: 5px;width: 25px;"><img :src="asset('images/hot.png')" class="w-100"></span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-t-10 m-b-10">
+                                                <div class="col text-center"><div id="expend-method" class="padding-10 bg-master-lightest pointer" @click="$store.dispatch('toggleSection', {name: 'otherPaymentMethods', status: !$store.getters.isShowing('otherPaymentMethods')})"><i class="fa m-r-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i>{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods <i class="fa m-l-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i></div></div>
+                                            </div>
+                                            <div class="row" v-show="$store.getters.isShowing('otherPaymentMethods')">
+                                                <div class="col">
+                                                    <div class="row m-b-10 p-l-15 p-r-15">
+                                                        <div class="col text-center m-r-5">
+                                                            <div class="row h-100">
+                                                                <div class="col b-a padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Cash Deposit', 'text-primary': paymentMethod.name === 'Cash Deposit', 'b-grey': paymentMethod.name !== 'Cash Deposit' }" @click="updatePaymentType({name: 'Cash Deposit', id: 'cash'})">
+                                                                    <div class="m-b-5 text-center">
+                                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                             width="35" height="35"
+                                                                             viewBox="0 0 172 172"
+                                                                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="15.45313" x2="86" y2="157.24562" gradientUnits="userSpaceOnUse" id="color-1_46094_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="62.14844" x2="86" y2="87.68238" gradientUnits="userSpaceOnUse" id="color-2_46094_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M142.4375,26.875h-18.8125v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-64.5c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375h-18.8125c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v86c0,4.44512 3.61737,8.0625 8.0625,8.0625h40.3125v10.75h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v2.6875h-10.75v5.375h10.75h69.875h10.75v-5.375h-10.75v-2.6875c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-10.75v-10.75h40.3125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-86c0,-4.44513 -3.61737,-8.0625 -8.0625,-8.0625zM123.625,96.75v-53.75h10.75v64.5h-96.75v-64.5h10.75v53.75zM107.5,91.375h-43v-48.64644c5.25675,-1.06962 9.40894,-5.22181 10.47856,-10.47856h22.04019c1.06963,5.25675 5.22181,9.40894 10.47856,10.47856v48.64644zM53.75,21.5h64.5v69.875h-5.375v-53.75h-2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-2.6875h-32.25v2.6875c0,4.44512 -3.61737,8.0625 -8.0625,8.0625h-2.6875v53.75h-5.375zM112.875,145.125c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-59.125v-2.6875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h32.25zM96.75,139.75h-21.5v-10.75h21.5zM145.125,120.9375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-40.3125h-32.25h-40.3125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-86c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h18.8125v5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375v64.5c0,2.96431 2.41069,5.375 5.375,5.375h96.75c2.96431,0 5.375,-2.41069 5.375,-5.375v-64.5c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375h18.8125c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-1_46094_gr1)"></path><path d="M86,64.5c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-2_46094_gr2)"></path></g></g></svg>
+                                                                    </div>
+                                                                    <p id="manual-transfer" class="no-margin bold">Manual Transfer</p>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col text-center m-l-5">
+                                                            <div class="row h-100">
+                                                                <div class="col b-a padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Cheque', 'text-primary': paymentMethod.name === 'Cheque', 'b-grey': paymentMethod.name !== 'Cheque' }" @click="updatePaymentType({name: 'Cheque', id: 'cheque'})">
+                                                                    <div class="m-b-5 text-center">
+                                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                             width="35" height="35"
+                                                                             viewBox="0 0 172 172"
+                                                                             style=" fill:#000000;"><defs><linearGradient x1="43" y1="68.19531" x2="43" y2="82.97656" gradientUnits="userSpaceOnUse" id="color-1_46095_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="31.91406" x2="86" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-2_46095_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="31.91406" x2="45.6875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-3_46095_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="43" y1="31.91406" x2="43" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-4_46095_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="59.125" y1="31.91406" x2="59.125" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-5_46095_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="26.875" y1="31.91406" x2="26.875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-6_46095_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="37.625" y1="31.91406" x2="37.625" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-7_46095_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="48.375" y1="31.91406" x2="48.375" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-8_46095_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="104.8125" y1="31.91406" x2="104.8125" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-9_46095_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="31.91406" x2="69.875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-10_46095_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="118.25" y1="31.91406" x2="118.25" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-11_46095_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M61.8125,80.625h-37.625v-8.1055c0,-1.45931 1.18519,-2.6445 2.6445,-2.6445h32.33331c1.462,0 2.64719,1.18519 2.64719,2.6445z" fill="url(#color-1_46095_gr1)"></path><path d="M155.875,59.125h-18.8125v-18.8125c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-112.875c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v64.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h18.8125v18.8125c0,4.44512 3.61738,8.0625 8.0625,8.0625h112.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-64.5c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM13.4375,104.8125v-64.5c0,-1.48081 1.20669,-2.6875 2.6875,-2.6875h112.875c1.48081,0 2.6875,1.20669 2.6875,2.6875v64.5c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-112.875c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875zM158.5625,131.6875c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-112.875c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875v-18.8125h88.6875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-40.3125h18.8125c1.48081,0 2.6875,1.20669 2.6875,2.6875z" fill="url(#color-2_46095_gr2)"></path><path d="M24.1875,48.375h43v5.375h-43z" fill="url(#color-3_46095_gr3)"></path><path d="M24.1875,59.125h37.625v5.375h-37.625z" fill="url(#color-4_46095_gr4)"></path><path d="M56.4375,86h5.375v10.75h-5.375z" fill="url(#color-5_46095_gr5)"></path><path d="M24.1875,86h5.375v10.75h-5.375z" fill="url(#color-6_46095_gr6)"></path><path d="M34.9375,86h5.375v10.75h-5.375z" fill="url(#color-7_46095_gr7)"></path><path d="M45.6875,86h5.375v10.75h-5.375z" fill="url(#color-8_46095_gr8)"></path><path d="M107.5,48.375h-5.375v5.375h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625h16.125c1.48081,0 2.6875,1.20669 2.6875,2.6875v5.375c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-24.1875v5.375h13.4375v5.375h5.375v-5.375h5.375c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-5.375c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-16.125c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875v-5.375c0,-1.48081 1.20669,-2.6875 2.6875,-2.6875h24.1875v-5.375h-13.4375z" fill="url(#color-9_46095_gr9)"></path><path d="M51.0625,120.9375h37.625v5.375h-37.625z" fill="url(#color-10_46095_gr10)"></path><path d="M99.4375,120.9375h37.625v5.375h-37.625z" fill="url(#color-11_46095_gr11)"></path></g></g></svg>
+                                                                    </div>
+                                                                    <p class="no-margin bold">Cheque</p>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!--paymentMethod.name === 'Online Transfer'-->
+                                            <div class="row" v-if="false">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="row m-b-15">
+                                                                <div class="col">
+                                                                    <div class="row m-b-10">
+                                                                        <div class="col">
+                                                                            <small class="fs-8 muted all-caps">Personal Account Banks</small>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col">
+                                                                            <div class="row">
+                                                                                <div class="col p-r-0">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'MBBEMYKL'}]" @click="selectOnlinePaymentBank('MBBEMYKL')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_maybank.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">Maybank2u</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'CIBBMYKL'}]" @click="selectOnlinePaymentBank('CIBBMYKL')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_cimb.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">CimbClicks</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="row m-b-10">
+                                                                        <div class="col">
+                                                                            <small class="fs-8 muted all-caps">Business Account Banks</small>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col">
+                                                                            <div class="row">
+                                                                                <div class="col p-r-0">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'MBB0227'}]" @click="selectOnlinePaymentBank('MBB0227')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_maybank.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">Maybank2E</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'B2B1-BCBB0235'}]" @click="selectOnlinePaymentBank('B2B1-BCBB0235')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_cimb.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">BizChannel</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+
+                                                    <div class="row m-t-10">
+                                                        <div class="col">
+                                                            <div class="row">
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-4 p-r-0">
+                                    <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="expandPayment = false">Cancel</button>
+                                </div>
+                                <div class="col p-l-0">
+                                    <button id="create-booking" class="btn btn-xs all-caps b-rad-none btn-success btn-block" :class="[{'hide': ((paymentMethod.name === '' && !voucherValidated) || (paymentMethod.name !== '' && (!voucherValidated && voucherCode !== '')) || (paymentMethod.name === '' && voucherValidated)) }]" @click="submitForm()">Create Booking</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" v-if="calculation">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row m-b-15 m-l-0 m-r-0" v-if="calculation.date">
+                                        <div class="col padding-15 bg-master-lightest text-center">
+                                            <div class="fs-14 muted" >The recipient will receive the transfer amount by <br><span class="bold text-success">{{ this.calculation.receive_date }}</span></div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-20 text-danger" v-if="(data.amount - parseFloat(amount.replace(',', '')))">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10">Outstanding</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-10">{{this.data.fixed_currency.short_code}} {{(Math.round(((this.data.outstanding_amount - parseFloat(amount.replace(',', '')))+ Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 text-success bold">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Recipient Gets</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">{{this.data.convertible_currency.short_code}} {{(Math.round((calculation.foreign_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end bold m-b-10 text-primary">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Rate</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12 ">{{(Math.round((calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5) }}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">You are sending</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((calculation.local_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Transfer Charges</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-20 ">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Sub Total</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((calculation.sub_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Voucher</div>
+                                        </div>
+                                        <div class="col-auto text-right" v-if="calculation.voucher_discount_amount">
+                                            <div class="font-heading fs-12">- MYR {{(Math.round((calculation.voucher_discount_amount + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                        <div class="col-auto text-right" v-else>
+                                            <div class="font-heading fs-12">- MYR 0.00</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-5 hint-text">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Tax {{(Math.round((calculation.tax + Number.EPSILON) * 10) / 10).toFixed(1)}}%</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((calculation.tax_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 bold text-success">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">You are paying</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-14">MYR {{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row" v-if="paymentMethod.id === 'wallet'">
+                                        <div class="col">
+                                            <div class="row m-b-10 m-l-0 m-r-0" v-if="paymentMethod.id === 'wallet' && walletOutstanding < 0">
+                                                <div class="col bg-danger-lighter">
+                                                    <h6 class="text-danger fs-14 bold">You don't have sufficient credit in your wallet to complete this transaction. Please Reload your wallet.</h6>
+                                                    <p class="text-complete fs-12 text-underline pointer" @click="calculation = ''">change the payment method?</p>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20" v-if="paymentMethod.id === 'wallet' && walletOutstanding < 0">
+                                                <div class="col">
+                                                    <wallet-top-up-form-component :data="data.company" :amount="(Math.round(((walletOutstanding * -1)+ Number.EPSILON) * 100) / 100).toFixed(2)"></wallet-top-up-form-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row parentContainer" >
+                                <div class="col-4 p-r-0">
+                                    <button class="btn btn-sm all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="cancelQuotation()">Cancel</button>
+                                </div>
+                                <div class="col p-l-0" >
+                                    <!-- E-Invoice -->
+                                    <button id="lock-booking" class="btn btn-sm all-caps b-rad-none btn-success btn-block"
+                                    v-if="paymentMethod.id !== 'wallet' || walletOutstanding >= 0"
+                                    @click.prevent="checkPurchaseOrderRule">Lock Booking</button>
+                                </div>
+                                <modal-component id="confirm-booking-modal" v-if="calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentSummary">
+                                    <confirm-quotation-form-component v-on:cancelQuotation="cancelQuotation()" :calculation="calculation" :section="section" :id="item.id" :payment_method="paymentMethod.id" :bank_code="onlinePayment.id" :amount="amount"  :company-id="item.company.id"></confirm-quotation-form-component>
+                                </modal-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from "../../../general/mixins/componentHandler";
+    import { required, requiredIf, minValue, maxValue} from "vuelidate/lib/validators";
+    import {VMoney} from 'v-money'
+    export default {
+        props : {
+            section: {
+                type: String,
+                required: true
+            }
+        },
+        data(){
+            return {
+                error: '',
+                expandPayment: false,
+                paymentMethod: {
+                    name: '',
+                    id: '',
+                    status: false
+                },
+                onlinePayment: {
+                    id: '',
+                    status: false
+                },
+                amount: (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2),
+                calculation: null,
+                voucherCode: '',
+                voucherCodeFailedReason: '',
+                voucherValidated: false,
+                voucherIsChecking: false,
+                showApplyVoucher: false,
+                recipientBanks: {
+                    company: this.data.company,
+                    serviceType: {
+                        status: false,
+                        id: this.data.service.id,
+                        name: this.data.service.name,
+                        currencies: this.data.service.configurations.currencies,
+                        selectedCurrency: this.data.service.configurations.currencies[0]
+                    },
+                    bankAccount: this.data.bank,
+                    bankAccountDefault: this.data.bank,
+                    recipientBanks: this.data.company.recipient_banks.accounts,
+                    bookingId: this.data.id
+                },
+                isEditRecipientBankDetailsCollapsed: false,
+                isAnyPaymentRecipientBankEdited: this.data.payment_history.some(payment => payment.bank_recipient_edited !== null && payment.bank_recipient_edited),
+                showModalConfirmBooking: false, //E-Invoice
+                showModalEInvoiceRequest: false, //E-Invoice
+            }
+        },
+        validations () {
+            return {
+                amount: {
+                    required,
+                }
+            }
+        },
+        computed: {
+            walletOutstanding(){
+                let walletBalance = this.data.company.wallet ? this.data.company.wallet.amount : 0;
+                return (walletBalance - this.calculation.total).toFixed(2);
+            }
+        },
+        methods: {
+            updatePaymentType(payment){
+                this.paymentMethod = {
+                    name: payment.name,
+                    id: payment.id,
+                    status: false,
+                }
+                this.error = '';
+            },
+            selectOnlinePaymentBank(bankCode){
+                this.onlinePayment = {
+                    id: bankCode,
+                    status: true,
+                }
+            },
+            submitForm(){
+                this.parameters = {
+                    payment_method: this.paymentMethod.id,
+                    voucherCode: this.voucherCode,
+                    amount: this.amount
+                };
+                this.submit(route('api.booking.payment.quotation', this.item.id), 'post', this.section, false, false)
+                this.calculation = null;
+            },
+            successHandler(response, section){ //E-Invoice
+                if(section === this.section + 'CheckEInvoiceRule'){
+                    if(response.payload.data.isPassed){
+                        this.amount = (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2);
+                        this.expandPayment = true;
+                    }
+                }
+                else if(section === this.section + 'CheckPurchaseOrderRule'){
+                    if(response.payload.data.isPassed){
+                        this.showModalConfirmBooking = true;
+                        $('#confirm-booking-modal').modal('show');
+                    }
+                }
+                else if(section === this.section + 'ValidateVoucher'){
+                    if(!response.payload.data){
+                        this.voucherValidated = false;
+                        this.voucherIsChecking = false;
+                        this.voucherCodeFailedReason = 'Something went wrong. Please contact customer service.'
+                    }
+                    else if(response.payload.data.valid !== undefined && response.payload.data.code){ //applyVoucherCode()
+                        this.voucherValidated = true;
+                        if(response.payload.data.reason){
+                            this.voucherCodeFailedReason = response.payload.data.reason;
+                            this.voucherValidated = false;
+                        }
+                        this.voucherIsChecking = false;
+                    }
+                }
+                else{ //submitForm()
+                    this.calculation = response.payload.data;
+                }
+
+            },
+            errorHandler(error, statusCode, section) { //E-Invoice
+                if(section === this.section + 'CheckEInvoiceRule' && statusCode === 422){
+                    $('#modal-einvoice-info').modal('show');
+                }
+                this.error = error.message;
+            },
+            makePayment(){ //E-Invoice
+                if(this.data.company.e_invoice === null){
+                    $('#modal-einvoice-request').modal('show');
+                }
+                else{
+                    this.checkEInvoiceRule();
+                }
+            },
+            cancelQuotation(){
+                this.calculation = null;
+                this.expandPayment = false;
+            },
+            removeVoucher(){
+                this.voucherCodeFailedReason = '';
+                this.voucherCode = '';
+                this.showApplyVoucher = false;
+            },
+            applyVoucherCode(){
+                this.voucherIsChecking = true;
+                this.voucherCodeFailedReason = '';
+                this.voucherValidated = false;
+                this.parameters = {
+                    voucherCode: this.voucherCode,
+                    amount: this.amount,
+                    itemId: this.item.id,
+                    payment_method: this.paymentMethod.id,
+                };
+                if(this.voucherCode.trim() !== ''){
+                    this.submit(route('api.voucher.validate'), 'post', this.section + 'ValidateVoucher', false, false); //E-Invoice
+                }
+                else{
+                    this.voucherCodeFailedReason = 'Please enter voucher code';
+                    this.voucherValidated = true;
+                    this.voucherIsChecking = false;
+                }
+            },
+            updateVoucherFlag(event){
+                this.voucherCodeFailedReason = '';
+                this.voucherValidated = false;
+                this.voucherCode = event.target.value;
+            },
+            handleSelectedVoucher(value){
+                this.voucherCode = value;
+            },
+            toggleEditRecipientBankDetailsCollapsed() {
+                this.isEditRecipientBankDetailsCollapsed = !this.isEditRecipientBankDetailsCollapsed;
+                if (this.isEditRecipientBankDetailsCollapsed) {
+                    $(this.$refs.collapseContent).collapse('show');
+                } else {
+                    $(this.$refs.collapseContent).collapse('hide');
+                }
+            },
+            //E-Invoice - Starts
+            checkEInvoiceRule(){
+                this.error = '';
+                this.parameters = {
+                    company_id: this.data.company.id,
+                };
+                this.submit(route('api.rule.check.einvoice'), 'post', this.section + 'CheckEInvoiceRule', false, true);
+            },
+            checkPurchaseOrderRule(){
+                this.error = '';
+                this.error = '';
+                this.parameters = {
+                    booking_id: this.data.id,
+                    company_id: this.data.company.id,
+                };
+                //this will check whether po has been submitted
+                this.submit(route('api.rule.check.purchase.order'), 'post', this.section + 'CheckPurchaseOrderRule', false, true);
+            },
+            updatedEInvoiceInfo(info){
+                this.$store.dispatch('reloadList', {'name': "bookingDetailSection"});
+            },
+            handleEInvoiceRequestRespond({ choice }) {
+                this.showModalEInvoiceRequest = false;
+                if(!choice){
+                    this.showModalEInvoiceRequest = true;
+                }
+            }
+            //E-Invoice - Ends
+        },
+        mixins: [componentHandler],
+        directives: {money: VMoney}
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
index 975c4592..3b440ab2 100644
--- a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
@@ -111,7 +111,11 @@
             section: {
                 type: String,
                 required: true
-            }
+            },
+            companyId: {
+                type: Number,
+                required: true
+            },
         },
         data(){
             return {
@@ -121,14 +125,16 @@
                     amount: this.amount,
                     bank_code: this.bank_code,
                     voucher_code: this.calculation.voucher_code,
-                    voucher_discount_amount: this.calculation.voucher_discount_amount
+                    voucher_discount_amount: this.calculation.voucher_discount_amount,
+                    booking_id: this.id,
+                    company_id: this.companyId,
                 }
             }
         },
         methods: {
             submitForm(){
                 this.isLoading = true;
-                this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, false);
+                this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, true);
             },
             successHandler(response){
                 if (response.payload.data.payment_method === 5) {
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index e12074b0..78d7df35 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -175,6 +175,21 @@
                                                                                 {{booking.company.contact ? booking.company.contact.phone: ''}}
                                                                             </p>
                                                                         </div>
+                                                                        <div class="col-auto">
+                                                                            <div class="font-heading fs-10 muted all-caps">TIN</div>
+                                                                            <p class="m-b-0 fs-12">
+                                                                                <span :class="[{'text-danger bold': !booking.company.e_invoice && !booking.company.tin }]">
+                                                                                    {{ booking.company.e_invoice
+                                                                                        ? (booking.company.tin ? booking.company.tin : 'INCOMPLETE E-INVOICE INFO')
+                                                                                        : 'NOT PROVIDED' }}
+                                                                                </span><br />
+                                                                                <a v-if="booking.company.e_invoice && booking.company.tin" class="pointer requestModal" data-type="eInvoiceInfo">View E-Invoice Info
+                                                                                </a>
+                                                                            </p>
+                                                                            <modal-component class="animate__animated animate__fast animate__fadeIn" v-if="booking.company.tin" styleType="fill-in" type="eInvoiceInfo">
+                                                                                <e-invoice-info-component :company-id="booking.company.id"></e-invoice-info-component>
+                                                                            </modal-component>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
                                                             </div>
@@ -308,7 +323,8 @@
                             </div>
                         </div>
                         <div class="col-12 col-sm-12 col-md-5 mt-3 mt-sm-0">
-                            <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component>
+                            <!-- <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component> -->
+                            <booking-payment-quotation-v2-component :data="booking" :section="section"></booking-payment-quotation-v2-component>
                             <div class="row m-t-20" v-if="booking.payment_attempts.length">
                                 <div class="col">
                                     <div class="row m-b-10">
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index 1435c448..d406e1ac 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -14,7 +14,8 @@
                             <div class="row">
                                 <div class="col">
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeCustomerName">
-                                        <change-customer-name-form-component :section="'customerProfileSection'" :data="item"></change-customer-name-form-component>
+                                        <!-- <change-customer-name-form-component :section="'customerProfileSection'" :data="item"></change-customer-name-form-component> -->
+                                        <change-customer-company-details-form-component :section="'customerProfileSection'" :data="item"></change-customer-company-details-form-component>
                                     </modal-component>
                                     <div class="font-heading fs-14 bold">
                                         {{item.name}}
diff --git a/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
new file mode 100644
index 00000000..1dc9ed4a
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
@@ -0,0 +1,147 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <h3>Edit Company Details</h3>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.name">
+                        <label class="text-primary">Name</label>
+                        <input class="form-control" v-model="parameters.name">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.debtor">
+                        <label class="text-primary">Debtor Code</label>
+                        <input class="form-control" v-model="parameters.debtor">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-b-5" v-if="data.e_invoice && data.tin">
+                <div class="col">
+                    E-Invoice Info
+                    <div class="row m-b-15">
+                        <div class="col-6 p-r-5">
+                            <validation-wrapper-component :validator="$v.parameters.tin">
+                                <label class="text-primary">TIN</label>
+                                <input class="form-control" v-model="parameters.tin">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-6 p-l-5">
+                            <validation-wrapper-component :validator="$v.parameters.msic_code">
+                                <label class="text-primary">
+                                    MSIC Code
+                                    <a href="https://sdk.myinvois.hasil.gov.my/codes/msic-codes/" target="_blank" rel="noopener noreferrer">
+                                        (View List)
+                                    </a>
+                                </label>
+                                <input class="form-control" name="msic_code" v-model="parameters.msic_code">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label class="text-primary">Address Line 1</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label class="text-primary">Address Line 2</label>
+                                <input class="form-control" name="street_two" v-model="parameters.street_two">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-7 p-r-5">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                <label class="text-primary">District</label>
+                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-5 p-l-5">
+                            <validation-wrapper-component :validator="$v.parameters.post_code">
+                                <label class="text-primary">Post Code</label>
+                                <input class="form-control" v-model="parameters.post_code">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, minLength } from "vuelidate/lib/validators";
+
+    export default {
+        validations: {
+            parameters: {
+                name: {
+                    required,
+                },
+                debtor: {},
+                tin: {},
+                msic_code: {},
+
+                address_id: {},
+                street_one: {},
+                street_two: {},
+                district_id: {},
+                post_code: {},
+            }
+        },
+        created() {
+            if (this.data) {
+                if (this.data.address_einvoice) {
+                    this.parameters.address_id = this.data.address_einvoice.id;
+                    this.parameters.street_one = this.data.address_einvoice.street_one;
+                    this.parameters.street_two = this.data.address_einvoice.street_two;
+                    this.parameters.district_id = this.data.address_einvoice.district.id;
+                    this.parameters.post_code = this.data.address_einvoice.post_code;
+                }
+            }
+        },
+        watch: {
+            'data': function(newData) {
+                if (newData && newData.address_einvoice) {
+                    this.parameters.address_id = newData.address_einvoice.id;
+                    this.parameters.street_one = newData.address_einvoice.street_one;
+                    this.parameters.street_two = newData.address_einvoice.street_two;
+                    this.parameters.district_id = newData.address_einvoice.district.id;
+                    this.parameters.post_code = newData.address_einvoice.post_code;
+                }
+            }
+        },
+        methods: {
+            successHandler(response) {
+                // window.location.replace(this.route('customers', response.payload.data.reference));
+                this.$emit('e-invoice-info', this.parameters);
+                this.closeModal();
+            },
+            submitForm() {
+                this.submit(this.route('api.company.update.details', this.data.id), 'put', this.section, true, true)
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
diff --git a/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue b/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
new file mode 100644
index 00000000..30828ea5
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="row">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" />
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Do you need E-Invoice?</h3>
+                            <div class="fs-11">You won't be able to request one after clicking 'No'.</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-block b-rad-none btn-danger" @click="handleChoice(false)">No</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-block b-rad-none btn-success" @click="handleChoice(true)">Yes</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from '../../../general/mixins/componentHandler';
+import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+export default {
+    props: {
+        section: {
+            type: String,
+            required: false
+        },
+        companyId: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            parameters : {
+                company_id: this.companyId,
+            }
+        }
+    },
+    methods: {
+        handleChoice(choice) {
+            this.parameters.e_invoice_request = choice ? true : false;
+            this.$emit('choice-made', { choice, params: this.parameters });
+            this.submitForm();
+        },
+        submitForm() {
+            return this.submit(route('api.company.einvoice.request.update'), 'post', this.section, true, true);
+        },
+        successHandler() {
+            this.closeModal();
+            this.formHandler();
+        }
+    },
+    mixins: [componentHandler, ModalFormHandler]
+}
+</script>
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index 4048415a..f8348b8a 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -20,7 +20,7 @@ export default {
                         if (!success) {
                             this.openModal();
                             errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
-                            this.errorHandler(response, statusCode); return;
+                            this.errorHandler(response, statusCode, section); return;
                         }
 
                         successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
@@ -29,7 +29,7 @@ export default {
                         link.href = window.URL.createObjectURL(response);
                         link.download = fileName.trim();
                         link.click();
-                        this.successHandler(response)
+                        this.successHandler(response, section)
                     });
                 } else {
                     response.json().then(response => {
@@ -37,11 +37,11 @@ export default {
                         if (!success) {
                             this.openModal();
                             errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
-                            this.errorHandler(response, statusCode); return;
+                            this.errorHandler(response, statusCode, section); return;
                         }
 
                         successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
-                        this.successHandler(response)
+                        this.successHandler(response, section)
 
 
                     });
diff --git a/routes/api.php b/routes/api.php
index ef7025a5..2e28d9c5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -71,6 +71,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/job.php';
 
+        require __DIR__ . '/rule.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/company.php b/routes/company.php
index d3e9d4ba..d88bd398 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -1,5 +1,8 @@
 <?php
 
+use App\Http\Controllers\Companies\FetchCompanyEInvoiceInfoController;
+use App\Http\Controllers\Companies\UpdateCompanyDetailsController;
+use App\Http\Controllers\Companies\UpdateCompanyEInvoiceInfoController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Companies'], function () {
@@ -36,4 +39,8 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
         Route::put('/{document_id}/approval/{status}', 'ApproveIdentificationDocumentController@approve')->where('status', 'approve|reject')->name('approval');
     });
 
+    Route::put('/details/update/{id}', [UpdateCompanyDetailsController::class, 'update'])->name('update.details');
+    Route::get('/e-invoice/info/{id}', [FetchCompanyEInvoiceInfoController::class, 'fetch'])->name('einvoice.info');
+    Route::post('/e-invoice/info/update', [UpdateCompanyEInvoiceInfoController::class, 'updateInfo'])->name('einvoice.info.update');
+    Route::post('/e-invoice/request/update', [UpdateCompanyEInvoiceInfoController::class, 'updateRequest'])->name('einvoice.request.update');
 });
diff --git a/routes/rule.php b/routes/rule.php
new file mode 100644
index 00000000..b2ea057b
--- /dev/null
+++ b/routes/rule.php
@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\Rules\CheckRuleController;
+
+Route::prefix('rule')
+    ->as('rule.')
+    ->group(function () {
+        Route::post('/check/eInvoice', [CheckRuleController::class, 'checkEInvoiceRule'])->name('check.einvoice');
+        Route::post('/check/purchase-order', [CheckRuleController::class, 'checkPurchaseOrderRule'])->name('check.purchase.order');
+    });
diff --git a/routes/web.php b/routes/web.php
index 7fd4d49c..8ff26d13 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -917,7 +917,7 @@ Route::get('/statements/{account}/transactions', function ($account) {
 })->name('statements.account.transactions');
 Route::get('/statements/{statement}', [BankStatementController::class, 'show'])->name('statements.show');
 Route::get('/statements/mapping/rerun', [BankStatementController::class, 'rerun'])->name('statements.rerun');
-Route::get('/statements/{statement}/download', 'StatementController@download')->name('statements.download');
+// Route::get('/statements/{statement}/download', 'StatementController@download')->name('statements.download');
 Route::get('/bank-record', 'Imports\ImportBankRecordController@import');
 
 Route::get('/po/outsource/check', function(){