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/Modules/Addresses/Services/UpsertsAddress.php b/app/Classes/Modules/Addresses/Services/UpsertsAddress.php
new file mode 100644
index 00000000..08bc26d4
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/UpsertsAddress.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Addressable;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Models\Address;
+use App\Models\CompanyModule;
+
+class UpsertsAddress extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * Create or update the company's address.
+     *
+     * @param Addressable $addressable
+     * @param AddressObject $object
+     * @param int $id
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Addressable $addressable, AddressObject $object, int $id)
+    {
+        //Create new or update?
+        $model = $addressable->addresses()->where('id', $id)->first() ?? new Address();
+
+        $model->reference = $object->getReference();
+        $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();
+        $model->status = $object->getStatus();
+        $model->type = $object->getType();
+
+        return $this->handler($addressable->addresses(), $model);
+    }
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php
new file mode 100644
index 00000000..30f7642c
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyEInvoiceInfoLogic.php
@@ -0,0 +1,69 @@
+<?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\Classes\ValueObjects\Constants\AddressType;
+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->companyModules()->first()->addresses()->where('type', '=', AddressType::E_INVOICE)->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..fe1c2c23
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyDetailsLogic.php
@@ -0,0 +1,133 @@
+<?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\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\Companies\Services\UpdatesCompanyModuleName;
+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\CompanyObject;
+use App\Classes\Modules\Companies\DataTransferObjects\UpdateCompanyDetailsDTO;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+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 UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
+    /**
+     * UpdateCompanyDetailsLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesDistrict $fetchesDistrict
+     * @param UpsertsAddress $upsertsAddress
+     * @param UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo;
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
+     */
+    public function __construct(
+        CanUpdateCompany $canUpdateCompany,
+        UpdatesCompany $updatesCompany,
+        FetchesCompany $fetchesCompany,
+        UpdatesCompanyDebtor $updatesCompanyDebtor,
+        CanCreateAddress $canCreateAddress,
+        FetchesDistrict $fetchesDistrict,
+        UpsertsAddress $upsertsAddress,
+        UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo,
+        UpdatesCompanyModuleName $updatesCompanyModuleName
+    )
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->upsertsAddress = $upsertsAddress;
+        $this->updatesCompanyEInvoiceInfo = $updatesCompanyEInvoiceInfo;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $dto = new UpdateCompanyDetailsDTO($request->all());
+        $object = new CompanyObject($dto->name, $dto->reference, $dto->type);
+
+        $this->canUpdateCompany->passes($object);
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->updatesCompanyModuleName->execute($company->companyModules()->first(), $object->getName());
+
+        //Update Name and Debtor, Type
+        $company = $this->updatesCompany->execute($company, $object);
+
+        if ($request->input('debtor') || $company->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($company, $request->input('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, $dto->stateId, $district->id, $dto->postCode, AddressType::E_INVOICE, ApprovalStatus::APPROVED, 'E-Invoice');
+
+            $this->canCreateAddress->passes($addObj);
+
+            $this->upsertsAddress->execute($company->companyModules()->first(), $addObj, $dto->addressId);
+            $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..319fa1a2
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
@@ -0,0 +1,109 @@
+<?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\Standards\Rules\CanCreateAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyEInvoiceInfo;
+use App\Classes\Modules\Companies\DataTransferObjects\EInvoiceInfoDTO;
+use App\Classes\Modules\Rules\Services\RuleEvaluator;
+use App\Classes\Modules\Rules\Standards\Rules\CanPassEInvoicePromptedRule;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+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 FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var RuleEvaluator */
+    private $ruleEvaluator;
+
+    /** @var UpdatesCompanyEInvoiceInfo */
+    private $updatesCompanyEInvoiceInfo;
+
+    /** @var CanPassEInvoicePromptedRule */
+    private $canPassEInvoicePromptedRule;
+
+    /**
+     * UpdateCompanyEInvoiceInfoLogic constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatesAddress $createsAddress
+     * @param RuleEvaluator $ruleEvaluator;
+     * @param UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo;
+     * @param CanPassEInvoicePromptedRule $canPassEInvoicePromptedRule
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, RuleEvaluator $ruleEvaluator, UpdatesCompanyEInvoiceInfo $updatesCompanyEInvoiceInfo, CanPassEInvoicePromptedRule $canPassEInvoicePromptedRule)
+    {
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsAddress = $createsAddress;
+        $this->ruleEvaluator = $ruleEvaluator;
+        $this->updatesCompanyEInvoiceInfo = $updatesCompanyEInvoiceInfo;
+        $this->canPassEInvoicePromptedRule = $canPassEInvoicePromptedRule;
+    }
+
+    /**
+     * @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([
+            $this->canPassEInvoicePromptedRule,
+        ], $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, $dto->stateId, $district->id, $dto->postCode, AddressType::E_INVOICE, ApprovalStatus::APPROVED, 'E-Invoice');
+
+        //Update Address
+        $this->canCreateAddress->passes($object);
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $dto->companyModuleId]);
+        $this->createsAddress->execute($companyModule, $object);
+
+        //Update tin, msic code
+        $this->updatesCompanyEInvoiceInfo->execute($companyModule->company, $dto->tin, $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..a065802d
--- /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\FetchesCompanyModule;
+use App\Classes\Modules\Companies\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 FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var UpdatesCompanyEInvoiceRequest */
+    private $updatesCompanyEInvoiceRequest;
+
+
+    /**
+     * UpdateCompanyEInvoiceRequestLogic constructor.
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param UpdatesCompanyEInvoiceRequest $updatesCompanyEInvoiceRequest
+     */
+    public function __construct(FetchesCompanyModule $fetchesCompanyModule, UpdatesCompanyEInvoiceRequest $updatesCompanyEInvoiceRequest)
+    {
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $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());
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $dto->companyModuleId]);
+        $this->updatesCompanyEInvoiceRequest->execute($companyModule->company, $dto->eInvoiceRequest);
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceInfoDTO.php b/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceInfoDTO.php
new file mode 100644
index 00000000..a9cf02f1
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceInfoDTO.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Companies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class EInvoiceInfoDTO implements DataTransferObject
+{
+    public string $tin;
+    public int $msicCode;
+    public int $districtId;
+    public int $stateId;
+    public int $companyModuleId;
+    public string $streetOne;
+    public string $streetTwo;
+    public int $postCode;
+
+    public function __construct(array $data)
+    {
+        $this->tin = (string) ($data['tin'] ?? '');
+        $this->msicCode = (int) ($data['msic_code'] ?? 0);
+        $this->districtId = (int) ($data['district_id'] ?? 0);
+        $this->stateId = (int) ($data['state_id'] ?? 0);
+        $this->companyModuleId = (int) ($data['company_module_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 [
+            'tin' => $this->tin,
+            'msic_code' => $this->msicCode,
+            'district_id' => $this->districtId,
+            'state_id' => $this->stateId,
+            'company_module_id' => $this->companyModuleId,
+            'street_one' => $this->streetOne,
+            'street_two' => $this->streetTwo,
+            'post_code' => $this->postCode,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceRequestDTO.php b/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceRequestDTO.php
new file mode 100644
index 00000000..1c46f2df
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/EInvoiceRequestDTO.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Companies\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class EInvoiceRequestDTO implements DataTransferObject
+{
+    public bool $eInvoiceRequest;
+    public int $companyModuleId;
+
+    public function __construct(array $data)
+    {
+        $this->eInvoiceRequest = $data['e_invoice_request'];
+        $this->companyModuleId = $data['company_module_id'];
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'e_invoice_request' => $this->eInvoiceRequest,
+            'company_module_id' => $this->companyModuleId,
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php b/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php
new file mode 100644
index 00000000..e9a76434
--- /dev/null
+++ b/app/Classes/Modules/Companies/DataTransferObjects/UpdateCompanyDetailsDTO.php
@@ -0,0 +1,64 @@
+<?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 string $tin;
+    public int $msicCode;
+    public int $addressId;
+    public int $districtId;
+    public int $stateId;
+    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 = (string) ($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->stateId = (int) ($data['state_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,
+            'state_id' => $this->stateId,
+            '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..bdef7fc8
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php
@@ -0,0 +1,29 @@
+<?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_requested_at)) {
+            if($eInvoice){
+                $model->e_invoice_requested_at = now();
+            }
+        }
+        $model->e_invoice = $eInvoice;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php b/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
new file mode 100644
index 00000000..9c690686
--- /dev/null
+++ b/app/Classes/Modules/Rules/ControllersLogic/CheckEInvoiceRuleLogic.php
@@ -0,0 +1,70 @@
+<?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\CanPassEInvoicePromptedRule;
+use App\Classes\Modules\Rules\Standards\Rules\CanPassTINRule;
+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;
+
+    /** @var CanPassEInvoicePromptedRule */
+    private $canPassEInvoicePromptedRule;
+
+    /** @var CanPassTINRule */
+    private $canPassTINRule;
+
+    /**
+     * CheckEInvoiceRuleLogic constructor.
+     */
+    public function __construct(RuleEvaluator $ruleEvaluator, CanPassEInvoicePromptedRule $canPassEInvoicePromptedRule, CanPassTINRule $canPassTINRule)
+    {
+        $this->ruleEvaluator = $ruleEvaluator;
+        $this->canPassEInvoicePromptedRule = $canPassEInvoicePromptedRule;
+        $this->canPassTINRule = $canPassTINRule;
+    }
+
+    /**
+     * @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([
+            $this->canPassEInvoicePromptedRule,
+            $this->canPassTINRule,
+        ], $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..c982aeb0
--- /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 $companyModuleId;
+
+    public function __construct(array $data)
+    {
+        $this->companyModuleId = $data['company_module_id'];
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'company_module_id' => $this->companyModuleId,
+        ];
+    }
+}
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/CanPassEInvoicePromptedRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php
new file mode 100644
index 00000000..61d1dfcb
--- /dev/null
+++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php
@@ -0,0 +1,57 @@
+<?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\FetchesCompanyModule;
+use Illuminate\Support\Facades\Log;
+
+class CanPassEInvoicePromptedRule extends AbstractRule
+{
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CanPassEInvoicePromptedRule constructor.
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+    }
+
+    /**
+     * @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
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $object->companyModuleId]);
+        if($companyModule->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/CanPassTINRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.php
new file mode 100644
index 00000000..5ec859cb
--- /dev/null
+++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.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\FetchesCompanyModule;
+
+class CanPassTINRule extends AbstractRule
+{
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CanPassTINRule constructor.
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+    }
+
+    /**
+     * @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
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $object->companyModuleId]);
+        if($companyModule->company->e_invoice === 1 && !$companyModule->company->tin){
+            throw new CriteriaNotFulfilledException("Please provide all requested E-Invoice Info.");
+        }
+        return true;
+    }
+
+}
diff --git a/app/Classes/ValueObjects/Constants/AddressType.php b/app/Classes/ValueObjects/Constants/AddressType.php
index 614b9774..b9952a3e 100644
--- a/app/Classes/ValueObjects/Constants/AddressType.php
+++ b/app/Classes/ValueObjects/Constants/AddressType.php
@@ -10,4 +10,6 @@ final class AddressType {
 
     public const PICK_UP = 3;
 
+    public const E_INVOICE = 4;
+
 }
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..af95e185
--- /dev/null
+++ b/app/Http/Controllers/Rules/CheckRuleController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Rules;
+
+use App\Classes\Modules\Rules\ControllersLogic\CheckEInvoiceRuleLogic;
+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);
+    }
+}
diff --git a/app/Http/Resources/CompanyModuleResource.php b/app/Http/Resources/CompanyModuleResource.php
index 5ffc40f8..1e54674e 100644
--- a/app/Http/Resources/CompanyModuleResource.php
+++ b/app/Http/Resources/CompanyModuleResource.php
@@ -51,6 +51,11 @@ class CompanyModuleResource extends JsonResource
             'connections' => $this->connections,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'debtor' => $this->company->debtor,
+            'e_invoice' => $this->company->e_invoice,
+            'tin' => $this->company->tin,
+            'msic_code' => $this->company->msic_code,
+            'address_einvoice' => $this->company->e_invoice ? new AddressResource($this->when($this->has('addresses'), $this->addresses->where('type', AddressType::E_INVOICE)->sortByDesc('created_at')->first())) : null,
+
         ];
 
     }
diff --git a/app/Http/Resources/EInvoiceInfoResource.php b/app/Http/Resources/EInvoiceInfoResource.php
new file mode 100644
index 00000000..565e86a7
--- /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' => (string) $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_06_15_192423_add_tin_to_companies_table.php b/database/migrations/2025_06_15_192423_add_tin_to_companies_table.php
new file mode 100644
index 00000000..ed5f2c58
--- /dev/null
+++ b/database/migrations/2025_06_15_192423_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/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index b71287c5..bef39049 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -16,7 +16,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-20 light">
                                         {{item.name}}
@@ -158,14 +159,14 @@
                     <div class="row align-items-center">
                         <div class="col">
                             <h6 class="no-margin fs-12">Company Type </h6>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeBusinessType">
+                            <!-- <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeBusinessType">
                                 <change-business-type-form-component :section="'customerProfileSection'" :data="item"></change-business-type-form-component>
-                            </modal-component>
+                            </modal-component> -->
                             <h6 class="no-margin">
                                 {{item.type_name}}
-                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary bg-transparent" data-type="changeBusinessType" v-if="$store.getters.isAdmin">
+                                <!-- <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary bg-transparent" data-type="changeBusinessType" v-if="$store.getters.isAdmin">
                                     <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
-                                </div>
+                                </div> -->
                             </h6>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/companies/elements/EInvoiceInfoComponent.vue b/resources/assets/vue/components/companies/elements/EInvoiceInfoComponent.vue
new file mode 100644
index 00000000..ef38aa8c
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/EInvoiceInfoComponent.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="row p-t-20 text-left">
+      <div class="col bg-white padding-30 b-rad-lg">
+        <div class="row">
+            <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 text-info">{{ 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 text-info">{{ eInvoiceData.msic_code }}</p>
+            </div>
+            <div class="padding-15 bg-master-lightest">
+                <p class="muted">Billing Address</p>
+                <p class="mb-0 text-info">
+                    <a 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 text-info">
+                    <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/companies/forms/EInvoiceInfoFormComponent.vue b/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue
new file mode 100644
index 00000000..a4d53e4a
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue
@@ -0,0 +1,246 @@
+<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 class="text-primary">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 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">Billing 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">Billing 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" v-money="integer">
+                                        <label class="text-primary">Post Code</label>
+                                        <input class="form-control" name="post_code" v-model="parameters.post_code">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col-6 p-r-5">
+                                    <validation-wrapper-component selectable :validator="$v.parameters.state_id">
+                                        <label class="text-primary">State</label>
+                                        <selectable-component :endpoint="route('api.address.state.list')" section="stateListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.state_id"></selectable-component>
+                                    </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 text-info">{{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 text-info">{{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 text-info">{{parameters.street_one}} {{parameters.street_two}}, {{districts[parseFloat(parameters.district_id) - 1].text}} {{parameters.post_code}} {{states[parseFloat(parameters.state_id) - 1].text}}, Malaysia</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, minLength, maxLength, alphaNum, helpers } from 'vuelidate/lib/validators'
+
+    function mustContainLetterAndNumber(value) {
+        if (!value) return true;
+        const hasLetter = /[a-zA-Z]/.test(value);
+        const hasNumber = /\d/.test(value);
+        return hasLetter && hasNumber;
+    }
+
+    function notZero(value) {
+        return value !== 0 && value !== '0' && value !== null && value !== undefined
+    }
+
+    function fiveDigits(value) {
+        return /^\d{5}$/.test(value)
+    }
+
+    export default {
+        props: {
+            companyModuleId: {
+                type: Number,
+                required: true
+            },
+            companyType: {
+                type: Number,
+                required: true
+            },
+        },
+        watch: {
+            'company_module_id': function() {
+                this.parameters.company_module_id = this.companyModuleId;
+            },
+        },
+        computed: {
+            districts () { //cief todo: 90
+                return this.$store.getters.getSelectableList('districtListSection');
+            },
+            states () {
+                return this.$store.getters.getSelectableList('stateListSection');
+            }
+        },
+        data() {
+			return {
+			    step: 1,
+                parameters : {
+                    company_module_id: this.companyModuleId,
+                    street_one:  '',
+                    street_two: '',
+                    district_id: '',
+                    state_id: '',
+                    post_code: 0,
+                    tin: '',
+                    msic_code: 0,
+				}
+			}
+		},
+        validations() {
+            const companyType = this.companyType
+            return {
+                parameters: {
+                    street_one: { required },
+                    street_two: {},
+                    district_id: { required },
+                    state_id: { required },
+                    post_code: { notZero, fiveDigits},
+                    tin: {
+                    ...(companyType === 0
+                        ? {
+                            required,
+                            alphaNum,
+                            minLength: minLength(11),
+                            maxLength: maxLength(13)
+                        }
+                        : {}),
+                    ...(companyType === 1
+                        ? {
+                            required,
+                            alphaNum,
+                            minLength: minLength(10),
+                            maxLength: maxLength(12)
+                        }
+                        : {})
+                    },
+                    msic_code: {
+                        notZero, fiveDigits
+                    }
+                }
+            }
+        },
+        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/companies/forms/EInvoiceRequestFormComponent.vue b/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
new file mode 100644
index 00000000..f6cd76e8
--- /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 text-black">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
+        },
+        companyModuleId: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            parameters : {
+                company_module_id: this.companyModuleId,
+            }
+        }
+    },
+    methods: {
+        handleChoice(choice) {
+            this.parameters.e_invoice_request = choice ? true : false;
+            this.$emit('choice-made', { choice });
+            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/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 0c0e7bca..ece7adc6 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -58,12 +58,52 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
+
+                                                                <div class="col-auto" v-if="!company.company_module.e_invoice && !company.company_module.tin">
+                                                                    <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="requestEInvoiceA" style="z-index: 2;">
+                                                                        <span >
+                                                                            Submit E-Invoice Info
+                                                                        </span>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-auto" v-else>
+                                                                    <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="eInvoiceInfo" style="z-index: 2;">
+                                                                        <span>
+                                                                            View E-Invoice Info
+                                                                        </span>
+                                                                    </div>
+                                                                </div>
                                                                 <div class="col-auto">
                                                                     <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="billingAddressComponent" style="z-index: 2;">Change Billing Address</div>
                                                                 </div>
+                                                                <modal-component class="animate__animated animate__fast animate__fadeIn" v-if="company.company_module.tin" styleType="fill-in" type="eInvoiceInfo">
+                                                                    <e-invoice-info-component :company-id="company.id"></e-invoice-info-component>
+                                                                </modal-component>
                                                                 <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingAddressComponent">
                                                                     <billing-address-section-component :company_module_id="company.company_module.id" :section="section"></billing-address-section-component>
                                                                 </modal-component>
+                                                                <modal-component
+                                                                    id="modal-einvoice-request"
+                                                                    class="animate__animated animate__fast animate__fadeIn"
+                                                                    styleType="fill-in" type="requestEInvoiceA" size="large" :disableClose="true">
+                                                                    <e-invoice-request-form-component
+                                                                        class="text-center"
+                                                                        :section="section"
+                                                                        :company-module-id="company.company_module.id"
+                                                                    />
+                                                                </modal-component>
+                                                                <modal-component
+                                                                    id="modal-einvoice-info"
+                                                                    class="animate__animated animate__fast animate__fadeIn"
+                                                                    styleType="fill-in" type="requestEInvoiceB" size="large" :disableClose="true">
+                                                                    <e-invoice-info-form-component
+                                                                        :section="section"
+                                                                        :company-module-id="company.company_module.id"
+                                                                        :company-type="company.type"
+                                                                        v-on:eInvoiceInfoUpdated="updatedEInvoiceInfo($event)"
+                                                                        v-on:close="createAddress = !createAddress">
+                                                                    </e-invoice-info-form-component>
+                                                                </modal-component>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -90,6 +130,7 @@
                 required: true,
             }
         },
+
         data(){
             return {
                 section: 'orderListSection',
@@ -100,7 +141,7 @@
         computed: {
             pendingQueue () {
                 return this.$store.getters.isInCompleteQueue(this.section);
-            }
+            },
         },
         watch: {
             pendingQueue(inComplete){
@@ -117,11 +158,31 @@
                 this.isLoading = true;
                 this.submit(route('api.company.show', this.company_id), 'get', this.section, false, false)
             },
-            successHandler(response){
+            successHandler(response, section){
                 this.$store.dispatch('completeList', {'name': this.section, 'data': []});
                 this.isLoading = false;
                 this.company = response.payload.data;
-            }
+
+                if(this.company.company_module.e_invoice === null){
+                    this.$nextTick(() => {
+                        $('#modal-einvoice-request').modal('show');
+                    });
+                }
+                else if( this.company.company_module.e_invoice && (this.company.company_module.tin === null || this.company.company_module.msic_code === null) )
+                {
+                    this.$nextTick(() => {
+                        $('#modal-einvoice-info').modal('show');
+                    });
+                }
+            },
+            errorHandler(error, statusCode, section) { //E-Invoice
+                if(section === this.section + 'CheckEInvoiceRule' && statusCode === 422){
+                    $('#modal-einvoice-info').modal('show');
+                }
+            },
+            updatedEInvoiceInfo(info){
+                this.$store.dispatch('reloadList', {'name': this.section});
+            },
         }
     }
 </script>
diff --git a/resources/assets/vue/components/general/elements/ModalComponent.vue b/resources/assets/vue/components/general/elements/ModalComponent.vue
index db0181fc..3424b988 100644
--- a/resources/assets/vue/components/general/elements/ModalComponent.vue
+++ b/resources/assets/vue/components/general/elements/ModalComponent.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="modal modalContainer fade" :class="styleType" :data-type="type">
+    <div class="modal modalContainer fade" :class="styleType" :data-type="type"
+     v-bind="disableClose ? { 'data-backdrop': 'static', 'data-keyboard': 'false' } : {}">
         <div class="modal-dialog"  v-bind:class="[{'modal-lg': size === 'large'}, {'modal-xl': size === 'extra-large'}, {'modal-sm': size === 'small'}]">
             <div class="modal-content">
                 <div class="modal-body">
@@ -22,7 +23,11 @@
             styleType: {
                 type: String,
                 default: "stick-up"
+            },
+            disableClose: {
+                type: Boolean,
+                default: false
             }
-        }
+        },
     }
 </script>
diff --git a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
index 8780f760..bfa04a92 100644
--- a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
@@ -2,9 +2,12 @@
     <div v-if="validator.$error" class="text-danger fs-10">
         <small class="bold" v-for="(object, param) in validator.$params" v-if="!validator[param]">
             {{errorMessages[param]}}
-            <span v-if="object.type === 'minLength'">{{object.min}} characters</span>
-            <span v-if="object.type === 'sameAs'">{{object.eq}} field</span>
-            <span v-if="object.type === 'minValue'">{{object.min}}</span>
+            <span v-if="object && object.type === 'minLength'">{{object.min}} characters</span>
+            <span v-if="object && object.type === 'sameAs'">{{object.eq}} field</span>
+            <span v-if="object && object.type === 'minValue'">{{object.min}}</span>
+            <span v-if="object && object.type === 'maxValue'">{{errorMessages[param]}} {{object.max}}</span>
+            <span v-if="object && object.type === 'alphaNum'">{{errorMessages[param]}}</span>
+            <span v-if="object && object.type === 'fiveDigits'">{{ errorMessages[param] }}</span>
         </small>
     </div>
 </template>
@@ -24,7 +27,10 @@
                     minLength: 'this field must have at least',
                     minValue: 'this field must at least be',
                     sameAs: 'this field must match the',
-                    numeric: 'this field can only contain numbers'
+                    numeric: 'this field can only contain numbers',
+                    maxValue: 'this value must not exceeds',
+                    alphaNum: 'this value must be alphanumeric',
+                    fiveDigits: 'this value must be exactly 5 digits', //custom
                 },
             }
         },
diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index ea18c931..4a67a1c1 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -102,7 +102,7 @@
                 <div class="col no-padding">
                     <div class="row">
                         <div class="col">
-                            <a :href="route('order.show', item.reference)">
+                            <a @click="checkEInvoiceRule()" href="javascript:void(0);">
                                 <div class="btn btn-sm btn-default bg-master-lighter no-border btn-block b-rad-none">More Details</div>
                             </a>
                         </div>
@@ -145,10 +145,10 @@
             </transition-component>
         </div>
         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="cancelOrder">
-            <cancel-order-form-component :data="item" section="oderList" class="text-center"></cancel-order-form-component>
+            <cancel-order-form-component :data="item" :section="section" class="text-center"></cancel-order-form-component>
         </modal-component>
         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="restoreOrder">
-            <restore-order-form-component :data="item" section="oderList" class="text-center"></restore-order-form-component>
+            <restore-order-form-component :data="item" :section="section" class="text-center"></restore-order-form-component>
         </modal-component>
     </div>
 </template>
@@ -160,10 +160,18 @@
         },
         data(){
             return {
-                expanded: false
+                expanded: false,
+                section: 'orderList'
             }
         },
         methods: {
+            successHandler(response, section){
+                if(section === this.section + 'CheckEInvoiceRule'){
+                    if(response.payload.data.isPassed){
+                        window.location.href = route('order.show', this.item.reference);
+                    }
+                }
+            },
             download(param) {
                 let url = route('order.qr.download', param.id);
                 if(window.LARAVEL_VAPOR_ENABLED){
@@ -185,6 +193,12 @@
                     window.open(url, '_blank');
                 }
             },
+            checkEInvoiceRule(){
+                this.parameters = {
+                    company_module_id: this.item.company_module.id,
+                };
+                this.submit(route('api.rule.check.einvoice'), 'post', this.section + 'CheckEInvoiceRule', false, true);
+            },
         },
         mixins: [componentHandler]
     }
diff --git a/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue
new file mode 100644
index 00000000..f4dd6613
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue
@@ -0,0 +1,209 @@
+<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-t-15 m-b-15">
+                <div class="col p-r-5">
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 0}]" @click="updateType(0)">Personal<br>Business</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 1}]" @click="updateType(1)">Company<br>Business</div>
+                </div>
+            </div>
+            <div class="row m-b-5" v-if="data.company_module.e_invoice !== 0 && data.company_module.e_invoice !== null">
+                <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">Billing 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">Billing 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 class="row m-b-15">
+                        <div class="col-6 p-r-5">
+                            <validation-wrapper-component selectable :validator="$v.parameters.state_id">
+                                <label>State</label>
+                                <selectable-component :endpoint="route('api.address.state.list')" section="stateListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.state_id"></selectable-component>
+                            </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, maxLength, alphaNum, helpers } from 'vuelidate/lib/validators'
+
+    function mustContainLetterAndNumber(value) {
+        if (!value) return true;
+        const hasLetter = /[a-zA-Z]/.test(value);
+        const hasNumber = /\d/.test(value);
+        return hasLetter && hasNumber;
+    }
+
+    function notZero(value) {
+        return value !== 0 && value !== '0' && value !== null && value !== undefined
+    }
+
+    function fiveDigits(value) {
+        return /^\d{5}$/.test(value)
+    }
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    id: this.data.id,
+                    name: this.data.name,
+                    debtor: this.data.debtor,
+                    reference: this.data.reference,
+                    type: this.data.type,
+                    tin: this.data.company_module.tin,
+                    email: this.data.employee.email,
+                    employeeId: this.data.employee.id,
+                    msic_code: this.data.company_module.msic_code,
+                    address_id: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.id : null,
+                    street_one: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.street_one : null,
+                    street_two: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.street_two : null,
+                    district_id: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.district.id : null,
+                    state_id: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.state.id : null,
+                    post_code: this.data.company_module.address_einvoice ? this.data.company_module.address_einvoice.post_code : null,
+                }
+            };
+        },
+        validations() {
+            const companyType = this.data.type;
+            const isEInvoiceEnabled = this.data.company_module.e_invoice !== 0 && this.data.company_module.e_invoice !== null;
+            return {
+                parameters: {
+                    name: {
+                        required,
+                    },
+                    debtor: {},
+                    email: {
+                        required,
+                    },
+
+                    tin: isEInvoiceEnabled
+                    ? {
+                        ...(companyType === 0
+                            ? {
+                                required,
+                                alphaNum,
+                                minLength: minLength(11),
+                                maxLength: maxLength(13)
+                            }
+                            : {}),
+                        ...(companyType === 1
+                            ? {
+                                required,
+                                alphaNum,
+                                minLength: minLength(10),
+                                maxLength: maxLength(12)
+                            }
+                            : {})
+                    }
+                    : {},
+                    msic_code: isEInvoiceEnabled ? {
+                        notZero, fiveDigits
+                    }: {},
+
+                    address_id: {},
+                    street_one: isEInvoiceEnabled ? { required } : {},
+                    street_two: {},
+                    district_id: isEInvoiceEnabled ? { required } : {},
+                    state_id: isEInvoiceEnabled ? { required } : {},
+                    post_code: isEInvoiceEnabled ? { required, notZero } : {},
+
+                }
+            }
+        },
+        methods: {
+            successHandler(response) {
+                this.closeModal();
+            },
+            submitForm() {
+                this.submit(this.route('api.company.update.details', this.data.id), 'put', this.section, true, true)
+            },
+            updateType(type) {
+                this.parameters.type = type;
+            },
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index 13babef8..36e24753 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -18,11 +18,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, section)
+                    this.successHandler(response, section, this.parameters);
 
 
                 });
diff --git a/routes/api.php b/routes/api.php
index 5b419754..89749ee9 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -71,9 +71,11 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         require __DIR__ . '/help_menu.php';
 
         require __DIR__ . '/permits_reminder.php';
-        
+
         require __DIR__ . '/job.php';
 
+        require __DIR__ . '/rule.php';
+
     });
 
     require __DIR__ . '/announcement.php';
diff --git a/routes/company.php b/routes/company.php
index ad0ca9ee..2bafb203 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -1,6 +1,9 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\Companies\UpdateCompanyEInvoiceInfoController;
+use App\Http\Controllers\Companies\FetchCompanyEInvoiceInfoController;
+use App\Http\Controllers\Companies\UpdateCompanyDetailsController;
 
 Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Companies'], function () {
     Route::get('/{id}/show', 'FetchCompanyController@fetch')->name('show');
@@ -39,4 +42,9 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     });
 
     Route::get('/module/list', 'ListCompanyModulesController@list')->name('module.list');
+
+    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..6154c67b
--- /dev/null
+++ b/routes/rule.php
@@ -0,0 +1,10 @@
+<?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');
+    });
diff --git a/routes/web.php b/routes/web.php
index 94909ea0..0164f7a3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -274,6 +274,13 @@ Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
 
 Route::get('/customer-invoices/{company_module_id}/payment-and-billing', function ($company_module_id) {
     // todo-new: check company_module_id
+    $companyModule = CompanyModule::where('id', $company_module_id)->first();
+    $isValid = $companyModule->company->e_invoice !== null;
+
+    if (!$isValid) {
+        return redirect()->route('dashboard');
+    }
+
     return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_id]);
 })->name('customer.payment-and-billing-by-company-module-id');