update field change value of 'Pickup_Address_Type' from sender to Default'

export multiple sheet with the correct name of each field
last mile delivery search order ui and search order number function
2026-08-19 12:34:18 +00:00 · 2022-04-09 15:10:54 +08:00 · 2022-04-07 22:54:02 +08:00 · 2022-04-07 22:47:30 +08:00 · 2022-04-07 22:40:01 +08:00 · 2022-04-07 22:28:51 +08:00
134 changed files with 3973 additions and 705 deletions
@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;

 use Illuminate\Database\Eloquent\Builder;

-class OwnerId implements Filter
+class TypeIn implements Filter
 {

    /**
@@ -14,7 +14,7 @@ class OwnerId implements Filter
     */
    public static function apply(Builder $builder, $value)
    {
-        return $builder->where('owner_id', $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);

@@ -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,9 @@ 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
            ]);
        }

@@ -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);

@@ -26,8 +26,6 @@ use Illuminate\Support\Facades\Log;

 class CallbackBillplzLogic
 {
-
-
    /** @var GetBillplzBill */
    private $getBillplzBill;

@@ -47,12 +45,11 @@ class CallbackBillplzLogic
     * @param UpdatesTransactionStatus $updatesTransactionStatus
     * @param UpdatesWalletBalance $updatesWalletBalance
     */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
    {
        $this->getBillplzBill = $getBillplzBill;
        $this->fetchesTransaction = $fetchesTransaction;
        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updatesWalletBalance = $updatesWalletBalance;
    }


@@ -84,22 +81,11 @@ class CallbackBillplzLogic
            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
        }

-        if($transaction->status !== ApprovalStatus::COMPLETED){
-
-            if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED && $status === ApprovalStatus::APPROVED) {
-                $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-            }
-            $this->updatesTransactionStatus->execute($transaction, $status);
-
-        }
-
-
        $token = Auth::fromUser(User::find(1));
        $request->headers->set('Authorization', 'Bearer '.$token);

-        $marking = $transaction->owner instanceof Booking ? $transaction->booking->marking : $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first()->marking;
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking, 'transaction' => $transaction, 'status' => $status]);
+        $marking = $transaction->owner()->first()->owner()->first();

+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
    }
 }
@@ -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,149 @@
+<?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;
+
+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'=>'LMD']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'LMD');
+
+        $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, $senderAddress->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,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,
+            $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->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,81 @@
+<?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 ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number',
+            'Delay Days',
+            'Quantity',
+            'State',
+            'Postcode',
+            'Address',
+            'PIC',
+            'Phone',
+            'Remark'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        })->whereDoesntHave('transports');
+    }
+
+    /**
+     * @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;
+        $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();
+
+        return [
+            $container->reference,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta,
+            $ContainerTransport->drop_date,
+            $marking,
+            $order->reference,
+            $transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : '',
+            $packingList->packages()->sum('quantity'),
+            $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 : '',
+        ];
+    }
+}
@@ -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;
    }


+
 }
@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Http\Request;

 class ApproveChangeOrderAddressProcessor
@@ -65,7 +66,11 @@ class ApproveChangeOrderAddressProcessor
            $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);

            $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
+            if($appointee === 2) {
+                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                }
+            }

        }

@@ -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();
@@ -6,23 +6,9 @@ use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;

-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-
-use Illuminate\Http\Request;
-
 class UpdateDoFromVTPortalProcessor
 {
    /** @var FetchesDataFromVTPortal */
@@ -43,19 +29,20 @@ class UpdateDoFromVTPortalProcessor
    }

    /**
-     * @param $address
+     * @param PackingList $packing_list
     * @return array
     * @throws GuzzleException
+     * @throws InternalServerErrorException
     */
-    public function execute($address) {
+    public function execute(PackingList $packing_list) {

        if(!app()->environment(['production'])){
            return [];
        }

        try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+            $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $order = $packing_list->owner;

            if ($packing_list) {
                $contact = $address->contacts()->first();
@@ -67,7 +54,7 @@ class UpdateDoFromVTPortalProcessor

                $status = 'On Hold';

-                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                    $status = 'Release';
                }

@@ -77,6 +64,7 @@ class UpdateDoFromVTPortalProcessor

                if ($vt_do) {
                    foreach ($vt_do->Rows as $key => $row) {
+                        if($row[4] !== $packing_list->containers()->first()->reference) continue;
                        $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                        'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                        'POST', 
@@ -141,7 +129,7 @@ class UpdateDoFromVTPortalProcessor
            }

        } catch (\Exception $exception){
-            return [];
+            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage());
        }

    }
@@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;

 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use Illuminate\Support\Facades\Log;

 class UpdateDoFromYDPortalProcessor
@@ -30,36 +31,34 @@ class UpdateDoFromYDPortalProcessor
    }

    /**
-     * @param $address
+     * @param PackingList $packingList
     * @return void
     * @throws InternalServerErrorException
     */
-    public function execute($address) {
+    public function execute(PackingList $packingList) {
+        if(!app()->environment(['production'])){
+            return;
+        }
+
        try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_lists = $order->packingLists()
-                ->where('type', PackingListType::SHIPPING_PACKING_LIST)
-                ->where('status', '!=', ApprovalStatus::SUSPENDED)
-                ->orderBy('id', 'desc')->get();
+            $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();

+            if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                return;
+            }

-            foreach ($packing_lists as $key => $row) {
-                if ($row->status === ApprovalStatus::SUSPENDED) {
-                    continue;
-                }
+            $contact = $address->contacts()->first();
+            $remark = $address->remarks()->first();

-                $contact = $address->contacts()->first();
-                $remark = $address->remarks()->first();
+            $phone = $contact ? $contact->phone : null;
+            $reference = $contact ? $contact->reference : null;
+            $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';

-                $phone = $contact ? $contact->phone : null;
-                $reference = $contact ? $contact->reference : null;
-                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
-
-                $this->fetchesDataFRomYDPortal->clientRequest(
-                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
-                'POST', 
+            $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
+                'POST',
                [
-                    'expressno' => $row->reference,
+                    'expressno' => $packingList->reference,
                    'customers_name' => $reference,
                    'cellphone' => $phone,
                    'postcode' => $address->postcode,
@@ -68,8 +67,6 @@ class UpdateDoFromYDPortalProcessor
                ]);


-            }
-
        } catch (\Exception $exception){
            throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
        }
@@ -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();
    }

@@ -14,6 +14,7 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -70,16 +71,16 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
    {
        $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);

-        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
-        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        /** @var PackingList $packingList */
+        $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));


 //        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;

-        $this->updateDoFromVTPortalProcessor->execute($address);
-        $this->updateDoFromYDPortalProcessor->execute($address);
+        $this->updateDoFromVTPortalProcessor->execute($packingList);
+        $this->updateDoFromYDPortalProcessor->execute($packingList);

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

 }
@@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                }

                foreach($containerDetail->Rows as $packingList){
-                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));

-                    if(!array_key_exists(1, $marking)){
-                        continue;
-                    }
-
-                    $orderNumber = $marking[1];
+                    $orderNumber = $marking[array_key_last($marking)];

                    if(!$packingList[22]){
                        continue;
@@ -36,6 +36,7 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;

 class FetchOrderListsFromYdPortalProcessor
 {
@@ -153,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);

            foreach($rows->data as $row){
-
                $containerReference = null;
                $loadingDate = null;
                $unstuffingDate = null;
@@ -168,6 +168,11 @@ class FetchOrderListsFromYdPortalProcessor

                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);

+                if(!$rows){
+                    Log::debug($row->expressno);
+                    continue;
+                }
+
                foreach (array_reverse($rows->data) as $trackingRow) {
                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
@@ -181,21 +186,43 @@ class FetchOrderListsFromYdPortalProcessor
                        $eta = Carbon::parse($tracking[2]);
                    }

-                    if (strpos($trackingRow->tracking, '预计船时间为') !== false) {
-                        $tracking = explode('预计船时间为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
+
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
+
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
                    }

-                    if (strpos($trackingRow->tracking, '预计开船为') !== false) {
-                        $tracking = explode('预计开船为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
                    }

+
                    if ($trackingRow->tracking === '货物已进目的港仓库') {
                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                    }

-                    if ($trackingRow->tracking === '货物已派送完成') {
+                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                    }
                }
@@ -288,6 +315,13 @@ class FetchOrderListsFromYdPortalProcessor
                    $this->createPackageProcessor->execute($packageObject, $packingList);
                }

+                if(!count($row->deliverysize)){
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
                $weightCbm = (float) $row->weight / 500;
                $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));

@@ -344,7 +378,7 @@ class FetchOrderListsFromYdPortalProcessor

                        $transport = $container->transports()->first();

-                        if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
@@ -373,12 +407,7 @@ class FetchOrderListsFromYdPortalProcessor
                    }
                }

-                if($deliveryDate){
-
-                    if($packingList->transports){
-                        continue;
-                    }
-
+                if($deliveryDate && !$packingList->transports()->exists()){
                    $packingList->status = ApprovalStatus::COMPLETED;
                    $packingList->save();

@@ -50,9 +50,10 @@ class FetchPackingListFromVTPortalProcessor
            $query->where('status', '=', ApprovalStatus::COMPLETED);
        })->get();

+        DB::beginTransaction();
        foreach($packingLists as $packingList){
            try {
-                DB::beginTransaction();
+

                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';

@@ -75,14 +76,12 @@ class FetchPackingListFromVTPortalProcessor
                    }
                }

-
-
-                DB::commit();
            } catch (GuzzleException $exception) {
                continue;
            }

        }
+        DB::commit();

        return [];

@@ -134,19 +134,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor

            foreach ($response->Rows as $parcel){

-                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
-
-                if(!array_key_exists(1, $marking)){
-                    continue;
-                }
-
-                $orderNumber = $marking[1];
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
+                $orderNumber = $marking[array_key_last($marking)];

                if(!$parcel[9]){
                    continue;
                }

-
                try {
                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                } catch (ResourceNotFoundException $exception) {
@@ -76,7 +76,7 @@ class UpdateConstantLogic  extends AbstractControllerLogic
    public function logic(Request $request) : JsonResponse
    {

-        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
+        $object = new ConstantObject($request->input('reference'), $request->input('value'));

        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
+use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
+
+class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var AddItemToConstantValueArray */
+    private $addItemToConstantValueArray;
+
+    /** @var RemoveItemFromConstantValueArray */
+    private $removeItemFromConstantValueArray;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param AddItemToConstantValueArray $addItemToConstantValueArray
+     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,AddItemToConstantValueArray $addItemToConstantValueArray, RemoveItemFromConstantValueArray $removeItemFromConstantValueArray)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
+        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
+    }
+    /**
+     * @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
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+
+        $object = new ConstantObject($constant->reference, $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode')));
+        $this->canUpdateConstant->passes($object);
+
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+        $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
+
+        $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode')));
+
+        $oppositeConstant = $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
+
+
+        return $this->response([
+            'CENTER_POSTCODE' => $constant->reference == SegmentConstants::CENTER_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
+            'OUTSTATION_POSTCODE' => $constant->reference == SegmentConstants::OUTSTATION_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
+        ]);
+    }
+
+}
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use Illuminate\Http\Request;
+use App\Models\SegmentConstant;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\UpdatesConstantValueByState;
+
+class UpdateConstantStateLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstantValueByState */
+    private $updatesConstantValueByState;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstantValueByState $updatesConstantValueByState
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,UpdatesConstantValueByState $updatesConstantValueByState)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstantValueByState = $updatesConstantValueByState;
+    }
+    /**
+     * @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
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => SegmentConstants::STATE_RATE]);
+        
+        $constantValue = $this->updatesConstantValueByState->execute($constant->value, $request->input('status_id'), $request->input('rate'));
+
+        $object = new ConstantObject(SegmentConstants::STATE_RATE, (array) $constantValue);
+        $this->canUpdateConstant->passes($object);
+        
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}
@@ -7,34 +7,22 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class ConstantObject implements DataTransferObject
 {

-    /** @var string */
-    private $name;
-
    /** @var string */
    private $reference;

    /** @var array */
-    private $detail;
+    private $value;

    /**
     * ConstantObject constructor.
     * @param string $name
     * @param string $reference
-     * @param array $detail
+     * @param array $value
     */
-    public function __construct(string $name, string $reference, array $detail)
+    public function __construct(string $reference, array $value)
    {
-        $this->name = $name;
        $this->reference = $reference;
-        $this->detail = $detail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
+        $this->value = $value;
    }

    /**
@@ -48,9 +36,9 @@ class ConstantObject implements DataTransferObject
    /**
     * @return array
     */
-    public function getDetail(): array
+    public function getValue(): array
    {
-        return $this->detail;
+        return $this->value;
    }


@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class AddItemToConstantValueArray
+{
+
+    /**
+     * @param array $array
+     * @param $item
+     * @return array
+     */
+    public function execute($array, $item): array {
+        $array[] = $item;
+        sort($array);
+        return $array;
+    }
+
+}
@@ -27,11 +27,11 @@ class ConvertsConstantDetailsToResource

    public function execute(SegmentConstant $constant){

-        if($constant->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
-            return property_exists($constant->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $constant->detail->id])) : '';
-        }
+        // if($constant->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
+        //     return property_exists($constant->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $constant->detail->id])) : '';
+        // }

-        return $constant->detail;
+        return $constant->value;

    }

@@ -18,9 +18,8 @@ class CreatesConstant extends AbstractUpdateRelationshipRecord
    public function execute(Segment $segment, ConstantObject $object)
    {
        $model = new SegmentConstant();
-        $model->name = $object->getName();
        $model->reference = $object->getReference();
-        $model->detail = json_encode($object->getDetail());
+        $model->value = json_encode($object->getValue());

        return $this->handler($segment->constants(), $model);
    }
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class RemoveItemFromConstantValueArray
+{
+
+    /**
+     * @param array $array
+     * @param $item
+     * @return array
+     */
+    public function execute($array, $item): array {
+        foreach($array as $key => $value){
+            if($array[$key] == $item){
+                unset($array[$key]);
+            }
+        }
+        return array_values($array);
+    }
+
+}
@@ -17,9 +17,8 @@ class UpdatesConstant extends AbstractUpdateRecord
     */
    public function execute(SegmentConstant $model, ConstantObject $object)
    {
-        $model->name = $object->getName();
        $model->reference = $object->getReference();
-        $model->detail = json_encode($object->getDetail());
+        $model->value = json_encode($object->getValue());

        return $this->handler($model);
    }
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class UpdatesConstantValueByState
+{
+
+    /**
+     * @param $json
+     * @param int $status_id
+     * @param int $rate
+     * @return string
+     */
+    public function execute($json, int $status_id, int $rate) {
+
+        $newArray = $json;
+        foreach($json->config as $key => $object){
+            if($object->status_id == $status_id){
+                $newArray->config[$key] = (object) [
+                    'rate' => $rate,
+                    'status_id' => $object->status_id,
+                    'outstation_rate' => $object->outstation_rate,
+                ];
+            }else{
+                $newArray->config[$key] = $object;
+            }
+        }
+        return $newArray;
+
+    }
+
+}
@@ -15,9 +15,8 @@ class ConstantValidation extends AbstractValidation
    protected function data($object): array {

        $data = [
-            'name' => $object->getName(),
            'reference' => $object->getReference(),
-            'detail' => $object->getDetail()
+            'value' => $object->getValue()
        ];

        return $data;
@@ -28,9 +27,8 @@ class ConstantValidation extends AbstractValidation
     */
    protected function rules(): array {
        return [
-            'name' => 'required',
            'reference' => 'required',
-            'detail' => 'required'
+            'value' => 'required'
        ];
    }

@@ -20,7 +20,11 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\TransactionDetailType;

+use App\Models\Document;
+use App\Models\Transaction;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -86,7 +90,11 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
    {
        $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);

-        $cbm = $packing_list->packages->sum(function($package) {
+        $cbm = $packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $over_weight_cbm = $packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
        });

@@ -143,7 +151,7 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
        }

        $price_cbm = $base_price + $warehouse_rate + $state_rate;
-        $total_cbm = $price_cbm * $cbm;
+        $total_cbm = $price_cbm * ($cbm + $over_weight_cbm);

        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');

@@ -165,16 +173,28 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
            ApprovalStatus::PENDING_SUBMISSION
        );

+        /** @var Transaction $invoice_transaction */
        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);

        $object_detail = new TransactionDetailObject(
-            $invoice_transaction->bill_no,
-            $invoice_transaction->bill_no,
-            1,
-            $invoice_transaction->amount, 
-            $invoice_transaction->amount
+            'SHIPPING_FEE',
+            TransactionDetailType::SHIPPING_FEE,
+            $cbm,
+            $price_cbm
        );
-        $transaction_detail = $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        
+        if ($over_weight_cbm > 0) {
+            $object_detail = new TransactionDetailObject(
+                'OVER_WEIGHT_CHARGES',
+                TransactionDetailType::OVER_WEIGHT_CHARGES,
+                $over_weight_cbm,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }

        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);

@@ -185,11 +205,12 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
            ApprovalStatus::COMPLETED,
            'shipping_invoice'
        );
+
        /** @var Document $document */
        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
        $this->createsFile->execute($document, $document_object);

-        // dd('yess');
        return $this->response([]);
    }
 }
@@ -12,7 +12,7 @@ class TransactionDetailObject implements DataTransferObject
    /** @var string|null */
    private $name;

-    /** @var int|null */
+    /** @var float|null */
    private $quantity;

    /** @var float|null */
@@ -22,10 +22,10 @@ class TransactionDetailObject implements DataTransferObject
     * TransactionDetailObject constructor.
     * @param string $reference
     * @param string $name
-     * @param int $quantity
+     * @param float $quantity
     * @param float $price
     */
-    public function __construct(?string $reference, ?string $name , ?int $quantity, ?float $price)
+    public function __construct(?string $reference, ?string $name , ?float $quantity, ?float $price)
    {
        $this->reference = $reference;
        $this->name = $name;
@@ -50,9 +50,9 @@ class TransactionDetailObject implements DataTransferObject
    }

    /**
-     * @return int
+     * @return float
     */
-    public function getQuantity(): ?int
+    public function getQuantity(): ?float
    {
        return $this->quantity;
    }
@@ -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;
+
 }
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TransactionDetailType {
+
+    public const SHIPPING_FEE = 'Shipping Fee';
+
+    public const OVER_WEIGHT_CHARGES = 'Over weight charges';
+}
@@ -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.xls', Excel::XLS, ['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\ExportsPendingArrangementDeliveryList;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportPendingArrangementPackingListController
+{
+    /**
+     * ExportPendingArrangementPackingListController 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 ExportsPendingArrangementDeliveryList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('pending-arrangement-packing-list.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}
@@ -24,7 +24,7 @@ class DownloadOrderQrPdfController
        $warehousePrefix = '';
        $deliveryPrefix = '';
        $customerMarking = '';
-        $remark = $warehouse->remarks()->first()->content;
+        $remark = $warehouse->remarks()->first();

        if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) {
            $customerMarking = $order->companyModule->connections()->first()->invitee_reference.'/';
@@ -44,11 +44,11 @@ class DownloadOrderQrPdfController
        if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
            $warehousePrefix = 'YD/';

-            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
+            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan' || in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
                $warehousePrefix = 'KK/';
            }

-            if(strtolower($deliveryAddress->state->name) === 'sarawak') {
+            if(strtolower($deliveryAddress->state->name) === 'sarawak' && !in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
                $warehousePrefix = 'KU/';
            }
        }
@@ -60,7 +60,7 @@ class DownloadOrderQrPdfController
            'delivery_address' => $deliveryAddress,
            'warehouse_address' => $warehouseAddress,
            'warehouse_contacts' => $warehouseContacts,
-            'remark' => $remark
+            'remark' => $remark ? $remark->content : ''
        ];

        $pdf = LaravelMpdf::loadView('pdfs.qr', $data, [], [
@@ -200,4 +200,62 @@ class MonthlyReportController
                })->sum('quantity'),
            ]]))->handler();
    }
+
+    public function customerActivityReport(Request $request): JsonResponse {
+
+        $active_start = $request->input('active_start');
+        $active_end = $request->input('active_end');
+        $inactive_start = $request->input('inactive_start');
+        $inactive_end = $request->input('inactive_end');
+        $minCbm = $request->input('cbm');
+        $minOrders = $request->input('minOrders');
+
+        $activeCompanies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+                return $query->where('drop_date', '>=', \Carbon\Carbon::parse($inactive_start))->where('drop_date', '<=', \Carbon\Carbon::parse($inactive_end)->addDay());
+            });
+        })->pluck('id');
+
+        $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+                return $query->whereDate('drop_date', '>=', \Carbon\Carbon::parse($active_start))->whereDate('drop_date', '<=', \Carbon\Carbon::parse($active_end)->addDay());
+            });
+        })->whereNotIn('id', $activeCompanies)->get();
+
+        $customerActivityData = [];
+        $counter = 1;
+
+        foreach ($companies as $key => $company){
+            $connection = $company->inviters()->withPivot('invitee_reference')->first();
+            $marking = $connection ? $connection->pivot->invitee_reference:'';
+            $packingList = $company->orderPackingLists()->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->get();
+            $totalCbm = $packingList->flatMap(function ($packingList) {
+                return $packingList->packages;
+            })->sum(function($package){
+                return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+            });
+
+            if ($minCbm != 'null' && $totalCbm < $minCbm) { continue; }
+
+            if ($minOrders != 'null' && $packingList->count() < $minOrders) { continue; }
+
+            array_push($customerActivityData, array(
+                'key' => $counter, 
+                'marking' => $marking,
+                'packingListCount'=> $packingList->count(),
+                'totalCbm'=> $totalCbm,
+            ));
+            $counter ++;
+        }
+
+        return (new ApiResponseObject('fetch service report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE, ['data' => [
+                'active_start' => Carbon::parse($active_start)->format('d/m/Y'),
+                'active_end' => Carbon::parse($active_end)->format('d/m/Y'),
+                'inactive_start' => Carbon::parse($inactive_start)->format('d/m/Y'),
+                'inactive_end' => Carbon::parse($inactive_end)->format('d/m/Y'),
+                'customerActivityData' => $customerActivityData,
+            ]]))->handler();
+    }
 }
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantPostcodeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantPostcodeController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantPostcodeLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantPostcodeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantStateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantStateController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantStateLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantStateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -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')

@@ -19,9 +19,8 @@ class ConstantResource extends JsonResource
    {
        return [
            'id' => $this->id,
-            'name' => $this->name,
            'reference' => $this->reference,
-            'detail' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
+            'value' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
        ];
    }
 }
@@ -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,
+        ];
+    }
+}
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;

 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;

 class TransportResource extends JsonResource
@@ -15,6 +16,7 @@ class TransportResource extends JsonResource
     */
    public function toArray($request)
    {
+        $currentSchedule = $this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first();
        return [
            'id' => $this->id,
            'type' => $this->type,
@@ -23,8 +25,10 @@ class TransportResource extends JsonResource
            'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
            'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
            'status' => $this->status,
-            'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
-            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
+            'current_schedule' => new ScheduleResource($currentSchedule),
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get()),
+            'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false),
+            'schedule_complete' => $currentSchedule ? $currentSchedule->eta <= Carbon::now() : false
        ];
    }
 }
@@ -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);
@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;

 use Spatie\Permission\Traits\HasRoles;
+use Illuminate\Database\Eloquent\SoftDeletes;

 use Tymon\JWTAuth\Contracts\JWTSubject;
 use Illuminate\Notifications\Notifiable;
@@ -24,8 +25,9 @@ class User extends AbstractModel implements
    AuthorizableContract,
    CanResetPasswordContract
 {
-    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail;
+    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;

+    protected $dates = ['deleted_at'];

    /**
     * Get the identifier that will be stored in the subject claim of the JWT.
@@ -18,7 +18,7 @@ class CreateTransactionDetailsTable extends Migration
            $table->foreignId('transaction_id')->unsigned();
            $table->string('reference');
            $table->string('name');
-            $table->integer('quantity')->default(0);
+            $table->decimal('quantity', 25, 5)->default(0.00);
            $table->decimal('price', 25, 5)->default(0.00);
            $table->decimal('amount', 25, 5)->default(0.00);
            $table->softDeletes();
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDeletedAtToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+        });
+    }
+}
@@ -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', 'LMD', 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;
@@ -106,7 +107,7 @@ class ModernWarehouseTableSeeder extends Seeder
        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
        $companyModule->update(['name' => 'Yiwu', 'reference' => 'YW-V02']);

-        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000);
+        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000, AddressType::BILLING, ApprovalStatus::APPROVED);
        $contact = new ContactObject('韩成名', '18058489899 / 18058929899', '', '');

        $this->createsAddress->execute($companyModule, $address);
@@ -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 {
@@ -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>
@@ -93,6 +93,10 @@
            id: {
                type: Number,
                required: true
+            },
+            type: {
+                type: Number,
+                default: 2
            }
        },
        data() {
@@ -104,6 +108,7 @@
                    street_two: '',
                    district_id: '',
                    post_code: '',
+                    type: this.type,
                    remark: '',
                    phone: '',
                    person_in_charge: '',
@@ -118,6 +123,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>
@@ -8,8 +8,8 @@
            </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>
-                    <div class="row" v-if="company.last_order">
+                    <on-boarding-section-component v-if="company.last_order && company.status === 0"></on-boarding-section-component>
+                    <div class="row" v-if="company.last_order && company.status !== 0">
                        <div class="col">
                            <div class="row m-b-30 relative">
                                <div class="col">
@@ -67,7 +67,7 @@
                    </div>
                </div>
            </div>
-            <order-form-component v-show="$store.getters.isShowing('createOrderForm')" :company="company" :section="section"></order-form-component>
+            <order-form-component v-show="$store.getters.isShowing('createOrderForm') || (!company.last_order && company.status === 0)" :company="company" :section="section"></order-form-component>
        </div>
    </div>
 </template>
@@ -1,7 +1,7 @@
 <template>
    <div class="row">
        <div class="col">
-            <div class="row m-b-20">
+            <div class="row m-b-20 hide">
                <div class="col">
                    <div class="row m-b-50 text-center" v-if="!$store.getters.isAdmin">
                        <div class="col">
@@ -97,6 +97,109 @@
                    </div>
                </div>
            </div>
+            <div class="row align-items-center justify-content-center m-b-30">
+                <div class="col-10 bg-master-lightest padding-25">
+                    <div class="row align-items-center">
+                        <div class="col-12 col-lg-3">
+                            <div class="row justify-content-center">
+                                <div class="col-10">
+                                    <a :href="route('order.qr.download', 3362)" target="_blank">
+                                        <div class="peelable-corner overflow-hidden relative">
+                                            <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:3362}'" class="w-100">
+                                        </div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="row align-items-center">
+                                <div class="col">
+                                    <h4 class="text-success bold">Hooray! You have successfully created your first order.</h4>
+                                </div>
+                            </div>
+                            <div class="row m-b-20">
+                                <div class="col-auto">
+                                    <h3 class="no-margin"><b>Order No.</b> 636295692</h3>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row align-items-center justify-content-center m-b-50">
+                <div class="col-10">
+                    <div class="row">
+                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest b-r b-grey">
+                            <div class="row m-b-15">
+                                <div class="col text-center">
+                                    <img src="/images/qr-box.svg" width="150" height="150">
+                                </div>
+                            </div>
+                            <div class="row justify-content-center">
+                                <div class="col">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 1</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="no-margin">Send the QR Code label to your supplier to attach to your parcel</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest b-r b-grey">
+                            <div class="row m-b-15">
+                                <div class="col text-center">
+                                    <img src="/images/package.svg" width="120" height="150">
+                                </div>
+                            </div>
+                            <div class="row justify-content-center">
+                                <div class="col">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 2</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="no-margin">We receive your packages at our warehouse, and arrange for shipping.</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <img src="/images/package_hands.svg" width="160" height="150">
+                                </div>
+                            </div>
+                            <div class="row justify-content-center">
+                                <div class="col">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 3</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="no-margin">Track your parcel to your doorsteps at your selected delivery address.</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row align-items-center justify-content-center">
+                <div class="col-10">
+                    <complete-registration-form-component></complete-registration-form-component>
+                </div>
+            </div>
        </div>
    </div>
 </template>
@@ -23,7 +23,8 @@
            </div>
        </div>
        <div class="col">
-            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+            <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>
        <div class="col-auto text-right" v-if="!item.transport">
            <div class="row m-b-5">
@@ -35,7 +36,7 @@
                    <div v-if="!item.order" class="text-danger">Unclaimed</div>
                </div>
            </div>
-            <div class="row">
+            <div class="row hide" v-if="false">
                <div class="col">
                    <div v-if="!item.shippng_transaction">
                        <div class="btn btn-xs btn-primary pointer" @click="generateInvoice()">Generate Invoice</div>
@@ -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>
@@ -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
            }
@@ -50,7 +50,7 @@
                                        </div>
                                        <div class="col-auto">
                                            <small class="fs-10 all-caps muted">Status</small>
-                                            <p class="no-margin bold">{{status}}</p>
+                                            <p class="no-margin bold">{{item.container ? item.container.transport.schedule_complete && status === 'Shipping' ? 'Custom Clearance' : status : status}}</p>
                                        </div>
                                        <div class="col-auto" v-if="$store.getters.isAdmin">
                                            <small class="fs-10 all-caps muted">Container</small>
@@ -22,17 +22,18 @@
                                    <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                                    <p class="no-margin text-success bold">{{data.transport ? data.transport.drop_date : 'n/a'}}</p>
                                </div>
-                                <div class="col text-right">
+                                <div class="col text-right" v-if="$store.getters.isSuperAdmin">
                                    <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
+                                        <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
+                                    </modal-component>
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
-             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
-                <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
-            </modal-component>
+
        </div>
    </div>
 </template>
@@ -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>
@@ -7,22 +7,28 @@
                </div>
            </div>
            <error-message-component class="m-b-20" :error="error"></error-message-component>
-            <div class="row">
-                <div class="col">
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.receive_date">
+            <div class="row m-b-25">
+                <div class="col p-r-5">
+                    <validation-wrapper-component :validator="$v.parameters.receive_date">
                        <label class="text-primary">Receive Date</label>
-                        <date-picker-component :parameters="parameters" :value="'receive_date'"></date-picker-component>
+                        <date-picker-component v-model="parameters.receive_date"></date-picker-component>
                    </validation-wrapper-component>
-                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.tracking">
+                </div>
+                <div class="col p-l-5">
+                    <validation-wrapper-component :validator="$v.parameters.tracking">
                        <label class="text-primary">Tracking</label>
                        <input type="text" class="form-control fs-12" v-model.trim="parameters.tracking">
                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
                    <package-form-component :section="section" :packages="parameters.packages"></package-form-component>
-                    <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">Submit</div>
-                        </div>
-                    </div>
+                </div>
+            </div>
+            <div class="row m-t-15 align-items-center justify-content-center" v-if="parameters.packages.length > 0">
+                <div class="col">
+                    <div class="btn btn-block btn-lg btn-primary b-rad-none no-border" @click="submitForm">Submit</div>
                </div>
            </div>
        </div>
@@ -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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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	10d62dd8d1	update export delivery list - include state and postcode	2022-04-06 13:53:43 +08:00
edmondlang	0fa0d8daab	Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)	2022-04-06 13:30:16 +08: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
omair saleh	68d961a681	custom clearance status	2022-04-05 11:38:21 +08:00
omair saleh	2c29e5939e	custom clearance status	2022-04-05 11:25:56 +08:00
omair saleh	6910dce35f	custom clearance status	2022-04-05 11:23:39 +08:00
omair saleh	a19db06b6b	custom clearance status	2022-04-05 11:20:45 +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
omair saleh	b764ee0769	update packing list monthly summary containers	2022-04-01 17:02:36 +08:00
omair saleh	ab1d92af86	fix yd missing packages from order	2022-04-01 14:58:27 +08:00
omair saleh	2ff9a38114	fix yd missing packages from order	2022-04-01 14:57:41 +08:00
omair saleh	0abdbd525e	fix yd missing packages from order	2022-04-01 14:56:46 +08:00
omair saleh	f44aace3c5	fix yd missing packages from order	2022-04-01 14:56:05 +08:00
omair saleh	0af84a9b7d	fix yd missing packages from order	2022-04-01 14:54:09 +08:00
omair saleh	1aff95b41c	fix yd missing packages from order	2022-04-01 14:51:57 +08:00
omair saleh	745f476f89	fix yd missing packages from order	2022-04-01 14:41:24 +08:00
omair saleh	e1d751b859	fix yd missing packages from order	2022-04-01 11:21:44 +08:00
omair saleh	6077b1fbbb	fix yd missing packages from order	2022-04-01 10:56:56 +08:00
omair saleh	5fe8a7a59e	fix order address update to vt	2022-03-31 21:15:19 +08:00
omair saleh	8b38bcac8a	fix order address update to vt	2022-03-31 21:10:23 +08:00
omair saleh	5561442932	fix order address update to vt	2022-03-31 21:09:01 +08:00
omair saleh	f33efd373c	fix order address update to vt	2022-03-31 21:05:44 +08:00
omair saleh	53c325b36d	fetch only 2 months orders from yd	2022-03-31 20:47:14 +08:00
omair saleh	cd141bf988	fix yd older than 2 months orders	2022-03-31 20:30:49 +08:00
omair saleh	908f3fc11b	fix yd older than 2 months orders	2022-03-31 20:29:49 +08:00
omair saleh	8e9f12b17e	fix yd older than 2 months orders	2022-03-31 20:29:14 +08:00
omair saleh	782bcc69f1	fix yd older than 2 months orders	2022-03-31 20:28:41 +08:00
omair saleh	144464621e	fix yd older than 2 months orders	2022-03-31 20:28:07 +08:00
omair saleh	b290f95426	fix yd older than 2 months orders	2022-03-31 20:27:31 +08:00
omair saleh	b7e6269aa9	fix yd older than 2 months orders	2022-03-31 20:25:14 +08:00
omair saleh	7180f802b3	fix yd older than 2 months orders	2022-03-31 20:20:19 +08:00
omair saleh	7159c1c11d	fix yd older than 2 months orders	2022-03-31 20:17:55 +08:00
omair saleh	cce0cae57c	fix yd older than 2 months orders	2022-03-31 20:17:03 +08:00
omair saleh	bebce6fbaa	fix yd older than 2 months orders	2022-03-31 19:50:55 +08:00
omair saleh	531ab699ba	show delivery delay days	2022-03-31 19:45:06 +08:00
omair saleh	9f9c17977d	show delivery delay days	2022-03-31 19:44:11 +08:00
omair saleh	24f5de8c2c	fix missing yd delivery	2022-03-31 14:41:10 +08:00
omair saleh	3b8079785a	fix missing yd delivery	2022-03-31 14:19:47 +08:00
omair saleh	627fb3aa96	fix missing yd delivery	2022-03-31 14:18:34 +08:00
omair saleh	2b4d3f1992	fix missing yd delivery	2022-03-31 14:16:40 +08:00
omair saleh	65daceb59c	fix missing yd delivery	2022-03-31 14:13:26 +08:00
omair saleh	d7457e7174	fix missing yd delivery	2022-03-31 14:10:24 +08:00
omair saleh	9753eb3a18	fix packages is missing in yd api	2022-03-31 13:56:47 +08:00
omair saleh	e7df49a0d1	fix packages is missing in yd api	2022-03-31 13:54:48 +08:00
omair saleh	cd4e7aab10	fix packages is missing in yd api	2022-03-31 13:52:36 +08:00
omair saleh	29350dbb86	fix packages is missing in yd api	2022-03-31 13:52:16 +08:00
omair saleh	7338ebc78a	fix packages is missing in yd api	2022-03-31 13:49:47 +08:00
omair saleh	4eded7a742	update holiday announcement	2022-03-31 09:31:09 +08:00
omair saleh	dc562f6554	update holiday announcement	2022-03-31 09:29:31 +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	2d965009ec	move unclaimed packing lists to dashboard	2022-03-30 11:31:40 +08:00
omair saleh	7d84ddee95	fix do update bug	2022-03-30 00:25:18 +08:00
omair saleh	92b31a9342	fix do update bug	2022-03-30 00:22:05 +08:00
omair saleh	012dbfde09	fix do update bug	2022-03-30 00:21:14 +08:00
omair saleh	0b651953ea	fix do update bug	2022-03-30 00:20:24 +08:00
omair saleh	b34f50ae9d	fix do update bug	2022-03-30 00:20:11 +08:00
omair saleh	8f0d1e6fdf	fix do update bug	2022-03-30 00:19:22 +08:00
omair saleh	e8990d96f7	debug do update	2022-03-30 00:06:22 +08:00
omair saleh	69ee0eea2c	debug do update	2022-03-30 00:05:45 +08:00
omair saleh	adcdf5909e	debug do update	2022-03-29 23:57:16 +08:00
omair saleh	b9523fb567	debug do update	2022-03-29 23:56:31 +08:00
omair saleh	79678d7b93	debug do update	2022-03-29 23:56:01 +08:00
omair saleh	2bdfd2772a	debug do update	2022-03-29 23:54:14 +08:00
omair saleh	55513f5175	debug do update	2022-03-29 23:44:22 +08:00
omair saleh	709534ce04	debug do update	2022-03-29 23:43:29 +08:00
omair saleh	74d85eee60	debug do update	2022-03-29 23:42:32 +08:00
omair saleh	63badc08f0	debug do update	2022-03-29 23:41:34 +08:00
omair saleh	73010ed32b	debug do update	2022-03-29 23:40:20 +08:00
omair saleh	7a2a90545b	debug do update	2022-03-29 23:40:05 +08:00
omair saleh	c0ee3a8e57	debug do update	2022-03-29 23:39:28 +08:00
omair saleh	0c7e4d5785	debug do update	2022-03-29 23:38:33 +08:00
omair saleh	c3cd8ae3a0	debug do update	2022-03-29 23:35:27 +08:00
omair saleh	0e7469f1cd	new registration ui flow	2022-03-29 23:15:42 +08:00
omair saleh	32476afdd4	fix vt warehouse list	2022-03-27 12:56:31 +08:00
omair saleh	8b6db1fb68	temp test vt warehouse list	2022-03-27 12:55:06 +08:00
omair saleh	43f3fbff07	temp test vt warehouse list	2022-03-27 12:54:06 +08:00
omair saleh	caf8624d4c	temp test vt warehouse list	2022-03-27 12:51:43 +08:00
omair saleh	eb417cf389	temp test vt warehouse list	2022-03-27 12:50:23 +08:00
omair saleh	276a87ff0d	temp test vt warehouse list	2022-03-27 12:49:08 +08:00
omair saleh	6d2f179025	Merge branch 'development' into 'master' Development See merge request CIEFWorldwideSdnBhd/shipping-portal!116	2022-03-27 03:54:48 +00:00
omair saleh	8609c926f9	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development	2022-03-27 11:53:18 +08:00
omair saleh	368a055bb4	add chat box to development	2022-03-27 11:50:27 +08:00
omair saleh	d617001412	fix vt YW orders	2022-03-27 11:49:32 +08:00
omair saleh	c932cb00cc	add chat widget	2022-03-25 17:36:27 +08:00
omair saleh	1be62a5f77	fix vt order number to filter yw	2022-03-25 16:54:10 +08:00
omair saleh	445bcb3864	small clean up	2022-03-24 13:33:04 +08:00
omair saleh	d489775924	small clean up	2022-03-24 13:32:34 +08:00
omair saleh	fff428882d	small clean up	2022-03-24 13:31:37 +08:00
omair saleh	42205ddbc3	small clean up	2022-03-24 13:29:59 +08:00
omair saleh	722e502b3b	tidy up invoices details descriptions	2022-03-24 13:26:55 +08:00
omair saleh	4f93569b4c	Merge branch 'development' into 'master' Development See merge request CIEFWorldwideSdnBhd/shipping-portal!115	2022-03-24 05:22:35 +00:00
omair saleh	e1abebc66c	Merge branch 'transaction-invoice' into 'development' transaction detail over weight See merge request CIEFWorldwideSdnBhd/shipping-portal!114	2022-03-24 05:18:22 +00:00
omair saleh	2424882cfe	Merge branch 'development' into 'transaction-invoice' # Conflicts: # app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php	2022-03-24 05:18:17 +00:00
omair saleh	23f50faa84	release create warehouse arrival parcel module	2022-03-24 13:11:22 +08:00
edmondlang	edc510681e	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development	2022-03-24 11:40:20 +08:00
omair saleh	db03836ef5	add new way of detecting yd container rescheduling	2022-03-24 10:59:59 +08:00
edmondlang	3a5f404294	Tidy Up Export Customer activity details, add new filter - minOrders and minCbm	2022-03-23 00:53:16 +08:00
edmondlang	9b79f16faa	Merge branch 'api-to-update-segment-constants' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development	2022-03-22 21:55:24 +08:00
edmondlang	4ff4418f7f	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development	2022-03-19 13:35:09 +08:00
glovetleong	19c8f1e658	transaction detail over weight	2022-03-18 20:46:40 +08:00
omair saleh	e1c4d674b6	smc report for specific containers	2022-03-18 17:48:18 +08:00
omair saleh	3326de9c4f	smc report for specific containers	2022-03-18 17:44:28 +08:00
omair saleh	54dd6d407d	revert invoice changes	2022-03-18 16:18:44 +08:00
omair saleh	9ee81d9385	update rfm to table	2022-03-18 16:18:12 +08:00
omair saleh	aa1ba03415	update rfm to table	2022-03-18 16:16:25 +08:00
omair saleh	fb6b2173b5	update rfm to table	2022-03-18 16:14:42 +08:00
omair saleh	f18e4a882f	update container reschedule for yd	2022-03-17 17:47:34 +08:00
omair saleh	8edc91bb61	update container reschedule for yd	2022-03-17 17:46:24 +08:00
omair saleh	6122c288df	update container reschedule for yd	2022-03-17 17:45:10 +08:00
omair saleh	9650877819	update container reschedule for yd	2022-03-17 17:43:03 +08:00
omair saleh	c65d875a3d	update container reschedule for yd	2022-03-17 17:41:39 +08:00
omair saleh	c1bc610549	update container reschedule for yd	2022-03-17 17:41:06 +08:00
omair saleh	82d406abfc	update container reschedule for yd	2022-03-17 17:39:47 +08:00
omair saleh	701610978d	update container reschedule for yd	2022-03-17 17:37:07 +08:00
omair saleh	f7e1665a02	update container reschedule for yd	2022-03-17 17:36:24 +08:00
omair saleh	d389b87609	update container reschedule for yd	2022-03-17 17:34:51 +08:00
omair saleh	987fdcfba2	update container reschedule for yd	2022-03-17 17:33:23 +08:00
omair saleh	6214a2b723	update container reschedule for yd	2022-03-17 17:31:39 +08:00
omair saleh	fe00b1fab7	update container reschedule for yd	2022-03-17 17:22:02 +08:00
omair saleh	41df3e6ae7	update container reschedule for yd	2022-03-17 17:18:47 +08:00
omair saleh	cf7d9ccca5	update container reschedule for yd	2022-03-17 17:17:01 +08:00
omair saleh	384d234b50	update container reschedule for yd	2022-03-17 17:16:35 +08:00
omair saleh	3fbfa44a04	update container reschedule for yd	2022-03-17 17:14:02 +08:00
omair saleh	cbc294054e	update container reschedule for yd	2022-03-17 17:12:47 +08:00
omair saleh	324556985a	update container reschedule for yd	2022-03-17 17:08:23 +08:00
omair saleh	1b8c6ca317	update container reschedule for yd	2022-03-17 17:08:12 +08:00
omair saleh	bbd09d300c	update container reschedule for yd	2022-03-17 17:07:33 +08:00
omair saleh	47c97d6151	update container reschedule for yd	2022-03-17 17:05:04 +08:00
omair saleh	435e3a8f7a	update container reschedule for yd	2022-03-17 17:03:40 +08:00
omair saleh	151032bb66	update container reschedule for yd	2022-03-17 17:02:40 +08:00
omair saleh	f32335d57b	update container reschedule for yd	2022-03-17 16:58:52 +08:00
omair saleh	2deddc4e03	update container reschedule for yd	2022-03-17 16:57:49 +08:00
omair saleh	32e665e4f7	update container reschedule for yd	2022-03-17 16:57:03 +08:00
omair saleh	a987419040	update container reschedule for yd	2022-03-17 16:36:50 +08:00
omair saleh	b0a65f870c	update container reschedule for yd	2022-03-17 16:33:00 +08:00
omair saleh	33a75eca7d	smc monthly report	2022-03-17 13:53:50 +08:00
Leong Chee Siong	deb68dc723	Merge branch 'transaction-invoice' into 'development' billpliz callback See merge request CIEFWorldwideSdnBhd/shipping-portal!113	2022-03-17 02:13:19 +00:00
omair saleh	519408c2b5	lawas and Limbang show kk warehouse	2022-03-17 09:55:46 +08:00
omair saleh	53907e2463	lawas and Limbang show kk warehouse	2022-03-17 09:52:24 +08:00
omair saleh	10e6f6045e	lawas and Limbang show kk warehouse	2022-03-17 09:51:36 +08:00
omair saleh	c06cec5b41	lawas and Limbang show kk warehouse	2022-03-17 09:47:31 +08:00
omair saleh	cfe611d05d	lawas and Limbang show kk warehouse	2022-03-17 09:45:24 +08:00
ahmedsophyudden	b9b79ca65a	Shipping Portal - Api to update segment (general, state, postcode)	2022-03-17 01:01:01 +08:00
glovetleong	9a1562386f	billpliz callback	2022-03-16 23:01:38 +08:00
omair saleh	22700893a2	fix qr remark	2022-03-16 10:03:47 +08:00
omair saleh	550c9480a4	fix qr remark	2022-03-16 10:02:17 +08:00
omair saleh	48bab9998c	fix qr remark	2022-03-16 09:47:26 +08:00
omair saleh	3ff81d4f00	fix qr remark	2022-03-16 09:46:23 +08:00
omair saleh	cc7edfc784	sort deliveries by date	2022-03-16 01:24:37 +08:00
omair saleh	72448d656c	sort deliveries by date	2022-03-16 01:20:13 +08:00
omair saleh	c941f679b6	sort deliveries by date	2022-03-16 01:19:31 +08:00
omair saleh	78f6c70cad	sort deliveries by date	2022-03-16 01:18:53 +08:00
omair saleh	1575d62e0f	sort deliveries by date	2022-03-16 01:17:21 +08:00
omair saleh	43f4bc533a	sort deliveries by date	2022-03-16 01:16:13 +08:00
omair saleh	9ae36dc400	sort deliveries by date	2022-03-16 01:14:27 +08:00
omair saleh	02c55d97b7	sort deliveries by date	2022-03-16 01:00:27 +08:00
omair saleh	baeaa0f31a	sort deliveries by date	2022-03-16 00:58:16 +08:00
omair saleh	dadc786f1f	Merge branch 'development' into 'master' Development See merge request CIEFWorldwideSdnBhd/shipping-portal!112	2022-03-15 16:32:13 +00:00
omair saleh	bd9dab0029	hide invoice button for production	2022-03-16 00:31:24 +08:00
omair saleh	e2b795c872	Merge remote-tracking branch 'origin/development' into development	2022-03-16 00:30:55 +08:00
omair saleh	9a79c6dd1d	Merge branch 'development' into 'master' Warehouse Profile See merge request CIEFWorldwideSdnBhd/shipping-portal!111	2022-03-15 16:28:58 +00:00
omair saleh	d8e1c38429	hide invoice button for production	2022-03-16 00:24:18 +08:00
Leong Chee Siong	aa28afb9f0	Merge branch 'transaction-invoice' into 'development' soft delete user See merge request CIEFWorldwideSdnBhd/shipping-portal!110	2022-03-14 05:45:21 +00:00
glovetleong	7ec109eb3e	soft delete user	2022-03-14 13:42:48 +08:00
omair saleh	7151616b04	Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development	2022-03-14 13:19:04 +08:00
omair saleh	28088f7d9a	fix mysql crash on supplier update api	2022-03-11 14:43:21 +08:00