add file RescheduleTransportDateFormComponent

update
update delivery date
2026-08-19 20:44:19 +00:00 · 2022-04-21 21:42:32 +08:00 · 2022-04-21 21:02:25 +08:00 · 2022-04-21 20:58:27 +08:00 · 2022-04-21 14:12:23 +08:00 · 2022-04-21 12:19:57 +08:00
99 changed files with 3042 additions and 420 deletions
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class TypeIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('type', $value);
+    }
+
+}
@@ -15,6 +15,7 @@ use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
 use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
@@ -76,6 +77,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
    /** @var GenerateEmailVerificationAttemptProcessor */
    private $generateEmailVerificationAttemptProcessor;

+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
    /**
     * CreateCustomerLogic constructor.
     * @param CreateUserProcessor $createUserProcessor
@@ -88,8 +92,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
     * @param AuthenticationProcessor $authenticationProcessor
     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
     */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
    {
        $this->createUserProcessor = $createUserProcessor;
        $this->createCompanyProcessor = $createCompanyProcessor;
@@ -101,6 +106,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
        $this->authenticationProcessor = $authenticationProcessor;
        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
    }

    /**
@@ -126,7 +132,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
        /** @var CompanyModule $companyModule */
        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);

-        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');

        $connection = $this->createsCompanyConnection->execute($connectionObject);

@@ -12,6 +12,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;

 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {
@@ -2,6 +2,7 @@

 namespace App\Classes\Modules\Accounts\Services;

+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\User;

@@ -11,6 +12,11 @@ class AuthenticationRedirect
    public function url(User $user){

        if($user->type === RoleTypes::USER){
+
+            if (in_array($user->companyModule()->first()->type, [BusinessType::ONLINE_SELLER, BusinessType::LAST_MILE_DELIVERY_AGENT])) {
+                return route('last_mile_delivery.dashboard');
+            }
+
            return route('dashboard');
        }

@@ -68,7 +68,11 @@ class GeneratesAuthenticationToken {
            $companyModule = $user->companyModule()->first();

            $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id
+                'company_id' => $companyModule->company_id,
+                'company_module_id' => $companyModule->id,
+                'company_module_type' => $companyModule->type,
+                'company_name' => $companyModule->name,
+                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
            ]);
        }

@@ -14,6 +14,7 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use ErrorException;
@@ -82,7 +83,7 @@ class CreateAddressLogic extends AbstractControllerLogic

        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);

-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('type'), ApprovalStatus::APPROVED, $request->input('reference'));

        $this->canCreateAddress->passes($object);

@@ -13,6 +13,8 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
@@ -79,7 +81,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
    {
        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);

-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));

        $this->canUpdateAddress->passes($object);

@@ -26,6 +26,12 @@ class AddressObject implements DataTransferObject
    /** @var int */
    private $postCode;

+    /** @var int */
+    private $type;
+
+    /** @var int */
+    private $status;
+
    /** @var string|null */
    private $reference;

@@ -37,9 +43,11 @@ class AddressObject implements DataTransferObject
     * @param int $stateId
     * @param int $districtId
     * @param int $postCode
+     * @param int $type
+     * @param int $status
     * @param null|string $reference
     */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
    {
        $this->streetOne = $streetOne;
        $this->streetTwo = $streetTwo;
@@ -47,8 +55,9 @@ class AddressObject implements DataTransferObject
        $this->stateId = $stateId;
        $this->districtId = $districtId;
        $this->postCode = $postCode;
-        $this->reference = $reference;
+        $this->type = $type;
        $this->status = $status;
+        $this->reference = $reference;
    }

    /**
@@ -100,11 +109,11 @@ class AddressObject implements DataTransferObject
    }

    /**
-     * @return null|string
+     * @return int
     */
-    public function getReference(): ?string
+    public function getType(): int
    {
-        return $this->reference;
+        return $this->type;
    }

    /**
@@ -115,5 +124,13 @@ class AddressObject implements DataTransferObject
        return $this->status;
    }

+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+

 }
@@ -10,6 +10,8 @@ namespace App\Classes\Modules\Addresses\Services;


 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;

@@ -31,7 +33,7 @@ class CleansOldAddress
            return null;
        }

-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');

    }

@@ -29,6 +29,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
        $model->district_id = $object->getDistrictId();
        $model->postcode = $object->getPostCode();
        $model->status = $object->getStatus();
+        $model->type = $object->getType();

        return $this->handler($addressable->addresses(), $model);

@@ -10,6 +10,9 @@ class CompanyConnectionObject implements DataTransferObject

    /** @var CompanyModule */
    private $invitee;
+    
+    /** @var CompanyModule */
+    private $inviter;

    /** @var string */
    private $inviterReference;
@@ -20,12 +23,14 @@ class CompanyConnectionObject implements DataTransferObject
    /**
     * CompanyConnectionObject constructor.
     * @param CompanyModule $invitee
+     * @param CompanyModule $inviter
     * @param string $inviterReference
     * @param string $inviteeReference
     */
-    public function __construct(CompanyModule $invitee, string $inviterReference, string $inviteeReference)
+    public function __construct(CompanyModule $invitee, CompanyModule $inviter, string $inviteeReference, string $inviterReference)
    {
        $this->invitee = $invitee;
+        $this->inviter = $inviter;
        $this->inviterReference = $inviterReference;
        $this->inviteeReference = $inviteeReference;
    }
@@ -38,6 +43,14 @@ class CompanyConnectionObject implements DataTransferObject
        return $this->invitee;
    }

+    /**
+     * @return CompanyModule
+     */
+    public function getInviter(): CompanyModule
+    {
+        return $this->inviter;
+    }
+
    /**
     * @return string
     */
@@ -30,10 +30,8 @@ class CreatesCompanyConnection extends AbstractUpdateRecord
    public function execute(CompanyConnectionObject $object)
    {

-        $companyModule = $this->fetchesCompany->execute(['id', 1])->companyModules()->first();
-
        $connection = new CompanyConnection();
-        $connection->inviter_id = $companyModule->id;
+        $connection->inviter_id = $object->getInviter()->id;
        $connection->invitee_id = $object->getInvitee()->id;
        $connection->inviter_reference = $object->getInviterReference();
        $connection->invitee_reference = $object->getInviteeReference();
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\CancelsOrder;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Cancelled Order',
+            'message' => 'You have successfully cancelled an order'
+        ];
+    }
+
+    /** @var CancelsOrder */
+    private $cancelsOrder;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CancelDeliveryOrderLogic constructor.
+     * @param CancelsOrder $cancelsOrder
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(CancelsOrder $cancelsOrder, FetchesOrder $fetchesOrder)
+    {
+        $this->cancelsOrder = $cancelsOrder;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        /** @var Order $order */
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new DeliveryOrderResource($this->cancelsOrder->execute($order)));
+
+    }
+}
@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+use App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\User;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use Illuminate\Support\Facades\Log;
+
+class CreateDeliveryCustomerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created User',
+            'message' => 'You have successfully created a new User'
+        ];
+    }
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var UploadIdentityDocumentProcessor */
+    private $uploadIdentityDocumentProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+    /** @var GenerateEmailVerificationAttemptProcessor */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CreateDeliveryCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        /** @var User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var Company $company */
+        $company = $this->createCompanyProcessor->execute($request->input('name'), CompanyType::PERSONAL_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::ONLINE_SELLER);
+
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'HWT']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'HWT');
+
+        $connection = $this->createsCompanyConnection->execute($connectionObject);
+
+        $this->approvesCompanyConnection->execute($connection);
+
+        $Object = new EmploymentObject($companyModule, $user);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+    }
+}
@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+use App\Classes\Modules\Orders\Services\CreatesOrder;
+use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Order',
+            'message' => 'You have successfully created a new Order'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var fetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CanCreateOrder */
+    private $canCreateOrder;
+
+    /** @var CreatesOrder */
+    private $createsOrder;
+
+    /** @var CreatesAddress */
+    private $createAddress;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
+    /** @var GeneratesOrderNumber */
+    private $generatesOrderNumber;
+
+    /** @var CreatesPackingList */
+    private $createsPackingList;
+
+    /** @var CreatesPackage */
+    private $createsPackage;
+
+
+    /**
+     * CreateDeliveryOrderLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesAddress $fetchesAddress
+     * @param CanCreateOrder $canCreateOrder
+     * @param CreatesOrder $createsOrder
+     * @param CreatesAddress $createAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
+     * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param CreatesPackingList $createsPackingList
+     * @param CreatesPackage $createPackage
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor, GeneratesOrderNumber $generatesOrderNumber, CreatesPackingList $createsPackingList, CreatesPackage $createsPackage)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->canCreateOrder = $canCreateOrder;
+        $this->createsOrder = $createsOrder;
+        $this->createAddress = $createAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
+        $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->createsPackingList = $createsPackingList;
+        $this->createsPackage = $createsPackage;
+    }
+
+    /**
+     * @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
+    {
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $senderAddress = $this->fetchesAddress->execute(['id' => $request->input('sender_address_id')]);
+        $deliveryAddress = $this->fetchesAddress->execute(['id' => $request->input('delivery_address_id')]);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $company->companyModules()->where('type', BusinessType::ONLINE_SELLER)->first();
+
+        $orderObject = new OrderObject($this->generatesOrderNumber->execute('168M', 7), OrderType::LAST_MILE_DELIVERY, ApprovalStatus::APPROVED);
+
+        $this->canCreateOrder->passes($orderObject);
+
+        /** @var Order $order */
+        $order = $this->createsOrder->execute($companyModule, $orderObject);
+
+        $senderAddressObject = new AddressObject($senderAddress->street_one, $senderAddress->street_two, $senderAddress->country_id, $senderAddress->state_id, $senderAddress->district_id, $senderAddress->postcode, $senderAddress->type, ApprovalStatus::APPROVED, $senderAddress->reference);
+        $deliveryAddressObject = new AddressObject($deliveryAddress->street_one, $deliveryAddress->street_two, $deliveryAddress->country_id, $deliveryAddress->state_id, $deliveryAddress->district_id, $deliveryAddress->postcode, $deliveryAddress->type, ApprovalStatus::APPROVED, $deliveryAddress->reference);
+
+        /** @var Address $orderSenderAddress */
+        $orderSenderAddress = $this->createAddress->execute($order, $senderAddressObject);
+        /** @var Address $orderDeliveryAddress */
+        $orderDeliveryAddress = $this->createAddress->execute($order, $deliveryAddressObject);
+
+        $senderContact = $senderAddress->contacts()->first();
+        $deliveryContact = $deliveryAddress->contacts()->first();
+
+        $contactObject = new ContactObject($senderContact->reference, $senderContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderSenderAddress);
+
+        $contactObject = new ContactObject($deliveryContact->reference, $deliveryContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderDeliveryAddress);
+
+        $senderRemark = $senderAddress->remarks()->first();
+        $deliveryRemark = $deliveryAddress->remarks()->first();
+
+        if ($senderRemark){
+            $remarkObject = new RemarkObject($senderRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderSenderAddress, $remarkObject);
+            }
+        }
+
+        if ($deliveryRemark){
+            $remarkObject = new RemarkObject($deliveryRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderDeliveryAddress, $remarkObject);
+            }
+        }
+
+        $packingListObject = new PackingListObject($order->reference, $companyModule->id, PackingListType::DELIVERY_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var PackingList $packingList */
+        $packingList = $this->createsPackingList->execute($packingListObject, $order);
+
+        $packageObject = new PackageObject($request->input('packing_list.type'), $request->input('packing_list.description'), (float) 1, (float) 1, (float) 1, $request->input('packing_list.weight'), (float) $request->input('packing_list.quantity'), ApprovalStatus::APPROVED);
+        $this->createsPackage->execute($packageObject, $packingList);
+
+        return $this->resourceResponse(new DeliveryOrderResource($order));
+
+    }
+}
@@ -0,0 +1,57 @@
+<?php
+
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Http\Resources\OrderResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListOrdersLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Orders',
+            'message' => 'You have successfully retrieved a list of Orders'
+        ];
+    }
+
+    /** @var CanListOrders */
+    private $canListOrders;
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /**
+     * ListOrdersLogic constructor.
+     * @param CanListOrders $canListOrders
+     * @param ListsOrders $listsOrders
+     */
+    public function __construct(CanListOrders $canListOrders, ListsOrders $listsOrders)
+    {
+        $this->canListOrders = $canListOrders;
+        $this->listsOrders = $listsOrders;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListOrders->passes();
+
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::LAST_MILE_DELIVERY]]));
+
+        return $this->collectionResponse(DeliveryOrderResource::collection($query));
+
+    }
+
+
+
+}
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'ORDER NUMBER',
+            'Marking',
+            'Warehouse',
+            'Cbm',
+            'Description',
+            'quantity',
+            'Received Date',
+            'Remarks'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->get();
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+
+        foreach($packingLists as $packingList){
+            $packages = !$packingList->packingLists()->exists() || $exceptionUsers ? $packingList->packages : $packingList->packingLists->first()->packages;
+            foreach ($packages as $package) {
+                $returnArray->push($package);
+            }
+        }
+        
+        return $returnArray;
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($package): array
+    {
+        $packingList = $package->packingList;
+        $order = $packingList->owner;
+
+        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
+
+        $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
+
+        return [
+            $packingList->owner->reference,
+            $marking,
+            $warehouse->reference,
+            $cbm,
+            $package->description,
+            $package->quantity,
+            $arrival_date,
+            ''
+        ];
+    }
+}
@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Sender_Name',
+            'Sender_Company_Name',
+            'Sender_Building_Unit',
+            'Sender_Address',
+            'Sender_Address_2',
+            'Sender_Postal_Code',
+            'Sender_Phone_Number',
+            'Delivery_Name',
+            'Delivery Company Name',
+            'Delivery_Building_Unit',
+            'Delivery_Address',
+            'Delivery_Address_2',
+            'Delivery_Postal_Code',
+            'Delivery_Phone_Number',
+            'Shipment_Type',
+            'Mode',
+            'Pickup_Address_Type',
+            'Reference_Number',
+            'Quantity',
+            'Weight',
+            'Length',
+            'Width',
+            'Height',
+            'COD_Amount',
+            'DO_Numbers'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $selectedIds = array_map(function($value){
+            return ['id' => $value];
+        }, json_decode($this->request->input('ids')));
+        
+        return Order::where('type', OrderType::LAST_MILE_DELIVERY)->whereIn('id', $selectedIds);
+    }
+
+    public function title(): string
+    {
+        return 'bulk-shipment';
+    }
+
+    /**
+     * @param Order $order
+     *
+     * @return array
+     */
+    public function map($order): array
+    {
+        $senderAddress = $order->addresses()->where('type', AddressType::PICK_UP)->first();
+        $deliveryAddress = $order->addresses()->where('type', AddressType::DELIVERY)->first();
+        $package = $order->packingLists()->first()->packages()->first();
+
+        return [
+            'Domestic Shipment',
+            'ST00000020',
+            $senderAddress->contacts()->first()->reference,
+            $senderAddress->reference ? $senderAddress->reference : $order->companyModule->name,
+            $senderAddress->street_one,
+            $senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name,
+            '',
+            $senderAddress->postcode,
+            $senderAddress->contacts()->first()->phone,
+            $deliveryAddress->contacts()->first()->reference,
+            $deliveryAddress->reference,
+            $deliveryAddress->street_one,
+            $deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name,
+            '',
+            $deliveryAddress->postcode,
+            $deliveryAddress->contacts()->first()->phone,
+            $package->type === PackageType::CARTON ? 'Package' : ($package->type === PackageType::PALLET ? 'Pallet' : 'Documents'),
+            'Pick Up',
+            'Default',
+            $order->reference,
+            $package->quantity,
+            $package->weight * $package->quantity,
+            1,
+            1,
+            1,
+            '',
+            ''
+        ];
+    }
+}
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryValidValues implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle, FromCollection
+{
+    use Exportable;
+
+    private $request;
+
+    /**
+     * ExportsDeliveryValidValues constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Mode',
+            'Flag',
+            'Pickup Address'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $returnArray->push(['Domestic Shipment', 'Package', 'Pick Up', 'Yes', 'Default']);
+        $returnArray->push(['', 'Documents', 'Lodge In / Walk In', 'No', 'Sender']);
+        $returnArray->push(['', 'Pallet', '', '', '']);
+
+        return $returnArray;
+    }
+
+    public function title(): string
+    {
+        return 'valid-values';
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($returnArray): array
+    {
+        return [
+            $returnArray[0],
+            $returnArray[1],
+            $returnArray[2],
+            $returnArray[3],
+            $returnArray[4],
+        ];
+    }
+}
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\Modules\Exports\Services\ExportsDeliveryOrders; 
+use App\Classes\Modules\Exports\Services\ExportsDeliveryValidValues; 
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class ExportsMultipleDeliveryOrders implements WithMultipleSheets
+{
+    use Exportable;
+
+    protected $request;
+    
+    /**
+     * ExportsMultipleDeliveryOrders constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @return array
+     */
+    public function sheets(): array
+    {
+        $sheets = [];
+        $sheets[] = new ExportsDeliveryOrders($this->request);
+        $sheets[] = new ExportsDeliveryValidValues($this->request);
+
+        return $sheets;
+    }
+}
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereIn('status', [4, 5])->whereHas('containers');
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $container->reference,
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a',
+            $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
+            $marking,
+            $order->reference,
+        ];
+    }
+}
@@ -20,16 +20,20 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
    public function headings(): array
    {
        return [
-            'Order Number',
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
            'Marking',
+            'Order Number',
+            'status',
+            'Delay Days / delivery date',
            'Quantity',
-            'Remark',
-            'Contact Person Name',
-            'Contact Number',
-            'Delivery Date',
-            'Delivery Address',
-            'Delivery State',
-            'Delivery Postcode'
+            'State',
+            'Postcode',
+            'Address',
+            'PIC',
+            'Phone',
+            'Remark'
        ];
    }

@@ -40,7 +44,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
    {
        return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
            $query->where('containers.status', ApprovalStatus::COMPLETED);
-        })->whereDoesntHave('transports');
+        });
    }

    /**
@@ -50,26 +54,31 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
     */
    public function map($packingList): array
    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
        $order = $packingList->owner;
        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-        $defaultAddress = $order->companyModule->addresses()->defaultAddress()->first();
-        $defaultAddress = $defaultAddress ? $defaultAddress : $order->companyModule->addresses()->first();
-        $address = $defaultAddress->street_one.', '.$defaultAddress->street_two.' '.$defaultAddress->district->name.' '.$defaultAddress->postcode.' '.$defaultAddress->state->name.' '.$defaultAddress->country->name;
-        $contacts = $defaultAddress->contacts->first() ? $defaultAddress->contacts->first(): '';
+        $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        $contacts = $address->contacts->first() ? $address->contacts->first(): '';
        $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
        $transport = $originalPackingList->containers()->first()->transports()->first();
+        $deliveryTransport = $originalPackingList->transports()->first();

        return [
-            $order->reference,
+            $container->reference,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta,
+            $ContainerTransport->drop_date,
            $marking,
+            $order->reference,
+            $deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
            $packingList->packages()->sum('quantity'),
-            $defaultAddress->remarks->first() ? $defaultAddress->remarks->first()->content: '',
+            $address->state->name,
+            $address->postcode,
+            $address->street_one.', '.$address->street_two.' '.$address->district->name.' '.$address->postcode.' '.$address->state->name.' '.$address->country->name,
+            $address->remarks->first() ? $address->remarks->first()->content: '',
            $contacts ? $contacts ->reference : '',
            $contacts ? $contacts ->phone : '',
-            $transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : '',
-            $address,
-            $defaultAddress->state->name,
-            $defaultAddress->postcode
        ];
    }
 }
@@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic
        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);

        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]);
        }

        if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
@@ -6,6 +6,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
 use App\Http\Resources\OrderResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -44,7 +45,7 @@ class ListOrdersLogic extends AbstractControllerLogic
    {
        $this->canListOrders->passes();

-        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));

        return $this->collectionResponse(OrderResource::collection($query));

@@ -9,7 +9,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 class OrderObject  implements DataTransferObject
 {

-    /** @var int */
+    /** @var string */
    private $reference;

    /** @var int  */
@@ -20,11 +20,11 @@ class OrderObject  implements DataTransferObject

    /**
     * OrderObject constructor.
-     * @param int $reference
+     * @param string $reference
     * @param int $type
     * @param int|null $status
     */
-    public function __construct(int $reference, int $type, ?int $status = ApprovalStatus::PENDING_VERIFICATION)
+    public function __construct(string $reference, int $type, ?int $status)
    {
        $this->reference = $reference;
        $this->type = $type;
@@ -32,9 +32,9 @@ class OrderObject  implements DataTransferObject
    }

    /**
-     * @return int
+     * @return string
     */
-    public function getReference(): int
+    public function getReference(): string
    {
        return $this->reference;
    }
@@ -48,12 +48,13 @@ class OrderObject  implements DataTransferObject
    }

    /**
-     * @return int
+     * @return int|null
     */
-    public function getStatus(): int
+    public function getStatus(): ?int
    {
        return $this->status;
    }


+
 }
@@ -84,7 +84,7 @@ class CreateOrderProcessor
        /** @var Order $order */
        $order = $this->createsOrder->execute($importer, $orderObject);

-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode,$address->reference);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->type, ApprovalStatus::APPROVED, $address->reference);

        /** @var Address $order_address */
        $order_address = $this->createAddress->execute($order, $addressObject);
@@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
@@ -76,7 +77,7 @@ class RequestChangeOrderAddressProcessor
        }

        $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::DELIVERY, ApprovalStatus::PENDING_VERIFICATION, $address->reference);
        $order_address = $this->createsAddress->execute($order, $addressObject);

        $contact = $address->contacts()->first();
@@ -21,7 +21,7 @@ class ChecksIfOrderNumberExists
        $this->repository = $repository;
    }

-    public function execute(int $orderNumber): bool {
+    public function execute(string $orderNumber): bool {
        return $this->repository->where('reference', $orderNumber)->exists();
    }

@@ -20,11 +20,13 @@ class GeneratesOrderNumber


    /**
-     * @return int
+     * @param null|string $prefix
+     * @param int|null $length
+     * @return string
     */
-    public function execute(): int {
+    public function execute(?string $prefix = '', ?int $length = 9): string {

-        $reference = rand(100000001, 999999999);
+        $reference = $prefix.rand((int)('1'.str_repeat(0, $length - 2).'1'), (int) str_repeat(9, $length));
        return !$this->checkIfOrderNumberExists->execute($reference) ? $reference : self::execute();
    }

@@ -56,28 +56,23 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
     */
    public function logic(Request $request) : JsonResponse
    {
-        try {
-            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);

-            $transport = $packing_list->transports()->first();
+        $transport = $packing_list->transports()->first();

-            $old_sechedule = $transport->schedules()->first();
+        $old_sechedule = $transport->schedules()->first();

-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
+        $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);

-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('eta')), 
-                Carbon::parse($request->input('etd')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new PackingListResource($packing_list));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $scheduleObject = new ScheduleObject(
+            Carbon::parse($request->input('eta')), 
+            Carbon::parse($request->input('etd')), 
+            ApprovalStatus::APPROVED
+        );
+        
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);

+        return $this->resourceResponse(new PackingListResource($packing_list));
    }

 }
@@ -6,6 +6,8 @@ namespace App\Classes\Modules\PackingLists\Processors;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;

 class CreatePackageProcessor
@@ -48,6 +50,11 @@ class CreatePackageProcessor

        if($replica) {
            $modificationValue = 1;
+
+            if($replica->owner->owner instanceof Order){
+                $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1;
+            }
+
            $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
            $package = $this->createsPackage->execute($packageObject, $replica);
        }
@@ -10,7 +10,10 @@ use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
+use function PHPUnit\Framework\isInstanceOf;

 class CreatePackingListProcessor
 {
@@ -51,6 +54,7 @@ class CreatePackingListProcessor
        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;

        $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
+
        /** create packing list replica */
        $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
        $this->createsPackingList->execute($object, $packingList);
@@ -8,4 +8,6 @@ final class AddressType {

    public const DELIVERY = 2;

+    public const PICK_UP = 3;
+
 }
@@ -18,4 +18,7 @@ final class BusinessType {

    public const CURRENCY_VENDOR = 6;

+    public const ONLINE_SELLER = 7;
+
+    public const LAST_MILE_DELIVERY_AGENT = 8;
 }
@@ -8,4 +8,6 @@ final class OrderType {

    public const DEDICATED_CONTAINER = 1;

+    public const LAST_MILE_DELIVERY = 2;
+
 }
@@ -10,4 +10,6 @@ final class PackageType {

    public const OVER_WEIGHT = 2;

+    public const DOCUMENT = 3;
+
 }
@@ -8,6 +8,8 @@ final class WarehouseReferences {

    public const YD_GUANG_ZHOU = 'GZ-V02';

+    public const YD_GUANG_ZHOU_2 = 'GZ-V03';
+
    public const VT_YIWU = 'YW-V01';

    public const YD_YIWU = 'YW-V02';
@@ -43,6 +45,8 @@ final class WarehouseReferences {

    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726];

+    public const REPLICA_WHITE_LIST = [502];
+
    //2376 qce

 }
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CancelDeliveryOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelDeliveryOrderController
+{
+    /**
+     * @param Request $request
+     * @param CancelOrderLogic $logic
+     * @return JsonResponse
+     */
+    public function cancel(Request $request, CancelDeliveryOrderLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CreateDeliveryCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateDeliveryCustomerLogic $createDeliveryCustomerLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateDeliveryCustomerLogic $createDeliveryCustomerLogic): JsonResponse
+    {
+        return $createDeliveryCustomerLogic->execute($request);
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CreateDeliveryOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryOrderController
+{
+    /**
+     * @param Request $request
+     * @param CreateDeliveryOrderLogic $createDeliveryOrderLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateDeliveryOrderLogic $createDeliveryOrderLogic): JsonResponse
+    {
+        return $createDeliveryOrderLogic->execute($request);
+    }
+}
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+
+use App\Classes\Modules\Exports\Services\ExportsCustomers;
+use App\Classes\Modules\Exports\Services\ExportsMultipleDeliveryOrders;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportDeliveryOrdersToExcelController
+{
+
+    /**
+     * ExportCustomersToExcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function lineClear(Request $request){
+        $exportsTransactions = new ExportsMultipleDeliveryOrders($request);
+        $response = $exportsTransactions->download('line-clear-export.xlsx', Excel::XLSX, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+}
@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Delivery;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Delivery\ControllersLogic\ListOrdersLogic;
+
+
+class ListOrdersController
+{
+    /**
+     * @param Request $request
+     * @param ListOrdersLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListOrdersLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsArrivedParcel;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportArrivedParcelController
+{
+    /**
+     * ExportArrivedParcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsArrivedParcel($request);
+        $response = $exportsPendingArrangementDeliveryList->download('arrived-parcel.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers\Exports;

+use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
 use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -22,7 +23,14 @@ class ExportPendingArrangementPackingListController

    public function export(Request $request) {
        $exportsPendingArrangementDeliveryList = new ExportsPendingArrangementDeliveryList($request);
-        $response = $exportsPendingArrangementDeliveryList->download('pending-arrangement-packing-list.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+    public function onHold(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsOnHoldPackingList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
        ob_end_clean();
        return $response;
    }
@@ -41,7 +41,7 @@ class DownloadOrderQrPdfController
            $warehousePrefix = 'YW/';
        }

-        if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
+        if(in_array($warehouse->reference,[WarehouseReferences::YD_GUANG_ZHOU, WarehouseReferences::YD_GUANG_ZHOU_2])){
            $warehousePrefix = 'YD/';

            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan' || in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
@@ -18,7 +18,7 @@ class CompanyResource extends JsonResource
     */
    public function toArray($request)
    {
-        $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first();
+        $companyModule = $this->companyModules()->first();
        return [
            'id' => $this->id,
            'hash_id' => Crypt::encryptString($this->id),
@@ -30,8 +30,8 @@ class CompanyResource extends JsonResource
            'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
            'employee' => new UserResource($companyModule->employees()->first()),
            'company_module' => new CompanyModuleResource($companyModule),
-            'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null),
-            'order_count' => $this->orders()->count(),
+            'last_order' => $companyModule->type === 7 ? new DeliveryOrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()) : new OrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()),
+            'order_count' => $companyModule->orders()->count(),
            'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first()),
            'created_at' => $this->created_at->format('d-m-Y')

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DeliveryOrderResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'reference' => $this->reference,
+            'type' => (int) $this->type,
+            'status' => (int) $this->status,
+            'company_module' => new CompanyModuleResource($this->companyModule),
+            'sender_address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->where('type', AddressType::PICK_UP)->first()),
+            'delivery_address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->where('type', AddressType::DELIVERY)->first()),
+            'packingList' => new DeliveryPackingListResource($this->packingLists()->first()),
+            'remarks' => RemarkResource::collection($this->remarks),
+            'created_at' => $this->created_at->format('d-m-Y')
+        ];
+
+    }
+}
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DeliveryPackingListResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $package = $this->packages()->first();
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'type' => $package->type,
+            'description' => $package->description,
+            'weight' => (float) $package->weight,
+            'quantity' => (float) $package->quantity,
+        ];
+    }
+}
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Interfaces\Steppable;
+use App\Classes\General\Interfaces\Transportable;
+use App\Classes\General\Interfaces\Packable;
+use App\Classes\General\Interfaces\Transactionable;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+
+class Addon extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'addons';
+
+    protected $fillable = ['status'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+}
@@ -58,6 +58,14 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable,
        return $this->morphMany(PackingList::class, 'owner');
    }

+    /**
+     * @return MorphMany
+     */
+    public function addons(): morphMany
+    {
+        return $this->morphMany(Addon::class, 'owner');
+    }
+
    /**
     * @return MorphMany
     */
@@ -36,6 +36,14 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
        return $this->morphTo();
    }

+    /**
+     * @return MorphMany
+     */
+    public function addons(): morphMany
+    {
+        return $this->morphMany(Addon::class, 'owner');
+    }
+
    public function containers(): BelongsToMany
    {
        return $this->BelongsToMany(Container::class, ContainerPackingList::class);
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAddonsTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('addons', function (Blueprint $table) {
+            $table->id();
+            $table->morphs('owner');
+            $table->string('reference',200);
+            $table->integer('type')->default(0);
+            $table->integer('quantity')->default(1);
+            $table->integer('status')->default(0);
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_addons');
+    }
+}
@@ -16,6 +16,7 @@ use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -112,7 +113,7 @@ class CompaniesTableSeeder extends Seeder
                /** @var CompanyModule $companyModule */
                $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::FREIGHT_FORWARDER);

-                $address = new AddressObject('Malaysian Global Innovation & Creativity Center Level 1 CWS', 'Block 3730,Persiaran APEC', 1, 15, 402, 63000);
+                $address = new AddressObject('Malaysian Global Innovation & Creativity Center Level 1 CWS', 'Block 3730,Persiaran APEC', 1, 15, 402, 63000, AddressType::BILLING, ApprovalStatus::APPROVED);
                $this->createsAddress->execute($companyModule, $address);

                $contact = new ContactObject('Office Number', '0182909252', '', '');
@@ -131,22 +132,22 @@ class CompaniesTableSeeder extends Seeder

                        if ($name === 'Guangzhou'){
                            $companyModule->update(['name' => $name, 'reference' => 'GZ-V01']);
-                            $address = new AddressObject('白云区，大朗南路 白云湖大道自编13号 7号仓库', '高德地图导航：广州市世通行', 2, 35, 633, 510450);
+                            $address = new AddressObject('白云区，大朗南路 白云湖大道自编13号 7号仓库', '高德地图导航：广州市世通行', 2, 35, 633, 510450, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                            $contact = new ContactObject('杨维民', '13600055019', '', '');
                        } elseif ($name === 'Yiwu') {
                            $companyModule->update(['name' => $name, 'reference' => 'YW-V01']);
-                            $address = new AddressObject('义乌市诚信大道义乌港A区2楼194号', '', 2, 27, 532, 322000);
+                            $address = new AddressObject('义乌市诚信大道义乌港A区2楼194号', '', 2, 27, 532, 322000, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                            $contact = new ContactObject('小曾', '13575982901', '', '');
                        } elseif ($name === 'Klang') {
                            $companyModule->update(['name' => $name, 'reference' => 'KL-V01']);
-                            $address = new AddressObject('LOT 1357 A, JALAN TANJUNG SHAWAL', 'KAMPUNG SUNGAI PINANG', 1, 15, 412, 41400);
+                            $address = new AddressObject('LOT 1357 A, JALAN TANJUNG SHAWAL', 'KAMPUNG SUNGAI PINANG', 1, 15, 412, 41400, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                            $contact = new ContactObject('Mr. Yang', '0162237680', '', '');
                        } elseif ($name === 'Sabah') {
                            $companyModule->update(['name' => $name, 'reference' => 'SB-V01']);
-                            $address = new AddressObject('Warehouse A & B, No. 2, Lorong Kacang Tanah 1', 'Jalan Kolombong, Kolombong', 1, 13, 316, 88450);
+                            $address = new AddressObject('Warehouse A & B, No. 2, Lorong Kacang Tanah 1', 'Jalan Kolombong, Kolombong', 1, 13, 316, 88450, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                        } elseif ($name === 'Sarawak') {
                            $companyModule->update(['name' => $name, 'reference' => 'SRW-V01']);
-                            $address = new AddressObject('OPPOSITE HT POLE 51, LT 664 JALAN SUNGAI SALIM', '', 1, 14, 381, 96000);
+                            $address = new AddressObject('OPPOSITE HT POLE 51, LT 664 JALAN SUNGAI SALIM', '', 1, 14, 381, 96000, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                        }


@@ -161,7 +162,7 @@ class CompaniesTableSeeder extends Seeder
                /** @var CompanyModule $companyModule */
                $companyModule = $this->createCompanyModuleProcessor->execute($company, $businessType);

-                $address = new AddressObject('2, Jalan TSB 6, Taman Industri Sungai Buloh', '', 1, 15, 419, 47000);
+                $address = new AddressObject('2, Jalan TSB 6, Taman Industri Sungai Buloh', '', 1, 15, 419, 47000, AddressType::BILLING, ApprovalStatus::APPROVED);
                $this->createsAddress->execute($companyModule, $address);

                $contact = new ContactObject('Office Number', '036148 8108', '', '');
@@ -0,0 +1,147 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Processors\CreateAddressFromOldAddressProcessor;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\CompanyModule;
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+use App\Models\Company;
+
+class LastMileDeliveryTableSeeder extends Seeder
+{
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var UpdatesCompanyStatus*/
+    private $updatesCompanyStatus;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var CreateAddressFromOldAddressProcessor */
+    private $createAddressFromOldAddressProcessor;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CreatesCompany */
+    private $createsCompany;
+
+    /** @var CreatesContact */
+    private $createsContact;
+
+    /** @var CreatesUser */
+    private $createsUser;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /**
+     * LastMileDeliveryTableSeeder constructor.
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param UpdatesCompanyStatus $updatesCompanyStatus
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor
+     * @param CreatesAddress $createsAddress
+     * @param CreatesCompany $createsCompany
+     * @param CreatesContact $createsContact
+     * @param CreatesUser $createsUser
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     */
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, CreatesAddress $createsAddress, CreatesCompany $createsCompany, CreatesContact $createsContact, CreatesUser $createsUser, AssignEmployeeProcessor $assignEmployeeProcessor)
+    {
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->updatesCompanyStatus = $updatesCompanyStatus;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->createAddressFromOldAddressProcessor = $createAddressFromOldAddressProcessor;
+        $this->createsAddress = $createsAddress;
+        $this->createsCompany = $createsCompany;
+        $this->createsContact = $createsContact;
+        $this->createsUser = $createsUser;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+    }
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function run()
+    {
+
+        $companies = [
+            new CompanyObject('Last Mile Delivery', 'HWT', CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED),
+        ];
+
+
+        foreach ($companies as $companyObject) {
+
+            /** @var Company $company */
+            $company = $this->createsCompany->execute($companyObject);
+
+            /** @var CompanyModule $companyModule */
+            $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::LAST_MILE_DELIVERY_AGENT);
+
+            $address = new AddressObject('B-39-13, Menara Simfoni, Jalan Simfoni 2, Balakong', 'Block 3730,Persiaran APEC', 1, 15, 432, 43300, AddressType::BILLING, ApprovalStatus::APPROVED);
+            $this->createsAddress->execute($companyModule, $address);
+
+            $contact = new ContactObject('Office Number', '01155543194', '', '');
+            $this->createsContact->execute($companyModule, $contact);
+
+            $user_object = new RegistrationObject('CQ', 'hywavetech168@gmail.com', 'FIzxqcZFFob7btVLEfWC', 'FIzxqcZFFob7btVLEfWC', RoleTypes::USER, ApprovalStatus::APPROVED);
+
+            /** @var User $user */
+            $user = $this->createsUser->execute($user_object);
+
+            $Object = new EmploymentObject($companyModule, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+
+            continue;
+
+        }
+    }
+}
@@ -17,6 +17,7 @@ use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -104,10 +105,10 @@ class ModernWarehouseTableSeeder extends Seeder

        /** @var CompanyModule $companyModule */
        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
-        $companyModule->update(['name' => 'Yiwu', 'reference' => 'YW-V02']);
+        $companyModule->update(['name' => 'Guangzhou', 'reference' => 'GZ-V02']);

-        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000);
-        $contact = new ContactObject('韩成名', '18058489899 / 18058929899', '', '');
+        $address = new AddressObject('广东省 广州市 白云区 江高镇松岗街七横63号', '', 2, 35, 633, 510450, AddressType::BILLING, ApprovalStatus::APPROVED);
+        $contact = new ContactObject('郑先生', '13719211997', '', '');

        $this->createsAddress->execute($companyModule, $address);
        $this->createsContact->execute($companyModule, $contact);
@@ -67,11 +67,11 @@
                this.submit(this.route('api.account.authentication.logout'), 'get', this.section, false, false)
            },
            successHandler(){
-                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(this.$store.getters.getCompanyModuleType) ? this.route('last_mile_delivery.login') : this.route('login') });
                this.$store.dispatch('updateIfCreateNewOrder','');
            },
            errorHandler(){
-                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+                this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(this.$store.getters.getCompanyModuleType) ? this.route('last_mile_delivery.login') : this.route('login') });
            }
        }
    }
@@ -25,7 +25,7 @@
                    </div>
                    <div class="row m-t-15 align-items-center justify-content-center">
                        <div class="col">
-                            <div class="btn btn-block btn-lg btn-primary b-rad-none no-border" @click="submitForm">Sign In</div>
+                            <div class="btn btn-block btn-lg b-rad-none no-border" :class="[{'btn-primary': currentUrl.indexOf('last_mile_delivery') === -1 }, {'btn-info': currentUrl.indexOf('last_mile_delivery') > -1 }]" @click="submitForm">Sign In</div>
                        </div>
                    </div>
                    <div class="row m-t-15">
@@ -55,7 +55,8 @@
                parameters: {
                    email: this.email,
                    password: ''
-                }
+                },
+                currentUrl: window.location.href,
            };
        },
        methods: {
@@ -0,0 +1,103 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row text-left" @keyup.enter="submitForm">
+                <div class="col">
+                    <error-message-component class="m-b-20" :error="error"></error-message-component>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-15">
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.name">
+                                        <label>Full Name</label>
+                                        <input class="form-control" v-model="parameters.name">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5">
+                                    <validation-wrapper-component :validator="$v.parameters.phone">
+                                        <label>Phone</label>
+                                        <input class="form-control" v-model="parameters.phone">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.email">
+                                        <label>Email</label>
+                                        <input class="form-control" v-model="parameters.email">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+
+                            <div class="row m-b-15">
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.password">
+                                        <label>Password</label>
+                                        <input class="form-control" type="password" v-model="parameters.password">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5">
+                                    <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                        <label>Password Confirmation</label>
+                                        <input class="form-control" type="password" v-model="parameters.password_confirmation">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-auto">
+                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
+                                        <div class="row align-items-center">
+                                            <div class="col-auto p-r-10">
+                                                <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                            </div>
+                                            <div class="col p-l-5">I already have an account</div>
+                                        </div>
+                                    </button>
+                                </div>
+                                <div class="col text-right">
+                                    <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 b-rad-none p-r-30" :class="[{'btn-primary': currentUrl.indexOf('last_mile_delivery') === -1 }, {'btn-info': currentUrl.indexOf('last_mile_delivery') > -1 }]"  @click="submitForm()">
+                                        <div class="row align-items-center">
+                                            <div class="col p-r-5">Sign Up</div>
+                                        </div>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</template>
+<script>
+    import registrationFormValidation from '../../../general/mixins/accounts/validation/newRegistrationFormValidation';
+    export default {
+        data() {
+            return {
+                error: '',
+                step: 1,
+                parameters : {
+                    name: '',
+                    email: '',
+                    type: 1,
+                    phone: '',
+                    password: '',
+                    password_confirmation: '',
+                },
+                currentUrl: window.location.href,
+                status:{
+                    direction:null,
+                },
+                watchCheckEmail:null
+
+            }
+        },
+        methods:{
+            submitForm(){
+                this.submit(this.route('api.delivery.account.registration.register'), 'post', this.section, false, false);
+            }
+        },
+        mixins: [registrationFormValidation]
+    }
+</script>
@@ -6,7 +6,7 @@
                    <error-message-component class="m-b-20" :error="error"></error-message-component>
                    <div class="row">
                        <div class="col">
-                            <div class="row" v-show="step === 1">
+                                <div class="row" v-show="step === 1">
                                <div class="col">
                                    <div class="row m-b-15">
                                        <div class="col">
@@ -304,4 +304,4 @@
        },
        mixins: [registrationFormValidation]
    }
-</script>
+</script>
@@ -36,10 +36,10 @@
                </div>
            </div>
            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAddress">
-                <delete-address-form-component :data="item" section="addressList" class="text-center"></delete-address-form-component>
+                <delete-address-form-component :data="item" :section="section" class="text-center"></delete-address-form-component>
            </modal-component>
            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defaultAddress">
-                <set-default-address-form-component :data="item" section="addressList" class="text-center"></set-default-address-form-component>
+                <set-default-address-form-component :data="item" :section="section" class="text-center"></set-default-address-form-component>
            </modal-component>
        </div>
    </div>
@@ -51,7 +51,11 @@
        props: {
            value: {
                required: false
+            },
+            'section': {
+                type: String,
            }
+
        },
        data(){
            return {
@@ -1,7 +1,7 @@
 <template>
    <div class="row p-t-25 text-left">
        <div class="col">
-            <div class="row">
+            <div class="row" v-if="![7,8].includes($store.getters.getCompanyModuleType)">
                <div class="col">
                    <div class="row m-b-15">
                        <div class="col">
@@ -29,7 +29,7 @@
                    </div>
                    <div class="row m-b-15">
                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                            <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
                                <label>District</label>
                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
                            </validation-wrapper-component>
@@ -73,6 +73,68 @@
                    </div>
                </div>
            </div>
+            <div class="row" v-if="[7,8].includes($store.getters.getCompanyModuleType)">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Company Name</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.person_in_charge">
+                                <label>Name</label>
+                                <input class="form-control" name="person_in_charge" v-model="parameters.person_in_charge">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                <label>Phone</label>
+                                <input class="form-control" name="phone" v-model="parameters.phone">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md-3 pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label>Unit No.</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label>Street Address</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-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                <label>City/Town</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-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.post_code">
+                                <label>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">
+                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                <label>Remark</label>
+                                <input class="form-control" name="remark" v-model="parameters.remark">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
            <div class="row">
                <div class="col">
                    <div class="row">
@@ -93,6 +155,10 @@
            id: {
                type: Number,
                required: true
+            },
+            type: {
+                type: Number,
+                default: 2
            }
        },
        data() {
@@ -104,6 +170,7 @@
                    street_two: '',
                    district_id: '',
                    post_code: '',
+                    type: this.type,
                    remark: '',
                    phone: '',
                    person_in_charge: '',
@@ -118,6 +185,7 @@
                this.parameters.street_two = this.data.street_two;
                this.parameters.district_id = this.data.district.id;
                this.parameters.post_code = this.data.post_code;
+                this.parameters.type = this.data.type;
                this.parameters.phone = this.data.contact ? this.data.contact.phone : '';
                this.parameters.person_in_charge = this.data.contact ? this.data.contact.reference : '';
                this.parameters.remark = this.data.remark ? this.data.remark.content : '';
@@ -0,0 +1,19 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <p class="no-margin bold">{{item.contact.reference}}</p>
+                    <p class="no-margin">{{item.contact.phone}}</p>
+                    <p class="no-margin">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
@@ -6,37 +6,6 @@
                    <customer-profile-component :data="company"></customer-profile-component>
                </div>
            </div>
-            <div class="alert alert-info padding-15" role="alert">
-                <div class="row">
-                    <div class="col"></div>
-                    <div class="col-auto">
-                        <i class="fa fa-times text-info-darker pointer" data-dismiss="alert"></i>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <p>[清明节仓库放假通知 Qing Ming Warehouse Holiday Notice]<br>
-
-                            尊敬的客户们：<br>
-
-                            仓库将为 2022年清明节假期做出如下安排 ：<br>
-
-                            广州仓库 ： 2022 年 4月 4日 - 2022 年 4月 5日 （4月6日复工）<br>
-                            义乌仓库 ： 2022 年 4月 3日 - 2022 年 4月 4日 （4月5日复工）<br>
-
-                            *放假期间没有仓库人员值班， 请大家安排好送货时间， 感谢<br><br>
-
-                            Dear Customers :<br>
-
-                            Our warehouse holiday for Qing Ming is as below :<br>
-
-                            Guangzhou : 4 April 2022 - 5 April 2022 (Resume date : 6 April)<br>
-                            Yiwu : 3 April 2022 - 4 April 2022 (Resume date : 5 April)<br>
-
-                            *Warehouse personnel are on leave during the holiday period, please arrange delivery date in advance, thank you</p>
-                    </div>
-                </div>
-            </div>
            <div class="row" v-show="!$store.getters.isShowing('createOrderForm')">
                <div class="col">
                    <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
@@ -25,6 +25,10 @@
        <div class="col">
            <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}</p>
+            <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="rescheduleTransport">Reschedule Transport</div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="rescheduleTransport">
+                <reschedule-transport-date-form-component :data="item"></reschedule-transport-date-form-component>
+            </modal-component>
        </div>
        <div class="col-auto text-right" v-if="!item.transport">
            <div class="row m-b-5">
@@ -1,244 +0,0 @@
-<template>
-    <div class="row justify-content-center" @keyup.enter="submitForm">
-        <div class="col">
-            <div class="row">
-                <div class="col">
-                    <div class="row m-b-10">
-                        <div class="col">
-                            <div class="row m-b-0 text-primary">
-                                <div class="col">
-                                    <label class="text-primary fs-11 all-caps">Select the delivery type</label>
-                                </div>
-                            </div>
-                            <div class="row text-center justify-content-center">
-                                <div class="col p-r-5">
-                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 'driver', 'b-grey': parameters.company_module_id !== 'driver'}"  @click="parameters.company_module_id = 'driver'">
-                                        <div class="row m-b-15 justify-content-center">
-                                            <div class="col-8">
-                                                <img src="/images/guangzhou-map.png" class="w-100">
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col">
-                                                <h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 'driver', 'semi-bold': parameters.company_module_id === 'driver'}">Driver</h5>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col p-l-5">
-                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 'courierService', 'b-grey': parameters.company_module_id !== 'courierService' }"  @click="parameters.company_module_id = 'courierService'">
-                                        <div class="row m-b-15 justify-content-center">
-                                            <div class="col-8">
-                                                <img src="/images/yiwu-map.png" class="w-100">
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col">
-                                                <h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 'courierService', 'semi-bold': parameters.company_module_id === 'courierService'}">Courier Service</h5>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    
-                    <div class="row" v-show="parameters.company_module_id === 'courierService'">
-                        <div class="col">
-                           <div class="row m-b-10">
-                               <div class="col">
-                                    <div class="btn btn-xs btn-primary no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="courierService.status = !courierService.status">
-                                        <div class="row">
-                                            <div class="col p-t-10 p-b-10">
-                                                {{courierService.name ? courierService.name : 'Please Select'}}
-                                            </div>
-                                            <div class="col-auto bg-primary-light">
-                                                <div class="row h-100 align-items-center">
-                                                    <div class="col">
-                                                        <i class="fa" :class="[{'fa-angle-down': !courierService.status}, {'fa-angle-up': courierService.status}]"></i>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="relative w-100">
-                                        <div class="absolute w-100 b-l b-b b-r b-primary" :class="[{'hide': !courierService.status}]" style="top: 100%; right: 0; z-index: 1;">
-                                            <div class="row text-left no-margin bg-white">
-                                                <div class="col no-padding">
-                                                    <div class="row no-margin" :class="[{'bg-primary-light': courierService.name === 'Pos Laju'}, {'text-white': courierService.name === 'Pos Laju'}, {'hover-primary': courierService.name !== 'Pos Laju'}]" @click="updateCourierService({name: 'Pos Laju', id: 'pos_laju'})">
-                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                            <div class="row align-items-center justify-content-center">
-                                                                <div class="col">
-                                                                    <div class="font-heading fs-10">Pos Laju</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row no-margin" :class="[{'bg-primary-light': courierService.name === 'GD Express'}, {'text-white': courierService.name === 'GD Express'}, {'hover-primary': courierService.name !== 'GD Express'}]"  @click="updateCourierService({name: 'GD Express', id: 'gd_express'})">
-                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                            <div class="row align-items-center justify-content-center">
-                                                                <div class="col">
-                                                                    <div class="font-heading fs-10">GD Express</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row no-margin" :class="[{'bg-primary-light': courierService.name === 'City-Link'}, {'text-white': courierService.name === 'City-Link'}, {'hover-primary': courierService.name !== 'City-Link'}]"  @click="updateCourierService({name: 'City-Link', id: 'city_link'})">
-                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                            <div class="row align-items-center justify-content-center">
-                                                                <div class="col">
-                                                                    <div class="font-heading fs-10">City-Link Express</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                               </div>
-                           </div>
-                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_reference">
-                                <label class="text-primary">Tracking Number</label>
-                                <input type="text" class="form-control fs-12" v-model.trim="parameters.container_reference">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="row" v-show="parameters.company_module_id === 'driver'">
-                        <div class="col m-b-10">
-                           <div class="btn btn-xs btn-primary no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="driver.status = !driver.status">
-                                <div class="row">
-                                    <div class="col p-t-10 p-b-10">
-                                        {{driver.name ? driver.name : 'Please Select'}}
-                                    </div>
-                                    <div class="col-auto bg-primary-light">
-                                        <div class="row h-100 align-items-center">
-                                            <div class="col">
-                                                <i class="fa" :class="[{'fa-angle-down': !driver.status}, {'fa-angle-up': driver.status}]"></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="relative w-100">
-                                <div class="absolute w-100 b-l b-b b-r b-primary" :class="[{'hide': !driver.status}]" style="top: 100%; right: 0; z-index: 1;">
-                                    <div class="row text-left no-margin bg-white">
-                                        <div class="col no-padding">
-                                            <div class="row no-margin" :class="[{'bg-primary-light': driver.name === 'Driver1'}, {'text-white': driver.name === 'Driver1'}, {'hover-primary': driver.name !== 'Driver1'}]" @click="updateDriver({name: 'Driver1', id: 'driver1'})">
-                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <div class="font-heading fs-10">Driver 1</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="row no-margin" :class="[{'bg-primary-light': driver.name === 'Driver2'}, {'text-white': driver.name === 'Driver2'}, {'hover-primary': driver.name !== 'Driver2'}]"  @click="updateDriver({name: 'Driver2', id: 'driver2'})">
-                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <div class="font-heading fs-10">Driver 2</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="row no-margin" :class="[{'bg-primary-light': driver.name === 'Driver 3'}, {'text-white': driver.name === 'Driver 3'}, {'hover-primary': driver.name !== 'Driver 3'}]"  @click="updateDriver({name: 'Driver 3', id: 'driver3'})">
-                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <div class="font-heading fs-10">Driver 3</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <p>{{item.length}}</p>
-
-                    <div class="row">
-                        <div class="col-12 col-md-6 pr-md-1">
-                            <validation-wrapper-component class="m-b-10" :validator="$v.parameters.etd">
-                                <label class="text-primary">ETD</label>
-                                <date-picker-component :parameters="parameters" :value="'etd'"></date-picker-component>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col-12 col-md-6 pl-md-1">
-                            <validation-wrapper-component class="m-b-10" :validator="$v.parameters.eta">
-                                <label class="text-primary">ETA</label>
-                                <date-picker-component :parameters="parameters" :value="'eta'"></date-picker-component>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="row m-t-15 align-items-center justify-content-end">
-                        <div class="col-auto">
-                            <div class="btn btn-default b-rad-none btn-lg" @click="$store.dispatch('toggleSection', {name: 'createDeliveryPackingListFormSection', status: false})">Cancel</div>
-                            <div class="btn rounded btn-primary btn-lg" @click="submitForm">Submit</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required } from "vuelidate/lib/validators";
-
-    export default {
-        data() {
-            return {
-                parameters: {
-                    company_module_id: this.company_module_id,
-                    packing_list_id: [160, 161],
-                    etd: this.etd, 
-                    eta: this.eta, 
-                },
-                courierService: {
-                    name: '',
-                    id: '',
-                    status: false
-                },
-                driver: {
-                    name: '',
-                    id: '',
-                    status: false
-                },
-            };
-        },
-        validations: {
-            parameters: {
-                etd: { required },
-                eta: { required },
-            }
-        },
-        methods: {
-            updateCourierService(courierService){
-                this.courierService = {
-                    name: courierService.name,
-                    id: courierService.id,
-                    status: false,
-                }
-            },
-            updateDriver(driver){
-                this.driver = {
-                    name: driver.name,
-                    id: driver.id,
-                    status: false,
-                }
-            },
-            submitForm(){
-                this.submit(this.route('api.packing_list.create.deliver'), 'post', this.section, true, true)
-            },
-        },
-        mixins: [componentHandler, modalFormHandler]
-    }
-
-</script>
@@ -0,0 +1,66 @@
+<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">
+                    <p>Plese set the approximate dates of below.</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-auto mt-10 mb-10">
+                        <div class="col p-l-0 p-r-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.etd">
+                                <label class="text-primary">Etd</label>
+                                <date-picker-component v-model="parameters.etd"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col p-r-0 p-l-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.eta">
+                                <label class="text-primary">Eta</label>
+                                <date-picker-component v-model="parameters.eta"></date-picker-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="submit(route('api.packing_list.reschedule', data.id), 'put', section, true, true)">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            section:{
+                type: String,
+                default: ''
+            },
+        },
+        data() {
+            return {
+                parameters: {
+                    etd: this.etd, 
+                    eta: this.eta, 
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                etd: { required },
+                eta: { required },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
@@ -2,7 +2,7 @@
    <div class="animate__animated" :class="[{'animate__shake': validator.$error}]">
        <div class="row">
            <div class="col">
-                <div class="form-group no-margin form-group-default" :class="[{' has-error': validator.$error}, {'form-group-default-select2': selecatable}, {'p-b-5': selecatable}]">
+                <div class="form-group no-margin form-group-default" :class="[{' has-error': validator.$error}, {'form-group-default-select2': selectable}, {'p-b-5': selectable}]">
                    <slot></slot>
                </div>
            </div>
@@ -21,7 +21,7 @@
            validator: {
                required: true
            },
-            selecatable: {
+            selectable: {
                type: Boolean,
                default: false
            }
@@ -0,0 +1,39 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <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">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to cancel this order?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.delivery.order.cancel', item.id), 'put', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler],
+        methods: {
+            successHandler(){
+                this.closeModal();
+                this.$store.dispatch('reloadList', {'name': 'ListOrderTableSection'});
+            }
+        }
+
+    }
+</script>
@@ -0,0 +1,365 @@
+<template>
+    <div class="row justify-content-center" @keyup.enter="submitForm">
+        <div class="col">
+            <div class="row">
+                <div class="col col-md-8">
+                    <div class="row m-b-20">
+                        <div class="col-12 col-md-7">
+                            <div class="row m-b-10 text-info">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 bold">Service Type</h5>
+                                </div>
+                            </div>
+                            <div class="row text-center justify-content-center">
+                                <div class="col p-l-5">
+                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-info': parameters.type === 1, 'b-grey': parameters.type !== 1 }" @click="parameters.type = 1">
+                                        <div class="row justify-content-center">
+                                            <div class="col-8">
+                                                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABmJLR0QA/wD/AP+gvaeTAAAEJklEQVR4nO3aS6hVVRzH8c8tsUKvjWoQBGGPSZFGg0ot8+YgMBoKEQhBBBFNokFkUhOzGjSoUVnUMIugUQ8pe4gVRhFISpMI7UpGpuiN3vc0WOt0ttt93nufvW93fWFxNov9/6///p211l7rvzaJRCKRSCQSiUQikUgkEolEIpFIJBY5S/E0jqJVUZnDAWzHpZN5rMnxlOqEKyqncM9EnmxCzAoPdtOQdm1BBmEZbsbr0WYe9w7ZXmMZRogy7O4XBPwT60awbxyTFpAw57bwIy4Z0UdjqEPAc/FetP9UeJEtWOoQEC7Gkejj2TH81E5dAsIN+D362Tymr9qoU0B4IPo5jatL8Ddx6hYQXom+vsWFJfmcGE0Q8AJ8Gf29hamS/E6EJggIl+F49PlwiX4rpykCwp3CIvsvzJTpeEr5wS4EvsP7sbwrvGhGYjEK+Kuwh27zG/ZidywHhnVYxZAhBPXJBO0GZSk2YIfwgvnHmVmdo3gVdwuL8r5UJeBC4SLcJSx52hmkdpnHV0JqbgbnFTlY7ALmuQYP4R1huGcF/QlbsSRrUJScPIzbxwxknzAcx7XbWxDfKH5H4XxsxDP4OtP+m0LigoLgsiKOQ1lzYJGAVc6RvVgrpMpa2NKuLBrCaVh3Z7OgzWftiiRgbzZhP/5w9hkMqhvCZc2BdbJJ74Ms53QxPIL7xmx83mi9eFS7Kngi/j4iLGGmFCQk0nDtzilBm+W5+r49MBHYH38f1ON8paoe+H+YA2fwtxHmwG5sxE4hwzuHk8Lm+0XhLDY7PzRxDszHPxevd+K2gvv34A58IZw3FzJID7xc8YI2X3YLCcymMWj8H2PlAP7O0KyfgOuEntYSVuGPYpWQElqG1cL+sL1CP4HrB32yCTBs/Cexpo/PgQW8ShCkhdec/TbKMo1d8d6f8bn658BR4/8FV3SJZ5+OZqvoLuCU0KXbjQ9yIDOl86FPC28PYJOnrHzguPHv6RJPdir4nu4C3qrT7Xv9c3mmcSzarh/CrmzKiP+WHve10Or1Fm5nG54T3lZtsh9OzgqZ3ewa6TSez/mog4nF387C5ifOg7H+2lx90YeTT+buWR3rDw4SQI6y5sAy4v+mh///Ru6OAofZku/+WcHXxuvZ3D3TfXxOslQZ/+EleDwabTHcN3XZSbmqhW+VjBt/34RLtyFQ1GO35+4ZZAhUTe3xvxydbM3VL41BzOKH2Hh+o70t2r40TgBjUnv863WWAdND2K0QTq9awgfgddGI+D+KjnYZfCH6RrT5YNzGS6D2+K8UtjUtYYXe659ckWn8uLCBr5tGxL9GZz95DI/hOmF5sDxeb9Pp9idwY1mNl0Aj4l+pMxx6lQ81M53VmPhn8AIO6SQkD8W6DVU2XBILPf5EIpFIJBKJRCKRSCQSiUQiUSP/AlkkSdKJddQ3AAAAAElFTkSuQmCC" class="w-100">
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <h5 class="no-margin" :class="{ 'text-info': parameters.type === 1, 'semi-bold': parameters.type === 1}">Pick Up</h5>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-r-5">
+                                    <div class="b-a b-grey bg-master-lighter p-t-15 p-b-15 p-l-35 p-r-35">
+                                        <div class="absolute bg-master text-white p-t-5 p-b-5 p-r-10 p-l-10 fs-8" style="border-radius: 10px 0px; top: -10px; right: -15px;">Coming Soon</div>
+                                        <div class="row justify-content-center hint-text">
+                                            <div class="col-8 hint-text">
+                                                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABmJLR0QA/wD/AP+gvaeTAAAG00lEQVR4nO2caYwURRSAv4VhOWRBZEEFQgAFFVFARcEjyEpQMCggCoZA/IEHcoioARUNlxKjiTEeqIhRJFFBEQHxwPgDMYCcaqIEMSDBoKKcyyEsO/54r1O9Pd09Bz073UN/yaSnql7XvC6qq1699xaIiYmJiYmJiYmJiSlKWgIzgc1AJXAY2ATMAFoUUK9IMBQ4BCQ9PgeBwQXTLuQMBaqRgVoM9AbO0s+NwKfadop4EFNoiZl5j/nITVGZA0B5LegVGWYiA/NJBrJLVXZ6XjWKGFuQQemdgWwfld2UV40ixmFkUBpnIFumsofyqpEHdQrxoxmQzEK2JId7AiOsA/ibXq/KQNaS2Z4nXXwJ6wAu0+vDGchOctwTg5wwDiKv5RQfuSdVZj/QvBb0ihRDECM5iZgqfZBNpQyoAJZjDOnbC6Rj6BmMGMleR7n9xIOXlnLEcbARMW8OARuAacSvbUxQVABzga2Iy8rtdT0AfAX0K5COoaQDsArvNc7r80QhlA0b/TAbxF/AVKAr4q5yozkycFWIm6uiFnQMLfcAJ5DBWwQ0zeLeSXrfijzoFQmexjhKZ2POsplSrvf+G7BeoScBzEMevgp4IMd+mmkfJ4AmwagWDeYjD14JDHRp7wQsAK5P089NmM3kpSAVDDMjMSeHHi7tfYF9KvNymr6ewgxgFXBlcGqGF8tUGenS9iBwEjMo96bpa4XK/ajX9UDdwDQNIQ2RmXJSv1skgFeQQajGbCyX+/RVBzNTLwJ26vfxgWsdInogD/mTra4e8KXWHwMm6vfD+M+mzir3u5YHYuLDrQLVOkNqw6HaTa9bbHW3IIb034ibyvImb0DcU15cq9c1el2GRO6aAKsR/2Cb01c5c2pjALvq9QdbnTWo84G1wDVaXpemr14uchOAbUB7YBbyWn8O3AnUz03lcLEaec362uoWa90ILa/U8qA0fW1VuY1Aqa2+jvY/HzhCTX/hG0R4py7BuObtiUDbta4L8vD7tey3jp2D2WiSwDM+cuOROLHdAbEJ8XJHigsQ5f+w1ZUhA3Ec2UwuUZldafq6FbOBVOn3j4ABeG883RBj+x/Mbn9HDs9RMIYgin9mq7sO8xqCOBYsp4IfszDn59HI7m3Nrj3AC8BlHvfWR7zaSWpuZqFnOqL0s7a6sVo3T8tztPxomr6+UbnbtNwKidj9TOqrOhFJULLTFHOUjAxLEKWH2ere1LoJWv5eyzf49JNAHrwa96TKqxGj3HpVLWfDUuSVLUN8iUnS7/ShYgei9MW2unXUTBzaQ+om4+QKldmW5vdKkUjeEoy/0f6pBvpn9QQF5iiiuOVlTiBmRjVwNmIAW7HfRj79jFOZd7L47RbILF+PrJdridjggZltjyNrkLWQW8e6fpjZ0dmnnwUqMyZvmoaUAdS03ZyZBNNs9X4pHK+pzEqy92BHngHITKxEdkj7acM6gSSRc3Ezjz7Kgb0qNypvmkaMupg86M2ktwVHqcxe4j9vAKA7MiC/IicWK8Q51kO+BDNj36sNBcOOc2cdquXjiNniRjtM5sIZn6HwPqku/Fe1bjveseLJKrMD7yD8GcEuUs2X+sgZOQks9LgvgfG0PJdPBcNMG2QA9pHq1LXiJH52Xw9MnKV7nnQMNcNI9dKA7Mx/YgbQbz18kTMkKuekHsaBMNnRVoE5886xfXfLQGiMicplkoxeNFh/xrWLVMPZ8tTMoOZ6+KFHX/21/QgSEyl6eiHrVhWp7qtGmNOG5RjtiDG27/fo8wPcl4OiowwTC5nt0m5tHhsc9cMx8eOuzpuAczHB9uFBKRtG3sZ4jEsdbTdj4iRug/Q65tTith6OxhzzivLPXgdhZlEXR1s5xqn6iMf9DTC2n9t6WAJ8re1vBaBvqGiFcbW7nXMXadsq/M2RCzEhUrcEpI7IP1A1kgJXFJQgi3sSyYVx+vLuwwTA22bQ312YmexmQE/FmD4NclM5XDyEWZvOd7R1wOywd2fRp2XquNmHCcwfa8/MQd+88h3wbRblTkhMZA+pKRsJJEEoibjrs+m/IZJnY7/XTi/ENfYfcOlp6J8R2SQXWa75TMtjkId9HomS2ZkK9ESM6XFZ9n8MeZUrkdya0Y6+1yBZrKXUPKFkq3/BsXZWZ75LT8SYPoX89yW5MkL7P0pqRkJbbdt9Gv0XHGvHtOfrNUZsuaBcUXMxOTL1bPWtMXGWyPIx8hDLkUFsB3yBiYE4jelcaIjJlV4GnIecTKyd3+sMHQk6UTPVwvrsRGy2oGgP/OLyO/uQnT7StEZmwUHE1nsXmSVB0xyJHe9GTKaFFMHgxcTExMTExMTExBQt/wPtRjB5yTmw/QAAAABJRU5ErkJggg==" class="w-100">
+                                            </div>
+                                        </div>
+                                        <div class="row hint-text">
+                                            <div class="col hint-text">
+                                                <h5 class="no-margin">Walk In</h5>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-10 text-info">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 bold">Parcel Details</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col-12 col-md-4">
+                                            <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.packing_list.type">
+                                                <label class="text-primary">Goods Type</label>
+                                                <select-component :options="[{'id': 0, 'text': 'Package'}, {'id': 3, 'text': 'Documents'}, {'id': 1, 'text': 'Pallet'}]" v-model="parameters.packing_list.type"></select-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-12 col-md">
+                                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.packing_list.description">
+                                                <label class="text-primary">Goods Name</label>
+                                                <input type="text" class="form-control fs-12" v-model.trim="parameters.packing_list.description">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-12 col-md">
+                                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.packing_list.value">
+                                                <label class="text-primary">Goods Value</label>
+                                                <input type="text" class="form-control fs-12" v-model.trim="parameters.packing_list.value" v-money="money">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-12 col-md">
+                                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.packing_list.weight">
+                                                <label class="text-primary">Weight (KG)</label>
+                                                <input type="text" class="form-control fs-12" v-model.trim="parameters.packing_list.weight" v-money="weight">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-12 col-md">
+                                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.packing_list.quantity">
+                                                <label class="text-primary">Parcel Quantity</label>
+                                                <input type="text" class="form-control fs-12" v-model.trim="parameters.packing_list.quantity" v-money="integer">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-50" v-if="itemDone">
+                        <div class="col">
+                            <div class="row m-b-10 text-info">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 bold">Sender Address</h5>
+                                </div>
+                            </div>
+                            <div class="row justify-content-center" v-if="error">
+                                <div class="col">
+                                    <small class="text-danger">{{error}}</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row no-margin">
+                                        <div class="col">
+                                            <list-component style="min-height: 10px;" section="senderAddressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 5, HasMorphCompanyModule: company.company_module.id, type: 3}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <select-address-component :data="data" section="senderAddressList" :value="parameters.sender_address_id" v-model="parameters.sender_address_id"></select-address-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-10 m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast no-margin">
+                                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.sender_address_id, 'b-grey': parameters.sender_address_id}" @click="parameters.sender_address_id = ''">
+                                            <div class="row align-items-center">
+                                                <div class="col-auto p-r-0">
+                                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.sender_address_id, 'fa-check-circle': !parameters.sender_address_id, 'text-primary': !parameters.sender_address_id}"></i>
+                                                </div>
+                                                <div class="col-auto semi-bold">New Address</div>
+                                            </div>
+                                            <div class="row" v-show="!parameters.sender_address_id">
+                                                <div class="col">
+                                                    <address-form-component :id="company.company_module.id" section="senderAddressList" @input="parameters.sender_address_id = $event" :type="3"></address-form-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20" v-if="itemDone && parameters.sender_address_id">
+                        <div class="col">
+                            <div class="row m-b-10 text-info">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 bold">Delivery Address</h5>
+                                </div>
+                            </div>
+                            <div class="row justify-content-center" v-if="error">
+                                <div class="col">
+                                    <small class="text-danger">{{error}}</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row no-margin">
+                                        <div class="col">
+                                            <list-component style="min-height: 10px;" section="deliveryAddressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 5, HasMorphCompanyModule: company.company_module.id, type: 2}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <select-address-component :data="data" section="deliveryAddressList" :value="parameters.delivery_address_id" v-model="parameters.delivery_address_id"></select-address-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-10 m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast no-margin">
+                                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.delivery_address_id, 'b-grey': parameters.delivery_address_id}" @click="parameters.delivery_address_id = ''">
+                                            <div class="row align-items-center">
+                                                <div class="col-auto p-r-0">
+                                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.delivery_address_id, 'fa-check-circle': !parameters.delivery_address_id, 'text-primary': !parameters.delivery_address_id}"></i>
+                                                </div>
+                                                <div class="col-auto semi-bold">New Address</div>
+                                            </div>
+                                            <div class="row" v-show="!parameters.delivery_address_id">
+                                                <div class="col">
+                                                    <address-form-component :id="company.company_module.id" section="deliveryAddressList" @input="parameters.delivery_address_id = $event"></address-form-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="coll col-md-4">
+                    <div class="row m-b-50">
+                        <div class="col bg-master-lightest">
+                            <div class="row b-b b-grey m-b-15">
+                                <div class="col">
+                                    <h6>Order Summary</h6>
+                                </div>
+                            </div>
+                            <div class="row b-b b-grey m-b-15 p-b-15">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="muted no-margin bold">Items</p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row m-l-0 m-r-0 m-t-10" v-if="itemDone">
+                                                <div class="col p-t-10 p-b-10 bg-white">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <P class="bold no-margin">{{parameters.packing_list.description}}</P>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <p class="muted no-margin">{{ parameters.packing_list.type === '0' ? 'Package' : parameters.packing_list.type === '1' ? 'Pallet' : 'Documents'}} X {{parameters.packing_list.quantity}} - {{parameters.packing_list.weight}}KG</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row" v-if="!itemDone">
+                                                <div class="col">
+                                                    <p class="muted">There are no items added yet!</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row b-b b-grey m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <div class="row m-b-5">
+                                                <div class="col">
+                                                    <p class="muted no-margin bold">From</p>
+                                                </div>
+                                            </div>
+                                            <list-component v-if="parameters.sender_address_id" style="min-height: 10px;" section="senderAddressSummary" :emptyListSection=false :endpoint="route('api.address.list')" :options="{id: parameters.sender_address_id}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <address-profile-section-component :data="data"></address-profile-section-component>
+                                                </template>
+                                            </list-component>
+                                            <div class="row" v-if="!parameters.sender_address_id">
+                                                <div class="col">
+                                                    <p class="muted">There are no address selected yet!</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <div class="row m-b-5">
+                                                <div class="col">
+                                                    <p class="muted no-margin bold">To</p>
+                                                </div>
+                                            </div>
+                                            <list-component v-if="parameters.delivery_address_id" style="min-height: 10px;" section="deliveryAddressSummary" :emptyListSection=false :endpoint="route('api.address.list')" :options="{id: parameters.delivery_address_id}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <address-profile-section-component :data="data"></address-profile-section-component>
+                                                </template>
+                                            </list-component>
+                                            <div class="row" v-if="!parameters.delivery_address_id">
+                                                <div class="col">
+                                                    <p class="muted">There are no address selected yet!</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row b-b b-grey m-b-15 p-b-15">
+                                <div class="col">
+                                    <h6 class="bold no-margin">Total Weight</h6>
+                                </div>
+                                <div class="col-auto">
+                                    <h6 class="bold no-margin">{{(Math.round((parseFloat(parameters.packing_list.weight.toString().replace(",", "")) * parameters.packing_list.quantity + Number.EPSILON) * 10) / 10).toFixed(1)}}KG</h6>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="btn btn-block btn-lg btn-success" v-if="itemDone && parameters.sender_address_id && parameters.delivery_address_id" @click="submit(route('api.delivery.order.create'), 'post', section, true, true)">Create Order</div>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="btn btn-block btn-lg btn-default bg-master-lighter no-border" @click="$store.dispatch('toggleSection', {name: 'createOrderForm', status: false})">Cancel</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required, minValue, number } from "vuelidate/lib/validators";
+    import formHandler from "../../../general/mixins/formHandler";
+    import AddressProfileSectionComponent from "../../addresses/sections/AddressProfileSectionComponent";
+
+    export default {
+        components: {AddressProfileSectionComponent},
+        props: {
+            company: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                step: 1,
+                error: '',
+                parameters : {
+                    type: 1,
+                    sender_address_id: '',
+                    delivery_address_id: '',
+                    company_id: this.company.id,
+                    packing_list: {
+                        description: '',
+                        type: '0',
+                        value: 0.00,
+                        weight: 10,
+                        quantity: 1,
+                    }
+                }
+            }
+        },
+        validations: {
+            parameters : {
+                packing_list: {
+                    description: {},
+                    type: {
+                        required: required
+                    },
+                    value: {
+                        required: required,
+                    },
+                    weight: {
+                        required: required,
+                        minValue: minValue(0.1)
+                    },
+                    quantity: {
+                        required: required,
+                        minValue: minValue(1)
+                    },
+                }
+            }
+        },
+        computed: {
+          itemDone(){
+              return this.validate();
+          }
+        },
+        methods:{
+            createOrder(){
+                this.step++;
+                this.submit((this.route('api.order.create')), 'post', 'orderListSection', false, false)
+            },
+            cancelOrder(){
+                this.parameters.sender_address_id = '';
+                this.parameters.delivery_address_id = '';
+                this.$store.dispatch('toggleSection', {name: this.section, status: false})
+            },
+            successHandler(){
+                window.location.reload();
+            },
+            errorHandler(response){
+                this.error = response.message;
+                this.step--;
+            }
+        },
+        mixins: [formHandler]
+    }
+</script>
@@ -133,9 +133,15 @@
                        </div>
                    </div>
                    <loading-component class="m-l-0" style="height: 50px; top: 0;" color="info"></loading-component>
-                    <div class="row">
+                    <div class="row" v-if="!company.last_order">
                        <div class="col">
-                            <h4 class="text-info">We are generating the <b>QR code</b> that you need to <b>send to your supplier</b> to print to <b>stick to your packages</b>, this QR code is required for us to identify your packages when they arrives at our warehouse!</h4>
+                            <h4 class="text-info">We are generating your first <b>QR code</b></h4>
+                            <p>Please wait...</p>
+                        </div>
+                    </div>
+                    <div class="row" v-if="company.last_order">
+                        <div class="col">
+                            <h4 class="text-info">We are generating the <b>QR code</b> for you to <b>send to your supplier</b> to print and <b>stick to your packages</b>, this QR code is required for us to identify your packages when they arrives at our warehouse!</h4>
                            <p>Please wait...</p>
                        </div>
                    </div>
@@ -176,7 +182,7 @@
        methods:{
            createOrder(){
                this.step++;
-                this.submit((this.route('api.order.create')), 'post', 'orderListSection', true, false)
+                this.submit((this.route('api.order.create')), 'post', 'orderListSection', false, false)
            },
            cancelOrder(){
                this.parameters.warehouse_id = '';
@@ -184,13 +190,18 @@
                this.$store.dispatch('toggleSection', {name: this.section, status: false})
            },
            successHandler(response){
-                let vm = this;
+                if(!this.company.last_order) {
+                    window.location.reload();
+                    return;
+                }
+
                setTimeout(function(){
                    window.location.href = this.route('order.show', response.payload.data.reference)
                }, 5000);

            },
            errorHandler(response){
+                alert(response.message)
                this.error = response.message;
                this.step--;
            }
@@ -0,0 +1,251 @@
+<template>
+    <div class="row">
+        <div class="col no-margin">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-15" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
+                        <div class="col-auto p-r-5">
+                            <div class="row m-b-20">
+                                <div class="col">
+                                    <div class="row m-l-0 m-r-0 bg-master-light padding-10" @keyup.enter="submitSearch()">
+                                        <div class="col-12 col-md mb-2 mb-md-0">
+                                            <div class="row">
+                                                <div class="col p-r-0 h-100">
+                                                    <validation-wrapper-component :validator="$v.orderNumber">
+                                                        <label class="all-caps">Order Number</label>
+                                                        <input class="form-control" v-model.lazy="orderNumber">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-12 col-md mb-2 mb-md-0">
+                                            <div class="row">
+                                                <div class="col p-r-0 h-100">
+                                                    <validation-wrapper-component :validator="$v.orderMarking">
+                                                        <label class="all-caps">Marking</label>
+                                                        <input class="form-control" v-model.lazy="orderMarking">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-12 col-md mb-2 mb-md-0">
+                                            <div class="row">
+                                                <div class="col p-r-0 h-100">
+                                                    <validation-wrapper-component :validator="$v.orderSenderName">
+                                                        <label class="all-caps">Sender Name</label>
+                                                        <input class="form-control" v-model.lazy="orderSenderName">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-12 col-md-auto mb-2 mb-md-0">
+                                            <div class="row h-100">
+                                                <div class="col p-r-0 h-100">
+                                                    <div class="btn btn-primary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30" @click="submitSearch()">
+                                                        Search
+                                                    </div>
+                                                </div>
+                                                <div class="col p-l-0 h-100">
+                                                    <div class="btn btn-secondary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30" @click="resetSearch()">
+                                                        Reset
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <a :href="route('last_mile_delivery.order.export') + '?ids=' + JSON.stringify(selectedOrderId)" target="_blank">
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-complete b-rad-none">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto p-r-0 p-l-0">
+                                            <i class="fa fa-file-excel-o fs-16"></i>
+                                        </div>
+                                        <div class="col p-r-5">Export To Excel</div>
+                                    </div>
+                                </button>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="row overflow-hidden" key="2" v-show="!$store.getters.isLoading(section)">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row scrollable">
+                                        <div class="col">
+                                            <table class="table" style="width: 2500px">
+                                                <thead class="thead-dark">
+                                                <tr>
+                                                    <th class="col-auto pointer align-items-center" @click="chooseAllOrder()" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
+                                                        <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selectAllOrder, 'fa-check-square': selectAllOrder}" ></i>
+                                                    </th>
+                                                    <th scope="col">Created Date</th>
+                                                    <th scope="col">Order Number</th>
+                                                    <th scope="col">Marking</th>
+                                                    <th scope="col">Service Type</th>
+                                                    <th scope="col">Parcel Type</th>
+                                                    <th scope="col">Item Content</th>
+                                                    <th scope="col">Quantity</th>
+                                                    <th scope="col">Weight</th>
+                                                    <th scope="col">Sender Name</th>
+                                                    <th scope="col">Sender Address</th>
+                                                    <th scope="col">Sender Phone</th>
+                                                    <th scope="col">Receiver Name</th>
+                                                    <th scope="col">Receiver Address</th>
+                                                    <th scope="col">Receiver Phone</th>
+                                                </tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr v-for="data in orderData">
+                                                    <td class="col-auto pointer align-items-center" @click="selectOrder(data.id)" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
+                                                        <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selectedOrderId.includes(data.id), 'fa-check-square': selectedOrderId.includes(data.id), 'text-complete': selectedOrderId.includes(data.id)}" ></i>
+                                                    </td>
+                                                    <td>{{data.created_at}}</td>
+                                                    <td class="parentContainer">
+                                                        {{data.reference}}
+                                                        <a :href="'https://www.tracking.my/lineclear/'+data.reference" target="_blank"><div class="btn btn-xs btn-success m-l-10">Track <i class="fa fa-angle-right m-l-5"></i></div></a>
+                                                        <div class="btn btn-xs btn-danger m-l-10 requestModal" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8" data-type="cancelOrder">Cancel <i class="fa fa-times m-l-5"></i></div>
+                                                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="cancelOrder">
+                                                            <cancel-delivery-order-form-component :data="data" :section="section" class="text-center"></cancel-delivery-order-form-component>
+                                                        </modal-component>
+                                                    </td>
+                                                    <td>{{data.company_module.marking}}</td>
+                                                    <td>Walk In</td>
+                                                    <td>{{data.packingList.type === 0 ? 'Package' : data.packingList.type === 1 ? 'Pallet' : 'Documents'}}</td>
+                                                    <td>{{data.packingList.description}}</td>
+                                                    <td>{{data.packingList.quantity}}</td>
+                                                    <td>{{(Math.round((parseFloat(data.packingList.weight.toString().replace(",", "")) * data.packingList.quantity + Number.EPSILON) * 10) / 10).toFixed(1)}}KG</td>
+                                                    <td>{{data.sender_address.contact.reference}}</td>
+                                                    <td>{{data.sender_address.street_one+' '+(data.sender_address.street_two ? data.sender_address.street_two : '')+', '+ data.sender_address.district.name+', '+data.sender_address.post_code+' '+data.sender_address.state.name+', '+data.sender_address.country.name}}</td>
+                                                    <td>{{data.sender_address.contact.phone}}</td>
+                                                    <td>{{data.delivery_address.contact.reference}}</td>
+                                                    <td>{{data.delivery_address.street_one+' '+(data.delivery_address.street_two ? data.delivery_address.street_two : '')+', '+ data.delivery_address.district.name+', '+data.delivery_address.post_code+' '+data.delivery_address.state.name+', '+data.delivery_address.country.name}}</td>
+                                                    <td>{{data.delivery_address.contact.phone}}</td>
+                                                </tr>
+                                                <tr v-if="orderData.length === 0">
+                                                    <td colspan="100%" class="text-center">No data available in table</td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-20">
+                                        <div class="col"></div>
+                                        <div class="col-auto p-r-0" v-show="filters.per_page < metaData.total">
+                                            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                section: 'ListOrderTableSection',
+                orderData: [],
+                selectAllOrder: false,
+                selectedOrderId: [],
+                emptyListSection: false,
+                filters: this.data ? {
+                    company_module_id: this.data.company_module.id,
+                    per_page: 20,
+                    reference_like: '',
+                    orderMarking: '',
+                    orderSenderName: '',
+                    status_in: [2], 
+                    order_by: {
+                        column: 'id',
+                        DESC: true,
+                    },
+                } : {
+                    per_page: 100,
+                    reference_like: '',
+                    orderMarking: '',
+                    orderSenderName: '',
+                    status_in: [2], 
+                    order_by: {
+                        column: 'id',
+                        DESC: true,
+                    }
+                },
+                metaData: {
+                    from: null,
+                    to: null,
+                    total: null,
+                    current_page: null,
+                },
+                orderNumber: '',
+                orderMarking: '',
+                orderSenderName: ''
+            }
+        },
+        validations: {
+            orderNumber: {  }, 
+            orderMarking: {  }, 
+            orderSenderName: {  }
+        },
+        created(){
+            this.setDecoratorDefault();
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                let listDecorators = this.$store.getters.getListDetails(this.section);
+                listDecorators.filters.reference_like = this.orderNumber;
+                listDecorators.filters.orderMarking = this.orderMarking;
+                listDecorators.filters.orderSenderName = this.orderSenderName;
+                this.submit(this.route('api.delivery.order.list') + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.$refs.pagination.makePagination(response.payload.meta, response.payload.links);
+                this.metaData = response.payload.meta;
+                this.orderData = response.payload.data;
+            },
+            chooseAllOrder(){
+                this.selectAllOrder = !this.selectAllOrder;
+                this.selectedOrderId = [];
+                 if (this.selectAllOrder) {
+                    this.$store.getters.getListData(this.section).forEach((value, index) => {
+                        this.selectedOrderId.push(value.id);
+                    });
+                }
+            },
+            selectOrder(orderId){
+                this.selectedOrderId.includes(orderId) ? this.selectedOrderId.splice(this.selectedOrderId.indexOf(orderId), 1) : this.selectedOrderId.push(orderId);
+                this.selectedOrderId.length === this.$store.getters.getListData(this.section).length ? this.selectAllOrder = true : this.selectAllOrder = false;
+            },
+            submitSearch(){
+                this.fetchList();
+            },
+            resetSearch() {
+                this.orderNumber = '';
+                this.orderMarking = '';
+                this.orderSenderName = '';
+                this.fetchList();
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
@@ -26,7 +26,7 @@
                        <div class="col">
                            <div class="row">
                                <div class="col p-r-0">
-                                    <validation-wrapper-component selecatable :validator="$v.model">
+                                    <validation-wrapper-component selectable :validator="$v.model">
                                        <label>Model</label>
                                        <select-component :options="[{id: 1, text: 'Fixed Measurement'}, {id: 3, text: 'Fixed CBM'}, {id: 2, text: 'Ratio Measurement'}, {id: 4, text: 'Ratio CBM'}]" v-model="model"></select-component>
                                    </validation-wrapper-component>
@@ -43,7 +43,7 @@
                                <div class="col p-l-5 p-r-5">
                                    <div class="row">
                                        <div class="col-5 p-r-0">
-                                            <validation-wrapper-component selecatable :validator="$v.custom_field">
+                                            <validation-wrapper-component selectable :validator="$v.custom_field">
                                                <label>Custom Fields</label>
                                                <select-component :options="inActiveFields" v-model="custom_field"></select-component>
                                            </validation-wrapper-component>
@@ -115,7 +115,7 @@
                                                    </validation-wrapper-component>
                                                </div>
                                                <div class="col-7 p-l-5 p-r-5" v-show="custom_fields.bank_id.active">
-                                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id" >
+                                                    <validation-wrapper-component selectable :validator="$v.parameters.configurations.bank_id" >
                                                        <label>Receivable Bank Account</label>
                                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
@@ -103,7 +103,7 @@
                                    </validation-wrapper-component>
                                </div>
                                <div class="col">
-                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id">
+                                    <validation-wrapper-component selectable :validator="$v.parameters.configurations.bank_id">
                                        <label>Receivable Bank Account</label>
                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
                                    </validation-wrapper-component>
@@ -0,0 +1,27 @@
+import { required, email, numeric, sameAs, requiredUnless, requiredIf } from "vuelidate/lib/validators";
+import authenticationHandler from '../authenticationHandler'
+export default {
+    validations: {
+        parameters: {
+            name: {
+                required
+            },
+            email: {
+                required,
+                email
+            },
+            phone: {
+                required,
+                numeric
+            },
+            password: {
+                required
+            },
+            password_confirmation: {
+                required,
+                sameAs: sameAs('password')
+            },
+        }
+    },
+    mixins: [authenticationHandler]
+}
@@ -1,16 +1,24 @@
-import { required, numeric } from "vuelidate/lib/validators";
+import { required, requiredIf, numeric } from "vuelidate/lib/validators";
 import addressFormHandler from '../addressFormHandler'
 export default {
    validations: {
        parameters: {
-            reference: { required },
+            reference: {
+                required: requiredIf(function(){
+                    return ![7,8].includes(this.$store.getters.getCompanyModuleType);
+                })
+            },
            street_one: { required },
-            street_two: {},
+            street_two: {
+                required: requiredIf(function(){
+                    return [7,8].includes(this.$store.getters.getCompanyModuleType);
+                })
+            },
            district_id: { required },
            post_code: { required },
            remark: {},
-            phone: {numeric},
-            person_in_charge: {},
+            phone: {required, numeric},
+            person_in_charge: { required },
        }
    },
    mixins: [addressFormHandler]
@@ -17,6 +17,7 @@ export default {
            isLoading: false,
            error: '',
            money: {decimal: '.',thousands: ',', precision: 2},
+            weight: {decimal: '.',thousands: ',', precision: 1},
            productPrice: {decimal: '.',thousands: ',', precision: 3},
            exchangeRate: {decimal: '.', thousands: '', precision: 5},
            percentage: {decimal: '.', thousands: '', precision: 2, suffix: '%'},
@@ -1,11 +1,11 @@
 export default {
    methods: {
        routesGuard(){
-            (!this.$store.getters.isAuthenticated && this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('login') : '';
-            (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('dashboard') : '';
+            (!this.$store.getters.isAuthenticated && this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = window.location.href.indexOf(this.route('last_mile_delivery.login')) === 0 ? this.route('last_mile_delivery.login') : this.route('login') : '';
+            (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = [7, 8].includes(this.$store.getters.getCompanyModuleType) ? this.route('last_mile_delivery.dashboard') : this.route('dashboard') : '';
        },
        isProtectedRoute(){
-            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim')];
+            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim'), this.route('last_mile_delivery.login')];
            if(window.location.href.indexOf(this.route('company.claim')) === 0) {
                return false;
            }
@@ -27,7 +27,6 @@ export default {

                });
            }).catch((error) => {
-                console.log(error);
                this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
            }).then(() => {
                if (section) {
@@ -9,7 +9,6 @@ export default {
    },
    getters: {
        isAuthenticated: state => !!state.authentication.access_token,
-        getAccessToken: state => state.authentication.access_token,
        isSuperAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1,
        isAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1 || getters.getDecodedAccessToken.user.type === 2,
        getUserName: (state, getters) => getters.getUpdatedFullname || getters.getDecodedAccessToken.user.name,
@@ -17,8 +16,27 @@ export default {
        getUserEmail: (state, getters) => getters.getDecodedAccessToken.user.email,
        getCompanyId: (state, getters) => getters.getDecodedAccessToken.user.company_id,
        getCompanyModuleId: (state, getters) => getters.getDecodedAccessToken.user.company_module_id,
+        getCompanyModuleType: (state, getters) => getters.getDecodedAccessToken.user.company_module_type,
        getOrder: (state, getters) => getters.getDecodedAccessToken.user.order,
+        getAccessToken(state, getters) {

+            if(getters.isAuthenticated){
+                $crisp.push(["set", "user:email", getters.getUserEmail]);
+                if(getters.isAdmin){
+                    $crisp.push(["set", "user:nickname", getters.getUserName]);
+                }
+                if(getters.getCompanyModuleType === 1){
+                    $crisp.push(["set", "user:nickname", getters.getDecodedAccessToken.user.company_marking]);
+                    $crisp.push(["set", "session:data", [
+                        [
+                            ["company name", getters.getDecodedAccessToken.user.company_name],
+                        ]
+                    ]]);
+                }
+            }
+
+            return state.authentication.access_token
+        },
        getDecodedAccessToken(state) {
            try{
                return jwt_decode(state.authentication.access_token);
@@ -10,9 +10,8 @@ export default {
                    'Authorization': 'Bearer '+getters.getAccessToken
                }
            }).then(response => {
-
-                if(response.status === 401 && window.location.href !== route('login')){
-                    dispatch('userAuthentication', {access_token: '', redirect_url: '/'});
+                if(response.status === 401 && window.location.href !== route('login') && window.location.href.indexOf(route('last_mile_delivery.login')) <= -1){
+                    dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(getters.getCompanyModuleType) ? route('last_mile_delivery.login') : route('login')});
                }

                return response;
@@ -14,7 +14,7 @@
                                <div class="col-3 bg-master-lightest d-none d-md-inline" >
                                    @include('partials.menu')
                                </div>
-                                <div class="col">
+                                <div class="col col-md-9">
                                    <div class="absolute bg-master w-100 h-100" style="opacity: 0.3; z-index:9998; left:0;" v-if="$store.getters.isShowing('sideMenu')"></div>
                                    @include('partials.header')
                                    <div class="row no-margin p-b-50">
@@ -0,0 +1,115 @@
+@extends('layouts.base')
+@section('content')
+    <div class="fluid-container h-100">
+        <div class="row h-100">
+            <div class="col-3 d-none d-lg-inline h-100 padding-50 bg-info" style="background: url('https://cdn.dribbble.com/users/1731254/screenshots/11649852/media/5551243bcbf041d5aa0b30abb6168215.png'); background-size: cover; background-position: center">
+                <div class="row hide">
+                    <div class="col">
+                        <div class="row m-b-50">
+                            <div class="col-5 col-md-3">
+                                <img class="w-100" src="{{asset('images/cief-logo-white.png')}}" alt="">
+                            </div>
+                        </div>
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <h3 class="text-white ">Spend less time managing your delivery and more time optimizing your operations.</h3>
+                            </div>
+                        </div>
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <h4 class="text-white ">You know how to run your operations, let us help you streamline your delivery management.</h4>
+                            </div>
+                        </div>
+                        <div class="row ">
+                            <div class="col">
+                                <h4 class="text-white">Sign-up today and get access to:</h4>
+                                <h5 class="text-white m-l-20"><i class="fa fa-circle-o m-r-10"></i>An intuitive and easy to use order process</h5>
+                                <h5 class="text-white m-l-20"><i class="fa fa-circle-o m-r-10"></i>Service customization to keep you in control</h5>
+                                <h5 class="text-white m-l-20"><i class="fa fa-circle-o m-r-10"></i>Follow-up action to keep you on track</h5>
+                                <h5 class="text-white m-l-20"><i class="fa fa-circle-o m-r-10"></i>Personalized customer support</h5>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col bg-white no-padding h-100">
+                <div class="row h-100 align-items-center justify-content-center">
+                    <div class="col h-100">
+                        <div class="page-container">
+                            <div class="page-content-wrapper p-t-50 p-b-50 h-100">
+                                <div class="row no-margin align-items-center justify-content-center h-100">
+                                    <div class="col">
+                                        <div class="content p-t-0 overflow-hidden">
+                                            <div class="row h-100 no-margin align-items-center justify-content-center">
+                                                <div class="col col-md-10">
+                                                    <div class="row" v-show="!$store.getters.isShowing('registrationForm')">
+                                                        <div class="col">
+                                                            <div class="row" v-show="!$store.getters.isShowing('forgetPassword')">
+                                                                <div class="col">
+                                                                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                                                                    <div class="row" v-show="!$store.getters.isLoading('loginSection')">
+                                                                        <div class="col">
+                                                                            <div class="row m-b-15">
+                                                                                <div class="col">
+                                                                                    <div class="inline v-align-middle">
+                                                                                        <div class="font-heading fs-20 all-caps no-margin lh-28 bold">Sign In</div>
+                                                                                        <p class="no-margin fs-11 light">To keep using the service please sign in with your personal info</p>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="row">
+                                                                                <div class="col">
+                                                                                    <login-form-component section="loginSection"></login-form-component>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row" v-show="$store.getters.isShowing('forgetPassword')">
+                                                                <div class="col">
+                                                                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('forgetPasswordSection')"></loading-component>
+                                                                    <div class="row" v-show="!$store.getters.isLoading('forgetPasswordSection')">
+                                                                        <div class="col">
+                                                                            <div class="row m-b-15" v-show="!$store.getters.isShowing('forgetPasswordSuccess')">
+                                                                                <div class="col">
+                                                                                    <div class="inline v-align-middle">
+                                                                                        <div class="font-heading fs-20 all-caps no-margin lh-28 bold">Forget Password</div>
+                                                                                        <p class="no-margin fs-11 light">Enter your registered email below to receive the password reset instruction</p>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="row">
+                                                                                <div class="col">
+                                                                                    <forget-password-form-component section="forgetPasswordSection"></forget-password-form-component>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" v-show="$store.getters.isShowing('registrationForm')">
+                                                        <div class="col">
+                                                            <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                                                            <div class="row justify-content-center" v-show="!$store.getters.isLoading('loginSection')">
+                                                                <div class="col">
+                                                                    <new-registration-form-component section="loginSection"></new-registration-form-component>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
@@ -0,0 +1,29 @@
+<div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin || $store.getters.getCompanyModuleType === 8}]" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
+    <div class="col">
+        <div class="row">
+            <div class="col-12">
+                <div class="row m-l-0 m-r-0">
+                    <div class="col">
+                        <delivery-orders-table-section-component></delivery-orders-table-section-component>
+                    </div>
+                </div>
+            </div>
+            <div class="col-12 col-md-6" v-if="false">
+                <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
+                    <div class="col no-padding">
+                        <h6>Customers List</h6>
+                    </div>
+                </div>
+                <div class="row m-l-0 m-r-0">
+                    <div class="col">
+                        <list-component key="2" section="customerListSection" :endpoint="route('api.company.list')" :options="{'has_business_module_type': 7}">
+                            <template slot="list" slot-scope="{data}">
+                                <company-component :data="data"></company-component>
+                            </template>
+                        </list-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
@@ -0,0 +1,5 @@
+<div class="row d-none" :class="[{'d-flex': $store.getters.getCompanyModuleType === 7}]" v-if="$store.getters.getCompanyModuleType === 7">
+    <div class="col">
+        <delivery-customer-profile-section-component :company_id="$store.getters.getCompanyId"></delivery-customer-profile-section-component>
+    </div>
+</div>
@@ -0,0 +1,5 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    @include('pages.delivery.customer')
+    @include('pages.delivery.admin')
+@endsection
@@ -7,7 +7,17 @@
                    <h6>Arrived Parcel</h6>
                </div>
            </div>
-            <list-component section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, packing_list_status: 2, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}" >
+            <a href="{{route('packing_list.arrived_parcel.export')}}" target="_blank">
+                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none">
+                    <div class="row align-items-center">
+                        <div class="col-auto p-r-0 p-l-0">
+                            <i class="fa fa-file-excel-o fs-16"></i>
+                        </div>
+                        <div class="col p-r-5">Export To Excel</div>
+                    </div>
+                </button>
+            </a>
+            <list-component section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}" >
                <template slot="list" slot-scope="{data}">
                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
                </template>
@@ -4,8 +4,8 @@
            <div class="col">
                <div class="row">
                    <div class="col d-inline d-md-none">
-                        <a href="{{route('dashboard')}}">
-                            <img src="{{asset('images/cief-izyim-logo.png')}}" style="height: 30px;">
+                        <a :href="[7,8].includes($store.getters.getCompanyModuleType) ? route('last_mile_delivery.dashboard') : route('dashboard')">
+                            <img :class="[{'w-50': ![7,8].includes($store.getters.getCompanyModuleType)}]" :style="{'width': '70px'}" :src="[7,8].includes($store.getters.getCompanyModuleType) ? '/images/hy-logo.png' : '/images/cief-izyim-logo.png'">
                        </a>
                    </div>
                </div>
@@ -32,15 +32,15 @@
                        <tbody>
                        <tr>
                            <td style="border-bottom: solid 2px #000000;">
-                                <h1 style="font-size: 50px; line-height: 70px">{{$marking}}{{$order->reference}}</h1>
+                                <h3 style="font-size: 35px; line-height: 70px">{{$marking}}{{$order->reference}}</h3>
                            </td>
                        </tr>
                        <tr>
                            <td>
-                                <p style="font-size: 30px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
-                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 30px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.' 邮编:'.$warehouse_address->postcode}}</p>
-                                <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 30px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
-                                <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 30px;">{!! $remark !!}</p>
+                                <p style="font-size: 25px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
+                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.' 邮编:'.$warehouse_address->postcode}}</p>
+                                <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
+                                <p style="font-style: italic; font-weight: bold; margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">{!! $remark !!}</p>
                            </td>
                        </tr>
                        </tbody>
@@ -6,19 +6,7 @@
 	'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; })
 ]) !!};
 </script>
-@if(!App::environment('production'))
-<script type="text/javascript">
-    var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
-    (function(){
-        var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];
-        s1.async=true;
-        s1.src='https://embed.tawk.to/623d8cdd2abe5b455fc195aa/1fv06sgtf';
-        s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
-        s0.parentNode.insertBefore(s1,s0);
-    })();
-</script>
-@endif
+<script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="665dcd41-1edf-4451-8cb9-f1cf9ed35e15";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
 <script src="{{mix('vue/app.js')}}"></script>
 <script src="{{ asset('js/site.js') }}" type="text/javascript"></script>
@@ -22,6 +22,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function

    require __DIR__ . '/account.php';

+    require __DIR__ . '/delivery.php';
+
    Route::group(['middleware' => 'valid.token'], function () {

        Route::get('/storage/{fileName}/fetch', 'Documents\RenderDocumentController@fileStorageServe')->where(['fileName' => '.*'])->name('storage.document.file');
@@ -0,0 +1,14 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'delivery', 'namespace' => 'Delivery', 'as' => 'delivery.'], function () {
+    Route::post('/signup', 'CreateDeliveryCustomerController@create')->name('account.registration.register');
+
+    Route::group(['prefix' => 'order', 'as' => 'order.'], function () {
+        Route::post('/create', 'CreateDeliveryOrderController@create')->name('create');
+        Route::get('/list', 'ListOrdersController@list')->name('list');
+        Route::put('/cancel/{id}', 'CancelDeliveryOrderController@cancel')->name('cancel');
+    });
+
+});
@@ -27,6 +27,34 @@ use Illuminate\Support\Facades\Route;

 require __DIR__ . '/template.php';

+Route::domain('hywave.izyim.com')->group(function () {
+    Route::group(['as' => 'last_mile_delivery.'], function () {
+        Route::get('/', function () {
+            return view('pages.accounts.signup');
+        })->name('login');
+
+        Route::get('/dashboard', function () {
+            return view('pages.delivery.dashboard');
+        })->name('dashboard');
+
+        Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export');
+
+    });
+});
+
+Route::group(['prefix'=> '/last_mile_delivery', 'as' => 'last_mile_delivery.'], function () {
+    Route::get('/', function () {
+        return view('pages.accounts.signup');
+    })->name('login');
+
+    Route::get('/dashboard', function () {
+        return view('pages.delivery.dashboard');
+    })->name('dashboard');
+
+    Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export');
+
+});
+
 Route::get('', function () {
    return view('pages.accounts.login');
 })->name('login');
@@ -232,6 +260,8 @@ Route::get('/warehouse/{id}/show', function ($id) {
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListController@export')->name('container.packaging_list.export');
 Route::get('/export/pending-arrangement-delivery-list', 'Exports\ExportPendingArrangementPackingListController@export')->name('packaging_list.pending_arrangement.export');
+Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPackingListController@onHold')->name('packaging_list.on_hold.export');
+Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export');

 Route::get('/settings', function () {
    return view('pages.settings');
Author	SHA1	Message	Date
edmondlang	2f98dc976a	add file RescheduleTransportDateFormComponent	2022-04-21 21:42:32 +08:00
edmondlang	20237d69fb	update	2022-04-21 21:02:25 +08:00
edmondlang	22f1548eac	update delivery date	2022-04-21 20:58:27 +08:00
omair saleh	4e4475ad12	switch back to temp warehouse	2022-04-21 14:12:23 +08:00
omair saleh	a287a1193a	allow admin to add arrived parcels	2022-04-21 12:19:57 +08:00
omair saleh	a80b3013c3	go to previous yd warehouse	2022-04-21 10:31:24 +08:00
omair saleh	f5cf2ac2df	fix login error handler & add new modern warehouse	2022-04-19 00:00:12 +08:00
omair saleh	2767d94a16	fix login error handler & add new modern warehouse	2022-04-18 23:56:27 +08:00
omair saleh	f68ef5c5e2	fix login error handler & add new modern warehouse	2022-04-18 23:46:25 +08:00
omair saleh	639ccd3927	fix login error handler & add new modern warehouse	2022-04-18 23:40:08 +08:00
omair saleh	5651ed7010	fix LMD to HWT	2022-04-18 15:47:25 +08:00
omair saleh	fd89233e49	fix LMD to HWT	2022-04-18 15:44:58 +08:00
omair saleh	be70afd9bf	fix LMD to HWT	2022-04-18 15:44:25 +08:00
omair saleh	efac46264e	fix LMD to HWT	2022-04-18 15:43:43 +08:00
omair saleh	a0817dbb6e	debug delivery registration	2022-04-18 15:42:10 +08:00
omair saleh	dfa7013f04	debug delivery registration	2022-04-18 15:39:57 +08:00
omair saleh	28a57887b6	debug forget password	2022-04-18 04:59:49 +08:00
omair saleh	8a96941127	debug forget password	2022-04-15 14:55:21 +08:00
omair saleh	3a5423a308	on hold packing list export	2022-04-15 14:21:08 +08:00
omair saleh	ddd1b7b29e	on hold packing list export	2022-04-15 14:20:20 +08:00
omair saleh	5433c202a7	on hold packing list export	2022-04-15 14:19:32 +08:00
omair saleh	b967e4f9ab	on hold packing list export	2022-04-15 14:18:38 +08:00
omair saleh	e9b7de47fa	on hold packing list export	2022-04-15 14:17:43 +08:00
omair saleh	3c942af883	on hold packing list export	2022-04-15 14:17:20 +08:00
omair saleh	baa9f79272	on hold packing list export	2022-04-15 14:00:13 +08:00
omair saleh	10c66dc2dc	export delivery list excel	2022-04-15 11:58:37 +08:00
omair saleh	05d4b7fe36	fix fetch from vt	2022-04-15 11:43:17 +08:00
omair saleh	7fc4568fbf	fix fetch from vt	2022-04-14 13:14:47 +08:00
omair saleh	f55a57c222	fix fetch from vt	2022-04-14 13:12:56 +08:00
omair saleh	301d7b5520	update hywavetech lineclear excel format	2022-04-14 10:15:07 +08:00
omair saleh	9f965109c7	update hywavetech lineclear excel format	2022-04-14 10:01:10 +08:00
omair saleh	108a952ee3	update hywavetech lineclear excel format	2022-04-13 21:56:21 +08:00
omair saleh	1426d804e5	fix yd fetch	2022-04-13 15:10:10 +08:00
omair saleh	88b3dc8b84	fix yd fetch	2022-04-13 14:27:08 +08:00
omair saleh	4b3274f6d5	fix yd fetch	2022-04-13 14:24:50 +08:00
omair saleh	da1b6b1b6d	fix yd fetch	2022-04-13 13:22:23 +08:00
omair saleh	ac0a90c168	fix yd fetch	2022-04-13 13:17:04 +08:00
omair saleh	a5e47324b2	fix yd fetch	2022-04-13 13:11:30 +08:00
omair saleh	40d22de809	fix customer profile	2022-04-13 12:19:34 +08:00
omair saleh	7154b5a943	fix customer profile	2022-04-13 12:15:32 +08:00
omair saleh	863c2874dd	fix yd fetch	2022-04-13 11:50:23 +08:00
omair saleh	862398b0d5	update qr pdf	2022-04-13 11:30:53 +08:00
omair saleh	9e20b717a6	update qr pdf	2022-04-13 11:29:15 +08:00
omair saleh	129f3ecf10	update crisp to production	2022-04-13 00:25:49 +08:00
omair saleh	f71f1fecd4	update crisp to production	2022-04-13 00:18:57 +08:00
omair saleh	6f5f854827	update crisp to production	2022-04-13 00:18:44 +08:00
omair saleh	f4275f20a3	update crisp to production	2022-04-13 00:17:19 +08:00
omair saleh	35d9a1f8d8	update crisp to production	2022-04-13 00:15:51 +08:00
omair saleh	de1afc26dc	update crisp to production	2022-04-12 16:22:57 +08:00
omair saleh	904fb3d9e5	update crisp to production	2022-04-12 16:18:33 +08:00
omair saleh	304337d5e2	update crisp to production	2022-04-12 16:02:00 +08:00
omair saleh	aa312c8f6e	Merge remote-tracking branch 'origin/master'	2022-04-12 15:20:41 +08:00
omair saleh	05d079f261	update crisp to production	2022-04-12 15:20:13 +08:00
omair saleh	a1cb511125	Merge branch 'export-arrived-parcel' into 'master' export-arrived-parcel See merge request CIEFWorldwideSdnBhd/shipping-portal!130	2022-04-12 07:10:44 +00:00
omair saleh	8d29a25793	create replica white list	2022-04-12 09:42:27 +08:00
edmondlang	a7593e4ab2	export-arrived-parcel	2022-04-11 23:29:39 +08:00
omair saleh	8ecb306e92	update final touch up for last delivery integration	2022-04-09 20:43:00 +08:00
omair saleh	918fd0d17d	update final touch up for last delivery integration	2022-04-09 20:41:48 +08:00
omair saleh	4f888da29a	Merge branch 'last-mile-integration' into 'master' update field change value of 'Pickup_Address_Type' from sender to Default' See merge request CIEFWorldwideSdnBhd/shipping-portal!129	2022-04-09 12:20:56 +00:00
edmondlang	559de29acf	update field change value of 'Pickup_Address_Type' from sender to Default' export multiple sheet with the correct name of each field	2022-04-09 15:10:54 +08:00
edmondlang	87116d29c9	last mile delivery search order ui and search order number function	2022-04-07 22:54:02 +08:00
omair saleh	d9eeaf4bef	update final touch up for last delivery integration	2022-04-07 22:47:30 +08:00
omair saleh	5dabc88fa9	update final touch up for last delivery integration	2022-04-07 22:40:01 +08:00
omair saleh	8c29fcda1f	update final touch up for last delivery integration	2022-04-07 22:28:51 +08:00
omair saleh	edd6b0d6ff	update final touch up for last delivery integration	2022-04-07 22:22:22 +08:00
omair saleh	6940290570	update final touch up for last delivery integration	2022-04-07 22:21:21 +08:00
omair saleh	327bd75cc9	update final touch up for last delivery integration	2022-04-07 22:20:47 +08:00
omair saleh	9f760d8694	Merge branch 'last-mile-integration' into 'master' updates last mile intergration - add functions See merge request CIEFWorldwideSdnBhd/shipping-portal!128	2022-04-07 14:13:57 +00:00
omair saleh	4a1905abde	update final touch up for last delivery integration	2022-04-07 21:27:53 +08:00
omair saleh	5d1ff709eb	update final touch up for last delivery integration	2022-04-07 21:20:13 +08:00
omair saleh	a50b475525	update final touch up for last delivery integration	2022-04-07 21:16:59 +08:00
omair saleh	97ec65e292	Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration	2022-04-07 21:13:21 +08:00
omair saleh	5df226c153	update final touch up for last delivery integration	2022-04-07 21:12:15 +08:00
edmondlang	3e87f320bf	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration	2022-04-07 11:45:56 +08:00
omair saleh	408a3a1211	update last mile delivery logo	2022-04-07 11:12:27 +08:00
omair saleh	bed78c053a	remove memo	2022-04-07 10:59:50 +08:00
omair saleh	c53ebf76b3	hide admin menu flashing	2022-04-07 09:53:59 +08:00
omair saleh	4085ac4829	hide admin menu flashing	2022-04-07 09:46:22 +08:00
omair saleh	778729b81d	hide admin menu flashing	2022-04-07 09:44:02 +08:00
omair saleh	54c212e905	update last mile delivery module	2022-04-06 18:51:08 +08:00
omair saleh	5b370a299c	update pending delivery report excel	2022-04-06 16:01:31 +08:00
omair saleh	e57dc231e6	update pending delivery report excel	2022-04-06 16:01:03 +08:00
omair saleh	5727801918	update pending delivery report excel	2022-04-06 15:59:28 +08:00
omair saleh	bf325ff028	update pending delivery report excel	2022-04-06 15:55:31 +08:00
omair saleh	229e757663	Merge branch 'export-delivery-list' into 'master' Export delivery list See merge request CIEFWorldwideSdnBhd/shipping-portal!117	2022-04-06 07:32:01 +00:00
edmondlang	bb59a444cf	update export excel form	2022-04-06 11:24:24 +08:00
edmondlang	45c878a2ed	add orders created date to the table	2022-04-06 10:21:40 +08:00
edmondlang	e871f4b287	hide tick and show only for admin	2022-04-05 20:03:27 +08:00
edmondlang	6eaa810b67	remove text order list	2022-04-05 11:40:58 +08:00
edmondlang	4e53e1b48a	updates last mile intergration - add functions - admin cancel order - add filter to display only active orders - hide customer page - show parcel weight as total weight (quantity * weight per quantity) - in create order form - order table - export excel - update export excel, only include the data of the selected Ids	2022-04-05 10:45:30 +08:00
omair saleh	aef9b82918	Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration # Conflicts: # resources/views/pages/delivery/admin.blade.php	2022-04-04 19:41:43 +08:00
omair saleh	f96fef94fe	finalize last mile delivery	2022-04-04 19:40:54 +08:00
edmondlang	ab141ae160	update admin view for last mile intergration	2022-04-04 14:21:59 +08:00
edmondlang	bf4830ba7a	update mobile responsive for delivery order form component	2022-04-03 23:47:58 +08:00
edmondlang	5baf04c835	fix mobile responsive	2022-04-03 23:39:27 +08:00
edmondlang	4917c54868	remove vuetable	2022-04-03 23:26:45 +08:00
edmondlang	9c7d07f603	remove imports that are not using	2022-04-03 20:20:09 +08:00
edmondlang	6f9320f3a4	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration	2022-04-03 19:13:24 +08:00
omair saleh	c69c043576	fix the user ui, create delivery order, delivery customer dashboard	2022-04-03 19:10:06 +08:00
edmondlang	745655dbfa	last mile intergration	2022-04-02 15:21:14 +08:00
edmondlang	d96a35a49f	revert RegistrationFormComponent	2022-03-30 20:01:45 +08:00
edmondlang	8024fef2e8	Merge branch 'new-registration-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration	2022-03-30 19:54:35 +08:00
omair saleh	0e7469f1cd	new registration ui flow	2022-03-29 23:15:42 +08:00