diff --git a/app/Classes/General/Eloquent/Filters/OwneId.php b/app/Classes/General/Eloquent/Filters/OwneId.php
new file mode 100644
index 00000000..eac7e32d
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/OwneId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('owner_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/Transactionable.php b/app/Classes/General/Interfaces/Transactionable.php
new file mode 100644
index 00000000..174cb48d
--- /dev/null
+++ b/app/Classes/General/Interfaces/Transactionable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transactionable
+{
+
+    public function transactions(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
new file mode 100644
index 00000000..19dc5b59
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceConflictException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\UserResource;
+use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AddNewMemberLogic extends AbstractControllerLogic
+{
+
+    public function notification(): array
+    {
+        return [
+            'title' => 'Updated Email',
+            'message' => 'Successfully updated email'
+        ];
+    }
+
+    /**
+     * @var AssignEmployeeProcessor
+     */
+    private $assignEmployeeProcessor;
+
+    /**
+     * @var GenerateEmailVerificationAttemptProcessor
+     */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /**
+     * AddNewMemberLogic constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    {
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ResourceConflictException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        try {
+            $user = Auth::user()->replicate();
+            $user->email = $request->input('email');
+            $user->status = ApprovalStatus::PENDING_VERIFICATION;
+            $user->save();
+        } catch (QueryException $exception){
+            throw new ResourceConflictException('Unable to change your email address as it already exists');
+        }
+
+        if($company = Auth::user()->companyModule()->first()){
+            $Object = new EmploymentObject($company, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+        }
+
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
+
+        return $this->resourceResponse(new UserResource($user));
+    }
+}
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php
new file mode 100644
index 00000000..3d6c484f
--- /dev/null
+++ b/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\ListsAddresses;
+use App\Classes\Modules\Addresses\Services\ListsStates;
+use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
+use App\Http\Resources\AddressResource;
+use App\Http\Resources\StateResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListStatesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Addresses',
+            'message' => 'You have successfully retrieved a list of Addresses'
+        ];
+    }
+
+    /** @var ListsStates */
+    private $listStates;
+
+    /**
+     * ListStatesLogic constructor.
+     * @param ListsStates $listStates
+     */
+    public function __construct(ListsStates $listStates)
+    {
+        $this->listStates = $listStates;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listStates->execute($this->listStates->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(StateResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/ListsStates.php b/app/Classes/Modules/Addresses/Services/ListsStates.php
new file mode 100644
index 00000000..5591b823
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/ListsStates.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\State;
+use Illuminate\Database\Eloquent\Builder;
+
+class ListsStates extends AbstractListRecord
+{
+
+    /** @var State */
+    private $repository;
+
+    /**
+     * ListsStates constructor.
+     * @param State $repository
+     */
+    public function __construct(State $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
index 6493811d..8ce6d4a8 100644
--- a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
+++ b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
@@ -3,8 +3,6 @@
 namespace App\Classes\Modules\Announcements\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-use Carbon\Carbon;
-
 class AnnouncementObject implements DataTransferObject
 {
 
@@ -54,20 +52,18 @@ class AnnouncementObject implements DataTransferObject
     }
 
     /**
-     * @return Carbon
+     * @return string
      */
-    public function getStartingOn(): Carbon
+    public function getStartingOn(): string
     {
-//        return $this->starting_on;
-        return Carbon::parse($this->starting_on);
+        return $this->starting_on;
     }
 
     /**
-     * @return Carbon
+     * @return string
      */
-    public function getEndingOn(): Carbon
+    public function getEndingOn(): string
     {
-//        return $this->ending_on;
-        return Carbon::parse($this->ending_on);
+        return $this->ending_on;
     }
 }
diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
index c435dab4..45732c82 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
@@ -35,17 +36,22 @@ class UpdateCompanyLogic extends AbstractControllerLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
     /**
      * UpdateCompanyControllersLogic constructor.
      * @param CanUpdateCompany $canUpdateCompany
      * @param UpdatesCompany $updatesCompany
      * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
      */
-    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyModuleName $updatesCompanyModuleName)
     {
         $this->canUpdateCompany = $canUpdateCompany;
         $this->updatesCompany = $updatesCompany;
         $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
     }
 
 
@@ -56,23 +62,17 @@ class UpdateCompanyLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
 
-            $object = new CompanyObject($request->input('reference_no'), $request->input('name'), $request->input('type'));
+        $this->canUpdateCompany->passes($object);
 
-            $this->canUpdateCompany->passes($object);
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
 
-            $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $query = $this->updatesCompany->execute($query, $object);
 
-            $query = $this->updatesCompany->execute($query, $object);
-
-            return $this->resourceResponse(new CompanyResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
 
+        return $this->resourceResponse(new CompanyResource($query));
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompany.php b/app/Classes/Modules/Companies/Services/UpdatesCompany.php
new file mode 100644
index 00000000..f89bbca8
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompany.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompany extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, CompanyObject $object) 
+    {
+        $model->name = $object->getName();
+        $model->reference = $object->getReference();
+        $model->type = $object->getType();
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyModuleName.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyModuleName.php
new file mode 100644
index 00000000..8dba5196
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyModuleName.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
+use App\Models\CompanyModule;
+
+class UpdatesCompanyModuleName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param CompanyModule $model
+     * @param CompanyModuleObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CompanyModule $model, string $name) 
+    {
+        $model->name = $name;
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php b/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php
new file mode 100644
index 00000000..c7bd1f70
--- /dev/null
+++ b/app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Standards\Validators\CompanyValidation;
+
+class CanUpdateCompany extends AbstractRule
+{
+    /** @var CompanyValidation */
+    private $companyValidation;
+
+
+    /**
+     * CanUpdateCompany constructor.
+     * @param CompanyValidation $companyValidation
+     */
+    public function __construct(CompanyValidation $companyValidation)
+    {
+        $this->companyValidation = $companyValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->companyValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
index e9809fff..4a69768a 100644
--- a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
+++ b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php
@@ -15,7 +15,8 @@ class CompanyValidation extends AbstractValidation
     {
         return [
             'company_name' => $object->getName(),
-            'company_reference' => $object->getReference()
+            'company_reference' => $object->getReference(),
+            'type' => $object->getType()
         ];
     }
 
diff --git a/app/Classes/Modules/Documents/ControllersLogic/UpdateDocumentReferenceLogic.php b/app/Classes/Modules/Documents/ControllersLogic/UpdateDocumentReferenceLogic.php
new file mode 100644
index 00000000..e5d59101
--- /dev/null
+++ b/app/Classes/Modules/Documents/ControllersLogic/UpdateDocumentReferenceLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+use App\Classes\Modules\Documents\Standards\Rules\CanUpdateDocumentReference;
+use App\Http\Resources\DocumentResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Services\FetchesDocument;
+use App\Classes\Modules\Documents\Services\UpdatesDocumentReference;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateDocumentReferenceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Document Reference',
+            'message' => 'You have successfully updated the Document Reference'
+        ];
+    }
+
+    /** @var CanUpdateDocumentReference*/
+    private $canUpdateDocumentReference;
+
+    /** @var UpdatesDocumentReference */
+    private $updatesDocumentReference;
+
+    /** @var FetchesDocument */
+    private $fetchesDocument;
+
+
+    /**
+     * RejectDocumentLogic constructor.
+     * @param CanApproveDocument $canApproveDocument
+     * @param ApprovesDocument $approvesDocument
+     * @param FetchesDocument $fetchesDocument
+     */
+    public function __construct(CanUpdateDocumentReference $canUpdateDocumentReference, UpdatesDocumentReference $updatesDocumentReference, FetchesDocument $fetchesDocument)
+    {
+        $this->canUpdateDocumentReference = $canUpdateDocumentReference;
+        $this->updatesDocumentReference = $updatesDocumentReference;
+        $this->fetchesDocument = $fetchesDocument;
+    }
+
+    /**
+     * @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
+    {
+        $document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
+
+        $this->canUpdateDocumentReference->passes();
+
+        $document_query = $this->updatesDocumentReference->execute($document, $request->input('identification_number'));
+
+        return $this->resourceResponse(new DocumentResource($document_query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/UpdatesDocumentReference.php b/app/Classes/Modules/Documents/Services/UpdatesDocumentReference.php
new file mode 100644
index 00000000..23a16e02
--- /dev/null
+++ b/app/Classes/Modules/Documents/Services/UpdatesDocumentReference.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Document;
+
+class UpdatesDocumentReference extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Document $model
+     * @return mixed
+     */
+    public function execute(Document $model, string $reference) {
+        $model->reference = $reference;
+        return $this->handler($model);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php b/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php
new file mode 100644
index 00000000..e6a29785
--- /dev/null
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+
+class CanUpdateDocumentReference extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Exports/Services/ExportsContainerPackingList.php b/app/Classes/Modules/Exports/Services/ExportsContainerPackingList.php
new file mode 100644
index 00000000..2371962b
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsContainerPackingList.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Container;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+
+class ExportsContainerPackingList implements FromQuery, WithHeadingRow, WithMapping
+{
+    use Exportable;
+
+    protected $id;
+
+    public function headings(): array
+    {
+        return [
+            'Marking',
+            'Refrence',
+            'Quantity',
+            'CBM',
+            'Status',
+            'Delivery Phone',
+            'Delivery Refrence',
+            'Delivery Address',
+            'Remark',
+            'Delivery Date'
+        ];
+    }
+
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {   
+        return Container::find($this->id)->packingLists();
+    }
+
+    /**
+     * @param Company $container
+     *
+     * @return array
+     */
+    public function map($packing_list): array
+    {
+        $order = $packing_list->owner()->first();
+        $address = $order->addresses()->first();
+        $company = $order->companyModule()->first();
+        $connection = $company->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $quantity = 0;
+        $cbm = 0;
+        foreach ($packing_list->packages()->get() as $key => $row) {
+            $quantity += $row->quantity;
+            $cbm += (($row->width / 100) * ($row->height / 100) * ($row->length / 100)) * $row->quantity;
+        }
+
+        $status = '';
+        if ($packing_list->transports()->count() > 0) {
+            $status = 'Delivery';
+        }
+        elseif ($packing_list->status == ApprovalStatus::SUSPENDED) {
+            $status = 'On Hold';
+        }
+        elseif ($packing_list->status != ApprovalStatus::SUSPENDED) {
+            $status = 'Release';
+        }
+
+        return [
+            $marking,
+            $order->reference,
+            $quantity,
+            $cbm,
+            $status,
+            $address->contacts()->first() ? $address->contacts()->first()->phone : 'n/a',
+            $address->contacts()->first() ? $address->contacts()->first()->reference : 'n/a',
+            $address->street_one . ' ' . $address->street_two . ' ' . $address->district->name . ' ' . $address->post_code . ' ' . $address->state->name . ' ' . $address->country->name,
+            $address->remarks()->first() ? $address->remarks()->first()->content : 'n/a',
+            $packing_list->transports()->first() ?  $packing_list->transports()->current_schedule->eta : 'n/a'
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index 28f9a116..4878b529 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -6,7 +6,9 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 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\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use Illuminate\Http\Request;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
new file mode 100644
index 00000000..45f32ad7
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListOwner;
+use App\Classes\Modules\Transports\Services\UpdatesTransportStatus;
+use App\Classes\Modules\Unity\Services\CreatesContract;
+use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
+use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
+use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListContractReference;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+
+use App\Http\Resources\PackingListResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Assign Packing List Order',
+            'message' => 'You have successfully created a Packing List Order'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesPackingListOwner */
+    private $updatesPackingListOwner;
+
+    /** @var UpdatesTransportStatus */
+    private $updatesTransportStatus;
+
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var UpdatesPackingListContractReference */
+    private $updatesPackingListContractReference;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesPackingListRemark $createsPackingListRemark
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, FetchesOrder $fetchesOrder, UpdatesPackingListOwner $updatesPackingListOwner, UpdatesTransportStatus $updatesTransportStatus, CreatesContract $unityCreateContract,  ActivateContractProcessor $unityActivateContract, CreateContractEntityProcessor $unityCreateContractEntity, AssignContractEntityProcessor $unityAssignContractEntity, UpdatesPackingListContractReference $updatesPackingListContractReference, CreatesStep $createsStep)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesPackingListOwner = $updatesPackingListOwner;
+        $this->updatesTransportStatus = $updatesTransportStatus;
+
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityActivateContract = $unityActivateContract;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+
+        $this->updatesPackingListContractReference = $updatesPackingListContractReference;
+        $this->createsStep = $createsStep;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $warehouse_packing_list = $this->fetchesPackingList->execute([
+            'id' => $request->route('id'), 
+            'type' => PackingListType::WAREHOUSE_RECEIVE_LIST,
+            'status' => ApprovalStatus::REJECTED
+        ]);
+
+        $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]);
+
+        $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order);
+
+
+        $transport = $warehouse_packing_list->transports()->first();
+        $transport = $this->updatesTransportStatus->execute($transport, ApprovalStatus::APPROVED);
+
+        $contract = $this->unityCreateContract->execute();
+        $contractReference = $contract->hash_id;
+        $contractObligations = $contract->contract_obligation_list;
+
+        $this->unityActivateContract->execute($contractReference);
+        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+
+        $packing_list = $this->fetchesPackingList->execute([
+            'reference' => $warehouse_packing_list->reference, 
+            'type' => PackingListType::SHIPPING_PACKING_LIST,
+            'status' => ApprovalStatus::PENDING_VERIFICATION
+        ]);
+
+        $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
+        
+        $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
+
+        foreach($contractObligations as $obligation) {
+            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+            $this->createsStep->execute($packing_list, $stepObject);
+        }
+
+        return $this->resourceResponse(new PackingListResource($warehouse_packing_list));
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
index a1e485ce..b9e3142d 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
@@ -6,6 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
+use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -49,18 +50,11 @@ class ListPackingListsLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canListPackingLists->passes();
 
-            $this->canListPackingLists->passes();
-
-            $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
-
-            return $this->collectionResponse(PackingListResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
+        return $this->collectionResponse(PackingListResource::collection($query));
     }
 
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
index 13e4a83b..e1d112ed 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
@@ -49,7 +49,7 @@ class CreatePackageProcessor
         if($replica) {
             $modificationValue = 1;
             $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
-            $this->createsPackage->execute($packageObject, $replica);
+            $package = $this->createsPackage->execute($packageObject, $replica);
         }
 
         return ;
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
index 3e2a861d..f0eda0cb 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
@@ -48,11 +48,13 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
+        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+
         $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
         /** create packing list replica */
-        $object = new PackingListObject($object->getReference().'_01', $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, $type, ApprovalStatus::PENDING_SUBMISSION);
+        $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);
-
+        
         return $packingList;
     }
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 9417145e..7a81972f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -30,8 +30,8 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Container;
+use App\Models\Order;
 use App\Models\PackingList;
-use App\Models\Transaction;
 use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
@@ -134,9 +134,7 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-
         try {
-
             $start = $start ? $start : Carbon::now()->subMonths(2);
 
             $startLimit = Carbon::parse('01-12-2021');
@@ -153,6 +151,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
             foreach($rows->data as $row){
 
                 $containerReference = null;
@@ -170,7 +169,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
                 foreach (array_reverse($rows->data) as $trackingRow) {
-                    if($trackingRow->tracking === '货物已送达仓库准备入库中'){
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
                         $receiveDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
@@ -182,29 +181,29 @@ class FetchOrderListsFromYdPortalProcessor
                         $eta = Carbon::parse($tracking[2]);
                     }
 
-                    if(strpos($trackingRow->tracking, '预计船时间为') !== false){
+                    if (strpos($trackingRow->tracking, '预计船时间为') !== false) {
                         $tracking = explode('预计船时间为', $trackingRow->tracking);
                         $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
                     }
 
-                    if(strpos($trackingRow->tracking, '预计开船为') !== false){
+                    if (strpos($trackingRow->tracking, '预计开船为') !== false) {
                         $tracking = explode('预计开船为', $trackingRow->tracking);
                         $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
                     }
 
-                    if($trackingRow->tracking === '货物已进目的港仓库'){
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if($trackingRow->tracking === '货物已派送完成'){
+                    if ($trackingRow->tracking === '货物已派送完成') {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
-
                 }
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
                 $orderNumber = $customerno[array_key_last($customerno)];
+                $allow_contract = true;
 
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
@@ -212,8 +211,10 @@ class FetchOrderListsFromYdPortalProcessor
                     try {
                         $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
                     } catch (ResourceNotFoundException $exception) {
-                        continue;
+                        $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                        $allow_contract = false;
                     }
+
                 }
 
                 DB::beginTransaction();
@@ -232,40 +233,52 @@ class FetchOrderListsFromYdPortalProcessor
                     $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                     if($replica) $replica->packages()->delete();
 
-                } catch (ResourceNotFoundException $exception){
-                    $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                } catch (ResourceNotFoundException $exception) {
+
+                    if (!$allow_contract) {
+                        $appointee_id = 2037;
+                    } else {
+                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                    }
+
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-                    /** @var Transport $warehouseTransport */
-                    $warehouseTransport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-                    $this->createsSchedule->execute($warehouseTransport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
 
-                    $contract = $this->unityCreateContract->execute();
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                    $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
 
-                    $contractReference = $contract->hash_id;
-                    $contractObligations = $contract->contract_obligation_list;
+                    if ($allow_contract) {
 
-                    $this->unityActivateContract->execute($contractReference);
+                        $contract = $this->unityCreateContract->execute();
 
-                    $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+                        $contractReference = $contract->hash_id;
+                        $contractObligations = $contract->contract_obligation_list;
 
-                    $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+                        $this->unityActivateContract->execute($contractReference);
 
-                    $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
 
-                    $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
 
-                    $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED , $contractReference);
+                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                    }
+
+                    $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, !$allow_contract ? null : $contractReference);
 
                     /** @var PackingList $packingList */
                     $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-                    foreach($contractObligations as $obligation) {
-                        $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                        $this->createsStep->execute($packingList, $stepObject);
+                    if ($allow_contract) {
+                        foreach ($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
+                        }
                     }
                 }
 
@@ -284,50 +297,46 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
-                DB::commit();
-
-                $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
-                    $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                        'expressno' => $row->expressno
-                    ]);
+                if($order instanceof Order){
+                    $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
+                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                            'expressno' => $row->expressno
+                        ]);
+                    }
                 }
 
+
                 if($containerReference) {
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
                     } catch (ResourceNotFoundException $exception){
-                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
+
+                        if (!$allow_contract) {
+                            $appointee_id = 2037;
+                        }
+                        else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                        }
+
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+
                         $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
                         /** @var Container $container */
                         $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-                    }
 
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-
-                    $transport = $container->transports()->first();
-
-                    if(!$transport){
-                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $container);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                    }
-
-                    if($delayDate){
+                        $container->packingLists()->attach($packingList);
 
                         $transport = $container->transports()->first();
 
-                        if(!$transport->schedules()->where('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));
+                        if(!$transport){
+                            $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $container);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                         }
-
                     }
 
-
                     if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
@@ -347,7 +356,6 @@ class FetchOrderListsFromYdPortalProcessor
                             }
                         }
                     }
-
                 }
 
                 if($deliveryDate){
@@ -371,6 +379,8 @@ class FetchOrderListsFromYdPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
                 }
 
+                DB::commit();
+
             }
         } catch (\Exception $exception) {
             Log::debug($exception);
diff --git a/app/Classes/Modules/PackingLists/Services/CreatesNullOrderPackingList.php b/app/Classes/Modules/PackingLists/Services/CreatesNullOrderPackingList.php
new file mode 100644
index 00000000..fd955d44
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/CreatesNullOrderPackingList.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Interfaces\Packable;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Models\PackingList;
+
+class CreatesNullOrderPackingList extends AbstractUpdateRecord
+{
+    /**
+     * @param PackingListObject $object
+     * @param Packable $packable
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingListObject $object) {
+        $model = new PackingList();
+
+        $model->reference = $object->getReference();
+        $model->claimant_id = $object->getClaimantId();
+        $model->type = $object->getType();
+        $model->status = $object->getStatus();
+        $model->reference_contract = $object->getContractReference();
+        $model->owner_type = 'App\Models\Order';
+        $model->owner_id = 1;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListContractReference.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListContractReference.php
new file mode 100644
index 00000000..dba4dfb3
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListContractReference.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PackingList;
+
+class UpdatesPackingListContractReference extends AbstractUpdateRecord
+{
+
+    /**
+     * @param PackingList $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $model, string $reference_contract) {
+
+        $model->reference_contract = $reference_contract;
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php
new file mode 100644
index 00000000..4a6b6dfb
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Interfaces\Packable;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Models\PackingList;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+class UpdatesPackingListOwner extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param PackingList $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $model, Packable $packable) {
+
+        $model->status = ApprovalStatus::APPROVED;
+
+        return $this->handler($packable->packingLists(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php b/app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php
new file mode 100644
index 00000000..33aa445b
--- /dev/null
+++ b/app/Classes/Modules/SegmentConstants/Services/FetchesSegmentConstant.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\SegmentConstants\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\SegmentConstant;
+
+class FetchesSegmentConstant extends AbstractFetchRecord
+{
+
+    /** @var SegmentConstant */
+    private $repository;
+
+
+    /**
+     * FetchesSegment constructor.
+     * @param SegmentConstant $repository
+     */
+    public function __construct(SegmentConstant $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
index 14860207..6dff8327 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
@@ -22,7 +22,6 @@ class CreateSegmentLogic extends AbstractControllerLogic
         ];
     }
 
-
     /** @var CreateSegmentProcessor  */
     private $createSegmentProcessor;
 
diff --git a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
index 5d2f6c3b..98844819 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
@@ -45,7 +45,6 @@ class DeleteSegmentLogic extends AbstractControllerLogic
         $this->fetchesSegment = $fetchesSegment;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
new file mode 100644
index 00000000..6c5c5b0f
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Segment Constant',
+            'message' => 'You have successfully retrieved the Segment Constant'
+        ];
+    }
+
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /**
+     * FetchConstantLogic constructor.
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(FetchesConstant $fetchesConstant)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => $request->route('reference')]);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
new file mode 100644
index 00000000..d5c35fdc
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Standards\Rules\CanFetchSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a segment'
+        ];
+    }
+
+    /** @var CanFetchSegment */
+    private $canFetchSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /**
+     * FetchSegmentLogic constructor.
+     * @param CanFetchSegment $canFetchSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanFetchSegment $canFetchSegment, FetchesSegment $fetchesSegment)
+    {
+        $this->canFetchSegment = $canFetchSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchSegment->passes();
+
+        $query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new SegmentResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
new file mode 100644
index 00000000..d8299424
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\ListsSegments;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a list of Segment'
+        ];
+    }
+
+
+    /** @var ListsSegments */
+    private $listsSegments;
+
+    /**
+     * ListSegmentLogic constructor.
+     * @param ListsSegments $listsSegments
+     */
+    public function __construct(ListsSegments $listsSegments)
+    {
+        $this->listsSegments = $listsSegments;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsSegments->execute($this->listsSegments->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(SegmentResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
new file mode 100644
index 00000000..dac04ec7
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Http\Resources\ConstantResource;
+use App\Models\SegmentConstant;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantLogic  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 CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param CanCreateConstant $canCreateConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, CanCreateConstant $canCreateConstant, CreatesConstant $createsConstant)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->canCreateConstant = $canCreateConstant;
+        $this->createsConstant = $createsConstant;
+    }
+    /**
+     * @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
+    {
+
+        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $object->getReference()]);
+            $this->canUpdateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->updatesConstant->execute($constant, $object);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $this->canCreateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->createsConstant->execute($segment, $object);
+
+        }
+
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
new file mode 100644
index 00000000..43eaa54e
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Http\Resources\SegmentResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateSegment;
+use App\Classes\Modules\Segments\Services\UpdatesSegment;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment',
+            'message' => 'You have successfully updated the Segment'
+        ];
+    }
+
+    /** @var CanUpdateSegment */
+    private $canUpdateSegment;
+
+    /** @var UpdatesSegment */
+    private $updatesSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+
+    /**
+     * UpdateSegmentLogic constructor.
+     * @param CanUpdateSegment $canUpdateSegment
+     * @param UpdatesSegment $updatesSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(
+        CanUpdateSegment $canUpdateSegment, 
+        UpdatesSegment $updatesSegment, 
+        FetchesSegment $fetchesSegment
+    )
+    {
+        $this->canUpdateSegment = $canUpdateSegment;
+        $this->updatesSegment = $updatesSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+            $segment_object = new SegmentObject(
+                $request->input('name', $segment_query->name)
+            );
+            $this->canUpdateSegment->passes($segment_object);
+            $segment_query = $this->updatesSegment->execute($segment_query, $segment_object);
+           
+            DB::commit();
+
+            return $this->resourceResponse(new SegmentResource($segment_query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
new file mode 100644
index 00000000..4489da1f
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use App\Http\Resources\CurrencyResource;
+use App\Models\SegmentConstant;
+
+class ConvertsConstantDetailsToResource
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * ConvertsConstantDetailsToResource constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+
+    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])) : '';
+        }
+
+        return $constant->detail;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/CreatesSegment.php b/app/Classes/Modules/Segments/Services/CreatesSegment.php
index 4dff35a7..aea2d87f 100644
--- a/app/Classes/Modules/Segments/Services/CreatesSegment.php
+++ b/app/Classes/Modules/Segments/Services/CreatesSegment.php
@@ -8,7 +8,6 @@ use App\Models\Segment;
 
 class CreatesSegment extends AbstractUpdateRecord
 {
-
     /**
      * @param SegmentObject $object
      * @return \Illuminate\Database\Eloquent\Model
diff --git a/app/Classes/Modules/Segments/Services/FetchesConstant.php b/app/Classes/Modules/Segments/Services/FetchesConstant.php
new file mode 100644
index 00000000..bfa1b2cb
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/FetchesConstant.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\SegmentConstant;
+
+class FetchesConstant extends AbstractFetchRecord
+{
+
+    /** @var SegmentConstant */
+    private $repository;
+
+    /**
+     * FetchesConstant constructor.
+     * @param SegmentConstant $repository
+     */
+    public function __construct(SegmentConstant $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ListsConstants.php b/app/Classes/Modules/Segments/Services/ListsConstants.php
new file mode 100644
index 00000000..733a6db7
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ListsConstants.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\SegmentConstant;
+
+class ListsConstants extends AbstractListRecord
+{
+
+    /** @var SegmentConstant */
+    private $repository;
+
+    /**
+     * ListsConstants constructor.
+     * @param SegmentConstant $repository
+     */
+    public function __construct(SegmentConstant $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ListsSegments.php b/app/Classes/Modules/Segments/Services/ListsSegments.php
new file mode 100644
index 00000000..af44820d
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ListsSegments.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Segment;
+
+class ListsSegments extends AbstractListRecord
+{
+
+    /** @var Segment */
+    private $repository;
+
+    /**
+     * ListsSegments constructor.
+     * @param Segment $repository
+     */
+    public function __construct(Segment $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/UpdatesConstant.php b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
new file mode 100644
index 00000000..13fb22c1
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Models\SegmentConstant;
+
+class UpdatesConstant extends AbstractUpdateRecord
+{
+
+    /**
+     * @param SegmentConstant $model
+     * @param ConstantObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(SegmentConstant $model, ConstantObject $object)
+    {
+        $model->name = $object->getName();
+        $model->reference = $object->getReference();
+        $model->detail = json_encode($object->getDetail());
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/UpdatesSegment.php b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
new file mode 100644
index 00000000..17f13efb
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Models\Segment;
+
+class UpdatesSegment extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Segment $model
+     * @param SegmentObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Segment $model, SegmentObject $object) 
+    {
+        $model->name = $object->getName();
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
new file mode 100644
index 00000000..55f9c61a
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanCreateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $constantValidation;
+
+    /**
+     * CanCreateConstant constructor.
+     * @param ConstantValidation $constantValidation
+     */
+    public function __construct(ConstantValidation $constantValidation)
+    {
+        $this->constantValidation = $constantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->constantValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
new file mode 100644
index 00000000..e6756305
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+class CanFetchSegment extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
new file mode 100644
index 00000000..9d01231d
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+
+class CanListSegments extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
new file mode 100644
index 00000000..650b249c
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanUpdateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $ConstantValidation;
+
+    /**
+     * CanUpdateConstant constructor.
+     * @param ConstantValidation $ConstantValidation
+     */
+    public function __construct(ConstantValidation $ConstantValidation)
+    {
+        $this->ConstantValidation = $ConstantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->ConstantValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
new file mode 100644
index 00000000..58a8c0ca
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Segments\Standards\Validators\SegmentValidation;
+
+class CanUpdateSegment extends AbstractRule
+{
+
+    /** @var SegmentValidation */
+    private $segmentValidation;
+
+
+    /**
+     * CanUpdateSegment constructor.
+     * @param SegmentValidation $segmentValidation
+     */
+    public function __construct(SegmentValidation $segmentValidation)
+    {
+        $this->segmentValidation = $segmentValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+
+        if (!\Auth::user()->can('edit segment')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->segmentValidation->validate($object);
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
new file mode 100644
index 00000000..d5ac8819
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+
+class ConstantValidation extends AbstractValidation
+{
+    /**
+     * @param ConstantObject $object
+     * @return array
+     */
+    protected function data($object): array {
+
+        $data = [
+            'name' => $object->getName(),
+            'reference' => $object->getReference(),
+            'detail' => $object->getDetail()
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => 'required',
+            'reference' => 'required',
+            'detail' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
new file mode 100644
index 00000000..07672f85
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanCreateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Service Type',
+            'message' => 'You have successfully created a new Service Type'
+        ];
+    }
+
+    /** @var CanCreateServiceType */
+    private $canCreateServiceType;
+
+    /** @var CreatesServiceType */
+    private $createsServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * CreateServiceTypeLogic constructor.
+     * @param CanCreateServiceType $canCreateServiceType
+     * @param CreatesServiceType $createsServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param FetchesSegment $fetchesSegment
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanCreateServiceType $canCreateServiceType, CreatesServiceType $createsServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, FetchesSegment $fetchesSegment, CreatesConstant $createsConstant)
+    {
+        $this->canCreateServiceType = $canCreateServiceType;
+        $this->createsServiceType = $createsServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @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
+    {
+
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canCreateServiceType->passes($object);
+
+        /** @var ServiceType $service */
+        $service = $this->createsServiceType->execute($object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), false, $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->createsConstant->execute($this->fetchesSegment->execute(['type' => SegmentConstants::STANDARD_SEGMENT]), $constantObject);
+
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
new file mode 100644
index 00000000..c45c49d9
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\DeletesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanDeleteServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteServiceTypeLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Service Type',
+            'message' => 'You have successfully deleted a Service Type'
+        ];
+    }
+
+
+    /** @var CanDeleteServiceType */
+    private $canDeleteServiceType;
+
+    /** @var DeletesServiceType */
+    private $deletesServiceType;
+
+    /** @var FetchesServiceType */
+        private $fetchesServiceType;
+
+    /**
+     * DeleteServiceTypeLogic constructor.
+     * @param CanDeleteServiceType $canDeleteServiceType
+     * @param DeletesServiceType $deletesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanDeleteServiceType $canDeleteServiceType, DeletesServiceType $deletesServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canDeleteServiceType = $canDeleteServiceType;
+        $this->deletesServiceType = $deletesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canDeleteServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->deletesServiceType->execute($query);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
new file mode 100644
index 00000000..f7835d34
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanFetchServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Type',
+            'message' => 'You have successfully retrieved a Service Type'
+        ];
+    }
+
+    /** @var CanFetchServiceType */
+    private $canFetchServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /**
+     * FetchServiceTypeLogic constructor.
+     * @param CanFetchServiceType $canFetchServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanFetchServiceType $canFetchServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canFetchServiceType = $canFetchServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new ServiceTypeResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
new file mode 100644
index 00000000..10b390ae
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\ListsServiceTypes;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanListServiceTypes;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListServiceTypesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Types',
+            'message' => 'You have successfully retrieved a list of Service Types'
+        ];
+    }
+
+    /** @var CanListServiceTypes */
+    private $canListServiceTypes;
+
+    /** @var ListsServiceTypes */
+    private $listsServiceTypes;
+
+    /**
+     * ListServiceTypesControllerLogic constructor.
+     * @param CanListServiceTypes $canListServiceTypes
+     * @param ListsServiceTypes $listsServiceTypes
+     */
+    public function __construct(CanListServiceTypes $canListServiceTypes, ListsServiceTypes $listsServiceTypes)
+    {
+        $this->canListServiceTypes = $canListServiceTypes;
+        $this->listsServiceTypes = $listsServiceTypes;
+    }
+
+
+    /**
+     * @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
+    {
+        $this->canListServiceTypes->passes();
+
+        $query = $this->listsServiceTypes->execute($this->listsServiceTypes->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(ServiceTypeResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
new file mode 100644
index 00000000..e08ef598
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CustomServiceTypeResource;
+use App\Models\Segment;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Segment Service',
+            'message' => 'You have successfully update a segments service configuration'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+    /**
+     * UpdateCustomServiceConstantLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, UpdatesConstant $updatesConstant, CreatesConstant $createsConstant)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->input('id')]);
+
+        $customFields = $request->input('custom_fields');
+
+        $object = new ServiceDetailObject($service->id, $customFields['bank_id'], $customFields['service_charge'],
+            $customFields['minimum_charge'], $customFields['tax'], $customFields['po_limit'], $request->input('configurations.currencies'),
+            $request->input('configurations.active'), true);
+
+        $constantObject = new ConstantObject('Custom Service Type', SegmentConstants::CUSTOM_SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object, true));
+
+        /** @var Segment $segment */
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'custom_service_type' => $object->getId()]);
+
+            $this->updatesConstant->execute($constant, $constantObject);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constant = $this->createsConstant->execute($segment, $constantObject);
+        }
+
+
+        return $this->resourceResponse(new CustomServiceTypeResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
new file mode 100644
index 00000000..51b88051
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanUpdateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Service Type',
+            'message' => 'You have successfully updated the Service Type'
+        ];
+    }
+
+    /** @var CanUpdateServiceType */
+    private $canUpdateServiceType;
+
+    /** @var UpdatesServiceType */
+    private $updatesServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+
+    /**
+     * UpdateServiceTypeLogic constructor.
+     * @param CanUpdateServiceType $canUpdateServiceType
+     * @param UpdatesServiceType $updatesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(CanUpdateServiceType $canUpdateServiceType, UpdatesServiceType $updatesServiceType, FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, UpdatesConstant $updatesConstant, FetchesConstant $fetchesConstant)
+    {
+        $this->canUpdateServiceType = $canUpdateServiceType;
+        $this->updatesServiceType = $updatesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+    /**
+     * @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
+    {
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canUpdateServiceType->passes($object);
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        /** @var ServiceType $service */
+        $service = $this->updatesServiceType->execute($service, $object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), $request->input('configurations.active'), $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->updatesConstant->execute($this->fetchesConstant->execute(['service_type' => $service->id]), $constantObject);
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
new file mode 100644
index 00000000..f1d75665
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceTypeStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Service Type',
+            'message' => 'You have successfully updated a Service Type status'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var UpdatesServiceTypeStatus */
+    private $updatesServiceTypeStatus;
+
+    /**
+     * UpdateServiceTypeStatusLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param UpdatesServiceTypeStatus $updatesServiceTypeStatus
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, UpdatesServiceTypeStatus $updatesServiceTypeStatus)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->updatesServiceTypeStatus = $updatesServiceTypeStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->updatesServiceTypeStatus->execute($query, $request->route('status') === 'active' ? ApprovalStatus::APPROVED : ApprovalStatus::SUSPENDED);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
new file mode 100644
index 00000000..b14caa8c
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceCurrenciesConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\SegmentConstant;
+use Illuminate\Support\Collection;
+
+class CustomConfigurationsObject implements DataTransferObject
+{
+
+
+    /** @var SegmentConstant  */
+    private $configurations;
+
+    /** @var SegmentConstant */
+    private $customOptions;
+
+    /**
+     * CustomConfigurationsObject constructor.
+     * @param SegmentConstant $configurations
+     * @param SegmentConstant $customOptions
+     */
+    public function __construct(SegmentConstant $configurations, SegmentConstant $customOptions)
+    {
+        $this->configurations = $configurations;
+        $this->customOptions = $customOptions;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getConfigurations(): SegmentConstant
+    {
+        return $this->configurations;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getCustomOptions(): SegmentConstant
+    {
+        return $this->customOptions;
+    }
+
+
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function getConfigurationValue(string $name) {
+        return property_exists($this->getCustomOptions()->detail, $name) ?
+            $this->getCustomOptions()->detail->$name: $this->configurations->detail->$name;
+    }
+
+
+    /**
+     * @return mixed
+     */
+    public function calculateServiceCharge(){
+        return ($this->getConfigurationValue('service_charge')->value * 0.01) > $this->getConfigurationValue('minimum_charge')->value ?
+            $this->getConfigurationValue('service_charge')->value : $this->getConfigurationValue('minimum_charge')->value;
+    }
+
+    /**
+     * @return float
+     */
+    public function calculateTax(){
+        return $this->getConfigurationValue('tax')->value * 0.01;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
new file mode 100644
index 00000000..fa32e5dd
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+class ServiceCurrenciesObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var array */
+    private $maxLimit;
+
+    /** @var array */
+    private $minLimit;
+
+    /** @var array */
+    private $rates;
+
+    /**
+     * ServiceCurrenciesObject constructor.
+     * @param int $id
+     * @param bool $isActive
+     * @param array $maxLimit
+     * @param array $minLimit
+     * @param array $rates
+     */
+    public function __construct(int $id, bool $isActive, array $maxLimit, array $minLimit, array $rates)
+    {
+        $this->id = $id;
+        $this->isActive = $isActive;
+        $this->maxLimit = $maxLimit;
+        $this->minLimit = $minLimit;
+        $this->rates = $rates;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMaxLimit(): array
+    {
+        return $this->maxLimit;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMinLimit(): array
+    {
+        return $this->minLimit;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getRates(): array
+    {
+        return array_map(function($rate){
+            return new RateObject($rate['selling'], $rate['payment_method']);
+        }, $this->rates);
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
new file mode 100644
index 00000000..233d1fb3
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceDetailObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var int|null */
+    private $bankId;
+
+    /** @var array|null */
+    private $serviceCharge;
+
+    /** @var array|null */
+    private $minimumCharge;
+
+    /** @var array|null */
+    private $tax;
+
+    /** @var array|null */
+    private $poLimit;
+
+    /** @var array|null */
+    private $currencies;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var boolean */
+    private $isBillable;
+
+    /**
+     * ServiceDetailObject constructor.
+     * @param int $id
+     * @param int|null $bankId
+     * @param array|null $serviceCharge
+     * @param array|null $minimumCharge
+     * @param array|null $tax
+     * @param array|null $poLimit
+     * @param array|null $currencies
+     * @param bool $isActive
+     * @param bool $isBillable
+     */
+    public function __construct(int $id, ?int $bankId, ?array $serviceCharge, ?array $minimumCharge, ?array $tax, ?array $poLimit, ?array $currencies, bool $isActive, bool $isBillable)
+    {
+        $this->id = $id;
+        $this->bankId = $bankId;
+        $this->serviceCharge = $serviceCharge;
+        $this->minimumCharge = $minimumCharge;
+        $this->tax = $tax;
+        $this->poLimit = $poLimit;
+        $this->currencies = $currencies;
+        $this->isActive = $isActive;
+        $this->isBillable = $isBillable;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getBankId(): ?int
+    {
+        return $this->bankId;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getServiceCharge(): ?array
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getMinimumCharge(): ?array
+    {
+        return $this->minimumCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getTax(): ?array
+    {
+        return $this->tax;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getPoLimit(): ?array
+    {
+        return $this->poLimit;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isBillable(): bool
+    {
+        return $this->isBillable;
+    }
+
+
+    /**
+     * @return array|null
+     */
+    public function getCurrencies(): ?array
+    {
+        return array_map(function($currency){
+            return new ServiceCurrenciesObject($currency['id'], $currency['active'], $currency['maximum_limit'], $currency['minimum_limit'], $currency['rates']);
+        }, $this->currencies);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
new file mode 100644
index 00000000..f65b7262
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceTypeObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $name;
+
+    /**
+     * ServiceTypeObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
new file mode 100644
index 00000000..e9c05e94
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class CreatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceTypeObject $object) {
+        $model = new ServiceType();
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
new file mode 100644
index 00000000..aacf66f1
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Helper;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Illuminate\Support\Str;
+
+class CreatesServiceTypeConstantDetails
+{
+
+    /** @var array */
+    private $ConstantDetails;
+
+
+    /**
+     * @param ServiceDetailObject $object
+     * @param bool|null $isCustomSegment
+     * @return array
+     */
+    public function execute(ServiceDetailObject $object, ?bool $isCustomSegment = false) {
+
+        foreach (Helper::getClassMethodsArray(ServiceDetailObject::class) as $methodName){
+
+            if(Helper::getPropertyName($methodName) === 'currencies'){
+
+                $this->mapCurrencies($object->$methodName(), $isCustomSegment);
+
+                continue;
+            }
+
+            $this->addToConstantDetails($methodName, $this->cleanValue($object->$methodName()));
+
+        }
+
+        return $this->ConstantDetails;
+
+    }
+
+    /**
+     * @param array $currencies
+     * @param bool $isCustomSegment
+     */
+    private function mapCurrencies(array $currencies, bool $isCustomSegment){
+
+        $isEmpty = true;
+        foreach ($currencies as $currency){
+
+            if(!$currency->isActive()) { continue; }
+
+            $currencyObject = [];
+
+
+            foreach (Helper::getClassMethodsArray(ServiceCurrenciesObject::class) as $methodName){
+
+                if($methodName === 'isActive') continue;
+                if($methodName === 'getRates') {
+                    $currencyObject['rates'] = $this->mapRates($currency->$methodName(), $isCustomSegment);
+                    continue;
+                }
+
+                $value = $this->cleanValue($currency->$methodName());
+
+                if($this->isAddable($value)) {
+                    $isEmpty = false;
+                    $currencyObject[Helper::getPropertyName($methodName)] = $value;
+                }
+
+            }
+
+            $this->addToCurrencyDetails($currencyObject);
+
+        }
+
+        if($isEmpty) $this->ConstantDetails['currencies'] = [];
+
+    }
+
+    private function mapRates(array $rates, bool $isCustomSegment){
+
+        if(!$isCustomSegment) return [];
+
+        $ratesObject = [];
+
+        /** @var RateObject $rate */
+        foreach ($rates as $rate){
+
+            $selling = $this->cleanValue($rate->getSelling());
+
+            if(!$selling['value']) continue;
+
+            $ratesObject[] = [
+                'payment_type' => $rate->getPaymentMethodType(),
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->getPaymentMethodType()],
+                'selling' => $rate->getSelling()
+            ];
+
+        }
+        return $ratesObject;
+
+    }
+
+
+    /**
+     * @param string $methodName
+     * @param $value
+     */
+    private function addToConstantDetails(string $methodName, $value){
+        $this->isAddable($value) ? $this->ConstantDetails[Helper::getPropertyName($methodName)] = $value : null;
+    }
+
+    /**
+     * @param $value
+     * @return bool
+     */
+    private function isAddable($value){
+
+        return $value !== '' && $value !== null;
+    }
+
+    private function cleanValue($value){
+
+        if(is_array($value)) {
+            if(array_key_exists('value', $value)) $value['value'] = floatval(str_replace(',', '', $value['value']));
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param array $value
+     */
+    private function addToCurrencyDetails(array $value){
+        $this->ConstantDetails['currencies'][] = $value;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
new file mode 100644
index 00000000..3cc4d69d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class DeletesServiceType extends AbstractDeleteRecord
+{
+
+    public function execute(ServiceType $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php
new file mode 100644
index 00000000..28843e4d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\Modules\Banks\Services\FetchesBank;
+use App\Models\SegmentConstant;
+
+class FetchesServiceBankConfigurations
+{
+
+    /** @var FetchesBank */
+    private $fetchesBank;
+
+    /**
+     * FetchesServiceBankConfigurations constructor.
+     * @param FetchesBank $fetchesBank
+     */
+    public function __construct(FetchesBank $fetchesBank)
+    {
+        $this->fetchesBank = $fetchesBank;
+    }
+
+    public function execute(SegmentConstant $constants)
+    {
+        return $this->fetchesBank->execute(['id' => $constants->detail->bank_id]);
+    }
+}
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
new file mode 100644
index 00000000..d641d641
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Models\SegmentConstant;
+
+class FetchesServiceConfigurations
+{
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var FetchesServiceCurrenciesConfigurations */
+    private $fetchesServiceCurrenciesConfigurations;
+
+    /** @var FetchesServiceBankConfigurations */
+    private $fetchesServiceBankConfigurations;
+
+    /**
+     * FetchesServiceConfigurations constructor.
+     * @param FetchesConstant $fetchesConstant
+     * @param FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations
+     */
+    public function __construct(FetchesConstant $fetchesConstant, FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations, FetchesServiceBankConfigurations $fetchesServiceBankConfigurations)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+        $this->fetchesServiceCurrenciesConfigurations = $fetchesServiceCurrenciesConfigurations;
+        $this->fetchesServiceBankConfigurations = $fetchesServiceBankConfigurations;
+    }
+
+
+    public function execute(SegmentConstant $constant, string $type){
+
+        return array_merge([
+            'active' => (int) $constant->detail->is_active ?? false,
+            'billable' => (int) $constant->detail->is_billable ?? false,
+            'bank_id' => property_exists($constant->detail, 'bank_id') ? $constant->detail->bank_id : '',
+            'bank_info' => property_exists($constant->detail, 'bank_id') ? $this->fetchesServiceBankConfigurations->execute($constant) : '',
+            'currencies' => $this->fetchesServiceCurrenciesConfigurations->execute($constant)
+        ], $this->addConfigurations($constant)->toArray());
+
+    }
+
+    private function addConfigurations(SegmentConstant $constant) {
+
+        $configurations = collect(['service_charge', 'minimum_charge', 'tax', 'po_limit']);
+
+        return $configurations->flatMap(function($configuration) use($constant) {
+            if(!property_exists($constant->detail, $configuration)) return [];
+
+            return [$configuration => [
+                'type' => $constant->detail->$configuration->type,
+                'value' =>  $configuration !== 'po_limit' ? $this->covertToDecimal($constant->detail->$configuration->value) : $constant->detail->$configuration->value
+            ]];
+
+        });
+
+    }
+
+    private function covertToDecimal($value){
+        return number_format((float)$value, 2, '.', '');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
new file mode 100644
index 00000000..7d00225a
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CurrencyResource;
+use App\Models\SegmentConstant;
+use Illuminate\Database\Eloquent\Collection;
+
+class FetchesServiceCurrenciesConfigurations
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchesServiceCurrenciesConfigurations constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    public function execute(SegmentConstant $constants){
+
+        $currencies = array_map(function($configuration) use($constants){
+
+            $currency = $this->fetchesCurrency->execute(['id' => $configuration->id]);
+
+            if(! $currency->exists()) return [];
+
+            return json_decode(json_encode([
+                'currency_object' => new CurrencyResource($currency),
+                'id' => $configuration->id,
+                'active' => true,
+                'maximum_limit' => [
+                    'type' => $configuration->max_limit->type,
+                    'value' => number_format((float)$configuration->max_limit->value, 2, '.', ',')
+                ],
+                'minimum_limit' => [
+                    'type' => $configuration->min_limit->type,
+                    'value' => number_format((float)$configuration->min_limit->value, 2, '.', ',')
+                ],
+                'rates' => $constants->reference === SegmentConstants::SERVICE_TYPE ? $this->standardRates($currency->rates->where('service_id', $constants->detail->id)) : $configuration->rates
+            ]));
+
+        }, $constants->detail->currencies);
+
+        return array_filter($currencies);
+
+    }
+
+    private function standardRates(Collection $rates){
+        return $rates->map(function($rate){
+            return [
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->payment_method_type],
+                'selling' => [
+                    'type' => 'rate',
+                    'value' => $rate->selling
+                ]
+            ];
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
new file mode 100644
index 00000000..7b5899fa
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class FetchesServiceType extends AbstractFetchRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * FetchesServiceType constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
new file mode 100644
index 00000000..344d6c4d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class ListsServiceTypes extends AbstractListRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * ListsServiceTypes constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
new file mode 100644
index 00000000..019d30b4
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRateLog;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Models\CurrencyRate;
+use App\Models\ServiceType;
+
+class UpdatesServiceCurrencyRates
+{
+
+    /** @var CreatesRateLog */
+    private $createsRateLog;
+
+    /**
+     * UpdatesServiceCurrencyRates constructor.
+     * @param CreatesRateLog $createsRateLog
+     */
+    public function __construct(CreatesRateLog $createsRateLog)
+    {
+        $this->createsRateLog = $createsRateLog;
+    }
+
+
+    /**
+     * @param ServiceType $service
+     * @param array $currencies
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ServiceType $service, array $currencies){
+
+        /** @var ServiceCurrenciesObject $currency */
+        foreach ($currencies as $currency) {
+
+            /** @var RateObject $rate */
+            foreach ($currency->getRates() as $rate){
+                if($rate->getSelling()['value'] > 0){
+                    /** @var CurrencyRate $query */
+                    $query = $service->rates()->updateOrCreate([
+                        'currency_id' => $currency->getId(),
+                        'payment_method_type' => $rate->getPaymentMethodType()
+                    ], ['selling' => $rate->getSelling()['value']]);
+
+                    $this->createsRateLog->execute($query);
+                }
+
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
new file mode 100644
index 00000000..06bd1e4f
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, ServiceTypeObject $object) {
+
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
new file mode 100644
index 00000000..065b218e
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceTypeStatus extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
new file mode 100644
index 00000000..0fb57c32
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanCreateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanCreateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
new file mode 100644
index 00000000..1a832257
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanDeleteServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
new file mode 100644
index 00000000..e76497c8
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanFetchServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
new file mode 100644
index 00000000..44dc0e8b
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanListServiceTypes extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
new file mode 100644
index 00000000..0e066109
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanUpdateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanUpdateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
new file mode 100644
index 00000000..86946a39
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class ServiceTypeValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'name' => $object->getName()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php
new file mode 100644
index 00000000..b6edcc5f
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php
@@ -0,0 +1,192 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+// use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+// use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+// use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+// use App\Classes\Modules\Documents\Services\CreatesDocument;
+// use App\Classes\Modules\Documents\Services\CreatesFiles;
+// use App\Classes\ValueObjects\Constants\DocumentType;
+// use App\Models\Document;
+// use App\Models\Transaction;
+// use Barryvdh\DomPDF\PDF;
+// use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+// use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf;
+// use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Supplier Transactions',
+            'message' => 'You have successfully created currency supplier transactions'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    // /** @var FetchesTransaction */
+    // private $fetchesTransaction;
+    // /** @var UpdatesTransactionStatus */
+    // private $updatesTransactionStatus;
+    // /** @var CreatesDocument */
+    // private $createsDocument;
+    // /** @var CreatesFiles */
+    // private $createsFile;
+    // /** @var PDF */
+    // private $pdf;
+
+    /**
+     * CreateSupplierTransactionLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param PDF $pdf
+     */
+    public function __construct(
+        FetchesPackingList $fetchesPackingList, 
+        FetchesSegmentConstant $fetchesSegmentConstant, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesTransaction $createsTransaction
+
+        // UpdatesTransactionStatus $updatesTransactionStatus, 
+        // CreatesDocument $createsDocument, 
+        // CreatesFiles $createsFile, 
+        // PDF $pdf
+    )
+    {
+
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+
+        // $this->updatesTransactionStatus = $updatesTransactionStatus;
+        // $this->createsDocument = $createsDocument;
+        // $this->createsFile = $createsFile;
+        // $this->pdf = $pdf;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
+
+        $cbm = $packing_list->packages->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $order =  $packing_list->owner()->first();
+        $address = $order->addresses()->first();
+
+        $base_price_constant = $this->fetchesSegmentConstant->execute(['id' => 1]);
+        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['id' => 2]);
+        $state_rate_constant = $this->fetchesSegmentConstant->execute(['id' => 3]);
+        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['id' => 4]);
+        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['id' => 5]);
+
+        $base_price = 0;
+        $warehouse_rate = 0;
+        $state_rate = 0;
+        $state_select = [];
+        $with_out = false;
+
+        if ($base_price_constant) {
+            $base_price = $base_price_constant->value->price;
+        }
+
+        if ($warehouse_rate_constant) {
+            $package_warehouse = $order->OrderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->reference;
+            foreach ($warehouse_rate_constant->value->config as $key_warehouse => $row_warehouse) {
+                if ($row_warehouse->warehouse_name == $package_warehouse) {
+                    $warehouse_rate = $row_warehouse->rate;
+                }
+            }
+        }
+
+        if ($state_rate_constant) {
+            foreach ($state_rate_constant->value->config as $key_state => $row_state) {
+                if ($row_state->status_id == $address->state_id) {
+                    $state_select = $row_state;
+                }
+            }
+        }
+
+        if ($outstation_postcode_constant) {
+            foreach ($outstation_postcode_constant->value as $key_out => $row_out) {
+
+                if($row_out == $address->postcode) {
+                    $with_out = true;
+                }
+            }
+        }
+
+        if (!empty($state_select)) {
+            $state_rate = $state_select->rate;
+            if ($with_out) {
+                $state_rate = $state_select->rate + $state_select->outstation_rate;
+            }
+        }
+
+        $price_cbm = $base_price + $warehouse_rate + $state_rate;
+        $total_cbm = $price_cbm * $cbm;
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
+
+        $object = new TransactionObject(
+            $billNumber, 
+            TransactionType::SHIPPING_INVOICE, 
+            1, 
+            $order->company_module_id,
+            1, 
+            PaymentMethodType::CASH,
+            $total_cbm,
+            $total_cbm,
+            1,
+            1, 
+            0, 
+            0, 
+            0,
+            null, 
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+
+        $transactions = $this->createsTransaction->execute($packing_list, $object);
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
index 8fcf4ece..b4153751 100644
--- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
@@ -76,7 +76,24 @@ class TransactionObject implements DataTransferObject
      * @param int|null $status
      * @param array|null $details
      */
-    public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = [])
+    public function __construct(
+        string $billNo, 
+        string $transactionType, 
+        int $issuer, 
+        int $receiver, 
+        int $recipientBankAccountId, 
+        int $paymentMethod, 
+        float $amount, 
+        float $originalAmount, 
+        int $currencyId,
+        int $originalCurrencyId, 
+        float $currencyRate,
+        float $tax, 
+        float $serviceCharge, 
+        ?Carbon $expiresOn, 
+        ?int $status = ApprovalStatus::PENDING_SUBMISSION, 
+        ?array $details = []
+    )
     {
         $this->billNo = $billNo;
         $this->transactionType = $transactionType;
diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
index ddebf0d5..18d57727 100644
--- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
+++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Models\Booking;
+use App\Models\PackingList;
 use App\Models\Transaction;
 
 class CreatesTransaction extends AbstractUpdateRelationshipRecord
@@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Booking $booking, TransactionObject $object) {
+    public function execute(PackingList $packing_list, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();
@@ -33,8 +33,6 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
         $model->expires_on = $object->getExpiresOn();
         $model->status = $object->getStatus();
 
-
-        return $this->handler($booking->transactions(), $model);
-
+        return $this->handler($packing_list->transactions(), $model);
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transports/Services/UpdatesTransportStatus.php b/app/Classes/Modules/Transports/Services/UpdatesTransportStatus.php
new file mode 100644
index 00000000..2898156a
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/UpdatesTransportStatus.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Transport;
+
+class updatesTransportStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Transport $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transport $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/ValueObjects/Constants/SegmentConstants.php b/app/Classes/ValueObjects/Constants/SegmentConstants.php
index 80e9cb71..88be0247 100644
--- a/app/Classes/ValueObjects/Constants/SegmentConstants.php
+++ b/app/Classes/ValueObjects/Constants/SegmentConstants.php
@@ -5,19 +5,19 @@ namespace App\Classes\ValueObjects\Constants;
 
 class SegmentConstants
 {
-
     public const STANDARD_SEGMENT = 1;
 
     public const CUSTOM_SEGMENT = 2;
 
-    public const SYSTEM_PRIMARY_CURRENCY = 'SYSTEM_PRIMARY_CURRENCY';
+    public const BASE_PRICE = 'BASE_PRICE';
 
-    public const SUPPLIER_CURRENCIES = 'SUPPLIER_CURRENCIES';
+    public const WAREHOUSE_RATE = 'WAREHOUSE_RATE';
 
-    public const PAYMENT_ATTEMPT_DURATION_LIMIT = 'PAYMENT_ATTEMPT_DURATION_LIMIT';
+    public const STATE_RATE = 'STATE_RATE';
 
-    public const SERVICE_TYPE = 'SERVICE_TYPE';
+    public const CENTER_POSTCODE = 'CENTER_POSTCODE';
 
-    public const CUSTOM_SERVICE_TYPE = 'CUSTOM_SERVICE_TYPE';
+    public const OUTSTATION_POSTCODE = 'OUTSTATION_POSTCODE';
 
+    public const CUSTOMER_RATE = 'CUSTOMER_RATE';
 }
\ No newline at end of file
diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index 8a5f1075..d61589fa 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -4,24 +4,26 @@ namespace App\Classes\ValueObjects\Constants;
 
 final class TransactionType {
 
-    public const PAYMENT_ATTEMPT = 0;
+    public const SHIPPING_INVOICE = 1;
+    
+    // public const PAYMENT_ATTEMPT = 0;
 
-    public const PAYMENT = 1;
+    // public const PAYMENT = 1;
 
-    public const INVOICE = 2;
+    // public const INVOICE = 2;
 
-    public const BILL = 3;
+    // public const BILL = 3;
 
-    public const PERFORMA = 4;
+    // public const PERFORMA = 4;
 
-    public const TOP_UP = 5;
+    // public const TOP_UP = 5;
 
-    public const REFUND = 6;
+    // public const REFUND = 6;
 
-    public const PURCHASE_ORDER = 7;
+    // public const PURCHASE_ORDER = 7;
 
-    public const SUPPLIER_DELIVER = 8;
+    // public const SUPPLIER_DELIVER = 8;
 
-    public const SHIPPING_COST = 9;
+    // public const SHIPPING_COST = 9;
 
 }
diff --git a/app/Http/Controllers/Addresses/ListStatesController.php b/app/Http/Controllers/Addresses/ListStatesController.php
new file mode 100644
index 00000000..dee2d1c6
--- /dev/null
+++ b/app/Http/Controllers/Addresses/ListStatesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Addresses;
+
+use App\Classes\Modules\Addresses\ControllersLogic\ListStatesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListStatesController
+{
+    /**
+     * @param Request $request
+     * @param ListStatesLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListStatesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Announcements/ListAnnouncementsController.php b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
index a69dff50..2dcee4d7 100644
--- a/app/Http/Controllers/Announcements/ListAnnouncementsController.php
+++ b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
@@ -17,4 +17,4 @@ class ListAnnouncementsController
     {
         return $logic->execute($request);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Announcements/UpdateAnnouncementController.php b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
index 72431980..8d406632 100644
--- a/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
+++ b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
@@ -18,4 +18,3 @@ class UpdateAnnouncementController
         return $logic->execute($request);
     }
 }
-
diff --git a/app/Http/Controllers/Companies/AddNewMemberController.php b/app/Http/Controllers/Companies/AddNewMemberController.php
new file mode 100644
index 00000000..6307ac37
--- /dev/null
+++ b/app/Http/Controllers/Companies/AddNewMemberController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Accounts\ControllersLogic\AddNewMemberLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AddNewMemberController
+{
+    /**
+     * @param Request $request
+     * @param AddNewMemberLogic $execute
+     * @return JsonResponse
+     */
+    public function create(Request $request, AddNewMemberLogic $execute) : JsonResponse
+    {
+        return $execute->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Documents/UpdateDocumentReferenceController.php b/app/Http/Controllers/Documents/UpdateDocumentReferenceController.php
new file mode 100644
index 00000000..f14d1b8b
--- /dev/null
+++ b/app/Http/Controllers/Documents/UpdateDocumentReferenceController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+use App\Classes\Modules\Documents\ControllersLogic\UpdateDocumentReferenceLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateDocumentReferenceController
+{
+    /**
+     * @param Request $request
+     * @param UpdateDocumentReferenceLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateDocumentReferenceLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Exports/ExportContainerPackingListController.php b/app/Http/Controllers/Exports/ExportContainerPackingListController.php
new file mode 100644
index 00000000..6e5d845d
--- /dev/null
+++ b/app/Http/Controllers/Exports/ExportContainerPackingListController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsContainerPackingList;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportContainerPackingListController
+{
+    public function export(ExportsContainerPackingList $exportsContainerPackingList, Request $request) {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+        $exportsContainerPackingList->setId($request->route('id'));
+        return $exportsContainerPackingList->download('customer-container-packing-list.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
+    }
+}
diff --git a/app/Http/Controllers/PackingLists/AssignPackingListOrderController.php b/app/Http/Controllers/PackingLists/AssignPackingListOrderController.php
new file mode 100644
index 00000000..7498d863
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/AssignPackingListOrderController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\AssignPackingListOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListOrderController
+{
+    /**
+     * @param Request $request
+     * @param AssignPackingListOrderLogic $logic
+     * @return JsonResponse
+     */
+    public function assign(Request $request, AssignPackingListOrderLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Segments/CreateSegmentController.php b/app/Http/Controllers/Segments/CreateSegmentController.php
index 4e748536..2950bdc3 100644
--- a/app/Http/Controllers/Segments/CreateSegmentController.php
+++ b/app/Http/Controllers/Segments/CreateSegmentController.php
@@ -16,5 +16,4 @@ class CreateSegmentController
     public function create(Request $request, CreateSegmentLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
-
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchConstantController.php b/app/Http/Controllers/Segments/FetchConstantController.php
new file mode 100644
index 00000000..e3658802
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantController
+{
+    /**
+     * @param Request $request
+     * @param FetchConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchSegmentController.php b/app/Http/Controllers/Segments/FetchSegmentController.php
new file mode 100644
index 00000000..91961689
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentController
+{
+    /**
+     * @param Request $request
+     * @param FetchSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/ListSegmentsController.php b/app/Http/Controllers/Segments/ListSegmentsController.php
new file mode 100644
index 00000000..3dc14ebd
--- /dev/null
+++ b/app/Http/Controllers/Segments/ListSegmentsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\ListSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentsController
+{
+    /**
+     * @param Request $request
+     * @param ListSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateConstantController.php b/app/Http/Controllers/Segments/UpdateConstantController.php
new file mode 100644
index 00000000..47def571
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
new file mode 100644
index 00000000..29bb6655
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\UpdateCustomServiceConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateCustomServiceConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCustomServiceConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateSegmentController.php b/app/Http/Controllers/Segments/UpdateSegmentController.php
new file mode 100644
index 00000000..51dfe25e
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateSegmentController
+{
+    /**
+     * @param Request $request
+     * @param UpdateSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Transactions/CreateShippingInvoiceTransactionController.php b/app/Http/Controllers/Transactions/CreateShippingInvoiceTransactionController.php
new file mode 100644
index 00000000..d9f35b7c
--- /dev/null
+++ b/app/Http/Controllers/Transactions/CreateShippingInvoiceTransactionController.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\CreateShippingInvoiceTransactionLogic;
+
+
+class CreateShippingInvoiceTransactionController
+{
+    /**
+     * @param Request $request
+     * @param CreateShippingInvoiceTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateShippingInvoiceTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/ConstantResource.php b/app/Http/Resources/ConstantResource.php
new file mode 100644
index 00000000..c6bcf344
--- /dev/null
+++ b/app/Http/Resources/ConstantResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Segments\Services\ConvertsConstantDetailsToResource;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ConstantResource extends JsonResource
+{
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'detail' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
+        ];
+    }
+}
diff --git a/app/Http/Resources/CustomServiceTypeResource.php b/app/Http/Resources/CustomServiceTypeResource.php
new file mode 100644
index 00000000..8ec26e47
--- /dev/null
+++ b/app/Http/Resources/CustomServiceTypeResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\ServiceType;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CustomServiceTypeResource extends JsonResource
+{
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->detail->id,
+            'name' => ServiceType::where('id', $this->detail->id)->first()->name,
+            'detail' => $this->detail,
+            'configurations' => (App()->make(FetchesServiceConfigurations::class))->execute($this->resource, SegmentConstants::CUSTOM_SERVICE_TYPE)
+        ];
+    }
+}
diff --git a/app/Http/Resources/DistrictResource.php b/app/Http/Resources/DistrictResource.php
index c0c24f73..0f5a01dc 100644
--- a/app/Http/Resources/DistrictResource.php
+++ b/app/Http/Resources/DistrictResource.php
@@ -18,7 +18,8 @@ class DistrictResource extends JsonResource
             'id' => $this->id,
             'city' => $this->name,
             'state' => $this->state,
-            'country' => $this->country
+            'country' => $this->country,
+            'postcode' => $this->postcode,
         ];
     }
 }
diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index 2cd76a1b..09880dc8 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Models\Order;
+use App\Models\PackingList;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class PackageResource extends JsonResource
@@ -16,6 +17,8 @@ class PackageResource extends JsonResource
     public function toArray($request)
     {
 
+        $originalPackingList = $this->packingList->owner instanceof PackingList ? $this->packingList->owner : $this->packingList;
+
         return [
             'id' => $this->id,
             'type' => $this->type,
@@ -27,9 +30,11 @@ class PackageResource extends JsonResource
             'quantity' => $this->quantity,
             'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
             'status' => $this->status,
-            'order' => New OrderResource($this->packingList->owner instanceof Order ? $this->packingList->owner : $this->packingList->owner->owner),
-            'container' => new ContainerResource($this->packingList->owner instanceof Order ? $this->container : $this->packingList->owner->containers()->first()),
-            'transport' => new TransportResource($this->packingList->owner instanceof Order ? $this->transport : $this->packingList->owner->transports()->first())
+            $this->mergeWhen($originalPackingList->owner instanceof Order, [
+                'order' => New OrderResource($originalPackingList->owner)
+            ]),
+            'container' => new ContainerResource($originalPackingList->containers()->first()),
+            'transport' => new TransportResource($originalPackingList->transports()->first())
         ];
     }
 }
diff --git a/app/Http/Resources/PackingListNullOrderResource.php b/app/Http/Resources/PackingListNullOrderResource.php
new file mode 100644
index 00000000..63af1466
--- /dev/null
+++ b/app/Http/Resources/PackingListNullOrderResource.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PackingListNullOrderResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $replica = $this->packingLists()->first();
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'type' => $this->type,
+        ];
+    }
+}
diff --git a/app/Http/Resources/ScheduleResource.php b/app/Http/Resources/ScheduleResource.php
index 64532420..d22386b4 100644
--- a/app/Http/Resources/ScheduleResource.php
+++ b/app/Http/Resources/ScheduleResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use Carbon\Carbon;
 
 class ScheduleResource extends JsonResource
 {
@@ -18,6 +19,10 @@ class ScheduleResource extends JsonResource
             'id' => $this->id,
             'etd' => $this->etd ? $this->etd->format('d-m-Y') : 'n/a',
             'eta' => $this->eta ? $this->eta->format('d-m-Y') : 'n/a',
+            'billing_days_left' => [
+                'value' => (Carbon::parse($this->eta)->subDays(7)->gt(Carbon::now())) ? '+' : '-' ,
+                'duration' => Carbon::parse($this->eta)->subDays(7)->diffInDays(Carbon::now()),
+            ],
             'status' => $this->status,
         ];
     }
diff --git a/app/Http/Resources/StateResource.php b/app/Http/Resources/StateResource.php
new file mode 100644
index 00000000..b9d71dae
--- /dev/null
+++ b/app/Http/Resources/StateResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class StateResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'country' => $this->country,
+        ];
+    }
+}
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 7ef5910a..a6fd95e5 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -5,6 +5,8 @@ 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;
@@ -16,7 +18,7 @@ use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
-class PackingList extends AbstractModel implements Transportable, Steppable, Packable
+class PackingList extends AbstractModel implements Transportable, Steppable, Packable, Transactionable
 {
     use HasTableAlias;
     use HasRelationships;
@@ -55,6 +57,14 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function transactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
     /**
      * @return HasManyDeep
      */
diff --git a/app/Models/SegmentConstant.php b/app/Models/SegmentConstant.php
index 08c8b2af..42cadb7d 100644
--- a/app/Models/SegmentConstant.php
+++ b/app/Models/SegmentConstant.php
@@ -15,12 +15,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  */
 class SegmentConstant extends AbstractModel
 {
-    use SoftDeletes;
-
     protected $table = 'segment_constants';
 
-    protected $dates = ['deleted_at'];
-
     public function getDetailAttribute($value)
     {
         return $value ? json_decode($value) : [];
@@ -34,14 +30,9 @@ class SegmentConstant extends AbstractModel
         return $this->BelongsTo(Segment::class, 'segment_id', 'id');
     }
 
-    /**
-     * @return mixed
-     */
-    public function service(){
-        return $this->hasOne(ServiceType::class, 'id', 'detail->id')
-            ->whereIn('reference', [SegmentConstants::SERVICE_TYPE, SegmentConstants::CUSTOM_SERVICE_TYPE]);
+    public function getValueAttribute($value)
+    {
+        $value = $value ? json_decode($value) : [];
+        return $value;
     }
-
-
-
 }
diff --git a/app/Models/State.php b/app/Models/State.php
index fa920454..3f7036ac 100644
--- a/app/Models/State.php
+++ b/app/Models/State.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -21,10 +21,10 @@ class State extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return HasOne
+     * @return BelongsTo
      */
-    public function country(): HasOne
+    public function country(): BelongsTo
     {
-        return $this->hasOne(Country::class, 'country_id', 'id');
+        return $this->belongsTo(Country::class, 'country_id', 'id');
     }
 }
diff --git a/database/seeders/SegmentConstantsTableSeeder.php b/database/seeders/SegmentConstantsTableSeeder.php
index 9eb5d50a..2fc68bf0 100644
--- a/database/seeders/SegmentConstantsTableSeeder.php
+++ b/database/seeders/SegmentConstantsTableSeeder.php
@@ -1,54 +1,162 @@
 <?php
-
 namespace Database\Seeders;
 
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class SegmentConstantsTableSeeder extends Seeder
 {
-
-    /** @var FetchesCurrency */
-    private $fetchesCurrency;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var CreatesConstant */
-    private $createsSegmentConstant;
-
-    /**
-     * SegmentConstantsTableSeeder constructor.
-     * @param FetchesCurrency $fetchesCurrency
-     * @param FetchesSegment $fetchesSegment
-     * @param CreatesConstant $createsSegmentConstant
-     */
-    public function __construct(FetchesCurrency $fetchesCurrency, FetchesSegment $fetchesSegment, CreatesConstant $createsSegmentConstant)
-    {
-        $this->fetchesCurrency = $fetchesCurrency;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->createsSegmentConstant = $createsSegmentConstant;
-    }
-
-
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
     public function run()
     {
+        DB::beginTransaction();
 
-        $object = new ConstantObject('System Primary Currency',
-            SegmentConstants::SYSTEM_PRIMARY_CURRENCY,
-            ['id' => $this->fetchesCurrency->execute(['name' => country('my')->getName()])->id]);
-
-        $this->createsSegmentConstant->execute($this->fetchesSegment->execute(['Standard Segment']), $object);
-
+        DB::table('segment_constants')->insert([
+            [
+                'id' => 1,
+                'segment_id' => 1,
+                'reference' => SegmentConstants::BASE_PRICE,
+                'value' => json_encode([
+                    'id'=> 1,
+                    'price' => 500,
+                ]),
+            ],
+            [
+                'id' => 2,
+                'segment_id' => 1,
+                'reference' => SegmentConstants::WAREHOUSE_RATE,
+                'value' => json_encode([
+                    'id'=> 1,
+                    'config' => [
+                        [
+                            'warehouse_name' => WarehouseReferences::VT_GUANG_ZHOU,
+                            'rate' => 10
+                        ],
+                        [
+                            'warehouse_name' => WarehouseReferences::YD_GUANG_ZHOU,
+                            'rate' => 10
+                        ],
+                        [
+                            'warehouse_name' => WarehouseReferences::VT_YIWU,
+                            'rate' => 10
+                        ],
+                    ]
+                ]),
+            ],
+            [
+                'id' => 3,
+                'segment_id' => 1,
+                'reference' => SegmentConstants::STATE_RATE,
+                'value' => json_encode([
+                    'id'=> 1,
+                    'config' => [
+                        [
+                            'status_id' => 1,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 2,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 3,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 4,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 5,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 6,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 7,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 8,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 9,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 10,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 11,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 12,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 13,
+                            'rate' => 20,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 14,
+                            'rate' => 20,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 15,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ],
+                        [
+                            'status_id' => 16,
+                            'rate' => 10,
+                            'outstation_rate' => 2
+                        ]
+                    ]
+                ]),
+            ],
+            [
+                'id' => 4,
+                'segment_id' => 1,
+                'reference' => SegmentConstants::CENTER_POSTCODE,
+                'value' => json_encode(['80050','80100','80150','80200','80250','80300','80350','80400','80500','80506','80508','80516','80519','80534','80536','80542','80546','80558','80560','80564','80568','80578','80584','80586','80590','80592','80594','80596','80600','80604','80608','80620','80622','80628','80644','80648','80662','80664','80668','80670','80672','80673','80676','80700','80710','80720','80730','80900','80902','80904','80906','80908','80988','80990','81000','81100','81200','81300','81310']),
+            ],
+            [
+                'id' => 5,
+                'segment_id' => 1,
+                'reference' => SegmentConstants::OUTSTATION_POSTCODE,
+                'value' => json_encode(['80000']),
+            ],
+            [
+                'id' => 6,
+                'segment_id' => 2,
+                'reference' => SegmentConstants::CUSTOMER_RATE,
+                'value' => json_encode([
+                    'id'=> 1,
+                    'price' => 15,
+                ]),
+            ],
+        ]);
+        DB::commit();
     }
 }
diff --git a/database/seeders/SegmentsTableSeeder.php b/database/seeders/SegmentsTableSeeder.php
index 4c9e19be..72545884 100644
--- a/database/seeders/SegmentsTableSeeder.php
+++ b/database/seeders/SegmentsTableSeeder.php
@@ -2,24 +2,26 @@
 
 namespace Database\Seeders;
 
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\Segments\Services\CreatesSegment;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 
 class SegmentsTableSeeder extends Seeder
 {
-
-
-    /**
-     */
     public function run()
     {
-
-        DB::table('segments')->insert([
-            'name' => 'Standard Segment',
-            'type' => SegmentConstants::STANDARD_SEGMENT
-        ]);
+        DB::table('segments')->insert(
+        	[
+	        	[
+		        	'id' => 1,
+		        	'company_module_id' => 1,
+		            'name' => 'Default Segment',
+	        	],
+	        	[
+		        	'id' => 2,
+		        	'company_module_id' => 2,
+		            'name' => 'Normal Member',
+	        	],
+	        ]
+    	);
     }
 }
diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss
index dbc80e6f..a22dc2fc 100644
--- a/resources/assets/sass/modules/_typography.scss
+++ b/resources/assets/sass/modules/_typography.scss
@@ -643,6 +643,10 @@ hr{
     cursor: pointer !important;
 }
 
+.not-allowed {
+    cursor: not-allowed !important;
+}
+
 /* Labels
 ------------------------------------
 */
diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
index c5c26590..29edf834 100644
--- a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
+++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
@@ -63,9 +63,21 @@
                                             <div class="fs-8 all-caps muted">Company Name</div>
                                         </div>
                                     </div>
-                                    <div class="row">
+                                    <div class="row" v-if="isEditCompanyName === false">
                                         <div class="col">
-                                            <div class="fs-11 text-primary">{{item.owner.name}}</div>
+                                            <div class="fs-11 text-primary">{{item.owner.name}} <i class="fa fa-edit pointer fa-fw m-l-5" v-if="$store.getters.isSuperAdmin" @click="isEditCompanyName = !isEditCompanyName"></i></div>
+                                        </div>
+                                    </div>
+                                    <div class="row" v-if="isEditCompanyName === true">
+                                        <div class="col">
+                                            <update-company-name-form-component :section="section" :data="item.owner" v-on:submit="isEditCompanyName=false"></update-company-name-form-component>
+                                        </div>
+                                        <div class="col-auto d-flex align-items-center">
+                                            <div class="row">
+                                                 <div class="col b-none btn btn-sm btn-danger" @click="isEditCompanyName = !isEditCompanyName">
+                                                    <i class="fa fa-times"></i>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -77,9 +89,21 @@
                                             <div class="fs-8 all-caps muted">{{ item.owner.type === 0 ? 'IC' : 'SSM Registration' }} Number</div>
                                         </div>
                                     </div>
-                                    <div class="row">
+                                    <div class="row" v-if="isEditIdentificationNumber === false">
                                         <div class="col">
-                                            <div class="fs-11 text-primary bold">{{item.reference}}</div>
+                                            <div class="fs-11 text-primary bold">{{item.reference}}  <i class="fa fa-edit pointer fa-fw m-l-5" v-if="$store.getters.isSuperAdmin" @click="isEditIdentificationNumber = !isEditIdentificationNumber"></i></div>
+                                        </div>
+                                    </div>
+                                    <div class="row" v-if="isEditIdentificationNumber === true">
+                                        <div class="col">
+                                            <update-identification-number-form-component :section="section" :data="{identification_number: item.reference}" :id="item.id" v-on:submit="isEditIdentificationNumber=false"></update-identification-number-form-component>
+                                        </div>
+                                            <div class="col-auto d-flex align-items-center">
+                                            <div class="row">
+                                                 <div class="col b-none btn btn-sm btn-danger" @click="isEditIdentificationNumber = !isEditIdentificationNumber">
+                                                    <i class="fa fa-times"></i>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -182,7 +206,9 @@
     export default {
         data() {
             return {
-                expanded: false
+                expanded: false,
+                isEditIdentificationNumber: false,
+                isEditCompanyName: false,
             }
         },
         methods: {
diff --git a/resources/assets/vue/components/companies/forms/UpdateCompanyNameFormComponent.vue b/resources/assets/vue/components/companies/forms/UpdateCompanyNameFormComponent.vue
new file mode 100644
index 00000000..fb79da89
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/UpdateCompanyNameFormComponent.vue
@@ -0,0 +1,40 @@
+<template>
+    <div class="row">
+        <div class="col p-r-0">
+            <validation-wrapper-component :validator="$v.parameters.name">
+                <input type="text" class="form-control fs-12" placeholder="Edit company name" v-model.trim="parameters.name">
+            </validation-wrapper-component>
+        </div>
+        <div class="col-auto bg-success d-flex justify-content-center align-items-center pointer text-white">
+            <i class="fa fa-check" @click="submitForm"></i>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    name: this.data.name,
+                    reference: this.data.reference,
+                    type: this.data.type,
+                },
+            };
+        },
+        validations: {
+            parameters: {
+                name: { required },
+            }
+        },
+        methods: {
+            submitForm() {
+                this.submit(this.route('api.company.update', this.data.id), 'put', '', false, false);
+                this.$emit('submit');
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/forms/UpdateIdentificationNumberFormComponent.vue b/resources/assets/vue/components/companies/forms/UpdateIdentificationNumberFormComponent.vue
new file mode 100644
index 00000000..7fe3a240
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/UpdateIdentificationNumberFormComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row">
+        <div class="col p-r-0">
+            <validation-wrapper-component :validator="$v.parameters.identification_number">
+                <input type="text" class="form-control fs-12" placeholder="Edit identification number" v-model.trim="parameters.identification_number">
+            </validation-wrapper-component>
+        </div>
+        <div class="col-auto bg-success d-flex justify-content-center align-items-center pointer text-white">
+            <i class="fa fa-check" @click="submitForm"></i>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true
+            }
+        },
+        data() {
+            return {
+                parameters: {
+                    identification_number: this.identification_number,
+                },
+            };
+        },
+        validations: {
+            parameters: {
+                identification_number: { required },
+            }
+        },
+        created() {
+            if (this.data) {
+                this.parameters.identification_number = this.data.identification_number
+            }
+        },
+        methods: {
+            submitForm() {
+                this.submit(this.route('api.document.reference.update', this.id), 'put', '', false, false);
+                this.$emit('submit')    
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index eecb8fa7..8230862a 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -22,10 +22,22 @@
                             <p class="no-margin fs-10 all-caps">ETD</p>
                             <p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
                         </div>
-                        <div class="col">
+                        <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">ETA</p>
                             <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
                         </div>
+                        <div class="col">
+                            <div class="row hide" v-if="item.transport">
+                                <div class="col">
+                                    <p class="no-margin fs-10 all-caps">Days Ago</p>
+                                    <p class="no-margin" :class="[{'text-success': item.transport.current_schedule.billing_days_left.value === '+'}, {'text-danger': item.transport.current_schedule.billing_days_left.value === '-'}]">
+                                        {{item.transport.current_schedule.billing_days_left.value}}
+                                        {{item.transport.current_schedule.billing_days_left.duration}}
+                                        days
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">Packages</p>
                             <p class="no-margin">{{ item.packages_count }}</p>
diff --git a/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue b/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue
new file mode 100644
index 00000000..ac674d56
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col no-margin">
+            <div class="row m-b-15">
+                <div class="col col-sm-12 col-md-4">
+                    <label>Container Reference:</label>
+                    <input type="text" class="form-control form-input" placeholder="ABC-12345" v-model="reference_like">
+                </div>
+            </div>
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col-auto p-r-5">
+                            <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="updateFilters()">
+                                <div class="row align-items-center">
+                                    <div class="col p-r-5">Search</div>
+                                    <div class="col-auto p-l-10">
+                                        <i class="fa fa-search fs-16"></i>
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
+                        <div class="col-auto p-l-5">
+                            <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-secondary b-rad-none bg-secondary" @click="resetFilter()">
+                                <div class="row align-items-center">
+                                    <div class="col p-r-5 text-white">Reset</div>
+                                    <div class="col-auto p-l-10">
+                                        <i class="fa fa-refresh fs-16 text-white"></i>
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
+                    </div>
+                     <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
+                        <div class="col">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-show="isSearch" :key="componentKey">
+                <div class="col bg-master-lightest p-1 p-sm-4">
+                    <list-component section="section" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, reference_like: reference_like, order_by: {column: 'loading_date', DESC: true}}">
+                        <template slot="list" slot-scope="{data}">
+                            <container-component :data="data"></container-component>
+                        </template>
+                    </list-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                section: 'searchContainerComponent',
+                componentKey: 3,
+                reference_like: '',
+                isSearch: false,
+            }
+        },
+        methods: {
+            updateFilters() {
+                this.isSearch = true,
+                this.componentKey += 1;
+                this.updateSectiontoggle();
+            },
+            resetFilter() {
+                this.isSearch = false;
+                this.reference_like = '';
+                this.updateSectiontoggle();
+            },
+            updateSectiontoggle() {
+                this.$store.dispatch('toggleSection', {name: 'searchContainerSection', status: this.isSearch});
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
+
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 92c3541a..d1b37139 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -1,18 +1,35 @@
 <template>
-    <div class="row">
-        <div class="col-2"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+    <div class="row parentContainer">
+        <div class="col-2">
+            <div v-if="item.order">
+                <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a>
+            </div>
+            <div v-if="!item.order" class="text-danger">Unclaimed Packing List</div>
+        </div>
         <div class="col-1 text-center">{{item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.quantity) + total, 0)}}</div>
         <div class="col-1">{{ cbm }}</div>
         <div class="col-1">{{ overweight }}</div>
         <div class="col-1">{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3)}}</div>
         <div class="col-1 bold text-center" :class="{'text-danger': item.status === 5, 'text-success': item.status !== 5}">{{item.transport ? 'Delivery' : item.status === 5 ? 'On Hold' : 'Release'}}</div>
-        <div class="col-3">{{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>{{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}</div>
+        <div class="col-3">
+            <div v-if="item.order">
+                {{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>
+                {{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}
+                <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
+                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">
+                    <declare-postcode-area-form-component :data="item.order.address.post_code"></declare-postcode-area-form-component>
+                </modal-component>
+            </div>
+        </div>
         <div class="col">
             <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
-            <div class="btn btn-xs btn-success pointer" v-if="item.status === 5" @click="updateStatus(item.status === 1 ? 1 : 2)"><i class="fa fa-check m-r-5"></i>Release</div>
-            <div class="btn btn-xs btn-danger pointer" v-if="item.status !== 5" @click="updateStatus(5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+            <div v-if="item.order">
+                <div class="btn btn-xs btn-success pointer" v-if="item.status === 5" @click="updateStatus(item.status === 1 ? 1 : 2)"><i class="fa fa-check m-r-5"></i>Release</div>
+                <div class="btn btn-xs btn-danger pointer" v-if="item.status !== 5" @click="updateStatus(5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+            </div>
+            <div v-if="!item.order" class="text-danger">Unclaimed</div>
         </div>
     </div>
 </template>
diff --git a/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue
new file mode 100644
index 00000000..506d6472
--- /dev/null
+++ b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col">
+                    <h2 class="text-center text-complete bold">{{data}}</h2>
+                    <p class="text-center" v-show="postcodeArea=== ''">This postcode is yet to be declare. Plase choose the area.</p>
+                </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': postcodeArea === 'city_center', 'b-grey': postcodeArea !== 'city_center' }"  @click="postcodeArea = 'city_center'">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="no-margin" :class="{ 'text-primary': postcodeArea === 'city_center', 'semi-bold': postcodeArea === 'city_center' }">City Center</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': postcodeArea === 'outskirt', 'b-grey': postcodeArea !== 'outskirt' }"  @click="postcodeArea = 'outskirt'">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="no-margin" :class="{ 'text-primary': postcodeArea === 'outskirt', 'semi-bold': postcodeArea === 'outskirt'}">Outskirt</h5>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: String,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        data() {
+            return {
+                postcodeArea: '', 
+            };
+        },
+        validations: {
+            orderNo: '', 
+
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
new file mode 100644
index 00000000..eef618d7
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row align-items-center p-t-5 p-b-5">
+                        <div class="col-auto p-r-0">
+                            <div class="padding-5 lh-25 btn-rounded bg-white" v-if="data.type === 0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M21.5,21.5v129h129v-129zM25.8,25.8h45.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h21.5c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h45.15v120.4h-45.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-21.5c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-45.15zM73.1,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM72.025,49.45c-1.15898,-0.0168 -2.24238,0.59629 -2.83027,1.5957c-0.58789,1.00781 -0.58789,2.25078 0,3.25859c0.58789,0.99941 1.67129,1.6125 2.83027,1.5957h27.95c1.15899,0.0168 2.24238,-0.59629 2.83027,-1.5957c0.58789,-1.00781 0.58789,-2.25078 0,-3.25859c-0.58789,-0.99941 -1.67129,-1.6125 -2.83027,-1.5957zM73.1,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                            <div class="icon-thumbnail padding-5 lh-25 btn-rounded bg-master-lightest m-r-0" v-if="data.type === 1">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M60.2252,36.52061c-0.12239,-0.00062 -0.24461,0.00922 -0.36533,0.02939h-25.45986c-0.98721,-0.00039 -1.84785,0.6715 -2.08701,1.6293c-5.73407,22.93414 -11.46597,45.86604 -17.2,68.8c-0.00627,0.03067 -0.01187,0.06147 -0.0168,0.09238c-0.00768,0.03064 -0.01468,0.06144 -0.021,0.09238c-0.00324,0.02514 -0.00604,0.05034 -0.0084,0.07559c-0.00628,0.05441 -0.01049,0.10904 -0.0126,0.16377c-0.00212,0.03216 -0.00352,0.06436 -0.0042,0.09658v27.95c0.00012,1.18736 0.96264,2.14988 2.15,2.15h17.2c0.0056,0.00002 0.0112,0.00002 0.0168,0c0.06595,-0.00117 0.1318,-0.00537 0.19736,-0.0126c0.06192,-0.00572 0.12357,-0.01413 0.18477,-0.0252c0.00981,-0.00133 0.01961,-0.00273 0.02939,-0.0042c0.0056,-0.00138 0.0112,-0.00278 0.0168,-0.0042c0.06372,-0.01392 0.12677,-0.03074 0.18897,-0.05039c0.06684,-0.01919 0.1327,-0.04161 0.19736,-0.06719c0.0014,-0.0014 0.0028,-0.0028 0.0042,-0.0042c0.0014,0 0.0028,0 0.0042,0c0.06454,-0.02906 0.12761,-0.0613 0.18897,-0.09658c0.05014,-0.02743 0.09917,-0.05685 0.14697,-0.08818c0.01267,-0.00687 0.02527,-0.01387 0.03779,-0.021c0.01839,-0.01232 0.03659,-0.02491 0.05459,-0.03779c0.04025,-0.02942 0.07947,-0.06024 0.11758,-0.09238c0.00422,-0.00418 0.00842,-0.00838 0.0126,-0.0126c0.04961,-0.0426 0.09725,-0.08744 0.14277,-0.13438c0.05032,-0.05215 0.09797,-0.10681 0.14277,-0.16377c0.03382,-0.04216 0.06604,-0.08559 0.09658,-0.13018c0.00996,-0.01388 0.01976,-0.02788 0.02939,-0.04199c0.01147,-0.01803 0.02267,-0.03623 0.03359,-0.05459c0.02537,-0.04394 0.04918,-0.08876 0.07139,-0.13438c0.00282,-0.00559 0.00562,-0.01119 0.0084,-0.0168c0.02935,-0.05894 0.05597,-0.11919 0.07979,-0.18057c0.02213,-0.05791 0.04174,-0.11676 0.05879,-0.17637c0.00285,-0.00838 0.00565,-0.01678 0.0084,-0.0252c0.00592,-0.02091 0.01152,-0.04191 0.0168,-0.06299c0.00762,-0.02924 0.01462,-0.05864 0.021,-0.08818l0.0126,-0.05879c0.00001,-0.0028 0.00001,-0.0056 0,-0.0084l2.6707,-13.25693h93.61738l2.6833,13.31572c-0.00001,0.0042 -0.00001,0.0084 0,0.0126c0.02839,0.13961 0.07059,0.27606 0.12598,0.40732c0.05578,0.13254 0.12471,0.25915 0.20576,0.37793c0.0406,0.0581 0.08404,0.11416 0.13018,0.16797c0,0.0014 0,0.0028 0,0.0042c0.09202,0.10932 0.19471,0.2092 0.30654,0.29814c0.0014,0 0.0028,0 0.0042,0c0.11106,0.08859 0.23062,0.16595 0.35693,0.23096c0.0014,0 0.0028,0 0.0042,0c0.0629,0.03256 0.12736,0.06199 0.19316,0.08818c0.0014,0 0.0028,0 0.0042,0c0.06466,0.02557 0.13053,0.048 0.19736,0.06719c0.0014,0 0.0028,0 0.0042,0c0.06772,0.02017 0.13639,0.03698 0.20576,0.05039c0.0014,0 0.0028,0 0.0042,0c0.06953,0.01184 0.1396,0.02025 0.20996,0.0252c0.0014,0 0.0028,0 0.0042,0c0.0028,0.00001 0.0056,0.00001 0.0084,0c0.04753,0.00298 0.09515,0.00438 0.14277,0.0042c0.0196,0.00027 0.03919,0.00027 0.05879,0h17.14121c1.18736,-0.00012 2.14988,-0.96264 2.15,-2.15v-27.95c0.00002,-0.0056 0.00002,-0.0112 0,-0.0168c-0.00117,-0.06595 -0.00537,-0.1318 -0.0126,-0.19736c-0.00479,-0.05624 -0.0118,-0.11228 -0.021,-0.16797c-0.00263,-0.01543 -0.00543,-0.03083 -0.0084,-0.04619c-0.00135,-0.00841 -0.00275,-0.01681 -0.0042,-0.0252c-0.00524,-0.02248 -0.01084,-0.04488 -0.0168,-0.06719c-5.73403,-22.93396 -11.46593,-45.86586 -17.2,-68.8c-0.23916,-0.9578 -1.09981,-1.62969 -2.08701,-1.6293h-25.43887c-0.14971,-0.02579 -0.30173,-0.03564 -0.45352,-0.02939c-0.0873,0.0045 -0.17424,0.01431 -0.26035,0.02939h-25.11553c-0.12072,-0.02018 -0.24294,-0.03001 -0.36533,-0.02939c-0.10416,0.00226 -0.20801,0.01208 -0.31074,0.02939h-25.11133c-0.1055,-0.01772 -0.21218,-0.02755 -0.31914,-0.02939zM36.07969,40.85h21.68057l-0.50811,4.03125l-0.5417,4.3c-0.04143,0.31452 -0.01274,0.6343 0.08399,0.93643l-0.06299,0.34434l1.31855,1.40674l0.74326,0.13437l1.72168,-0.86084l0.07559,-0.42412c0.21105,-0.2952 0.34395,-0.63901 0.38633,-0.99941l0.5417,-4.3l0.57529,-4.56875h21.75615v4.3v4.3c-0.01097,0.77537 0.39641,1.49657 1.06613,1.88746c0.66972,0.39088 1.49803,0.39088 2.16775,0c0.66972,-0.39088 1.07709,-1.11209 1.06613,-1.88746v-4.3v-4.3h21.75615l0.55849,4.41758c0.00381,0.05057 0.00942,0.10099 0.0168,0.15117l0.5417,4.3c0.02311,0.19927 0.074,0.39433 0.15117,0.57949l-0.02939,0.16377l0.37793,0.40732c0.05013,0.05882 0.1034,0.11489 0.15957,0.16797l0.77686,0.83145l0.74746,0.13437l1.72168,-0.86084l0.11338,-0.62988c0.22378,-0.40546 0.31068,-0.87233 0.24776,-1.33115l-0.5417,-4.3l-0.50811,-4.03125h21.68057c5.37556,21.5005 10.74946,42.9994 16.125,64.5h-29.68428l-0.57529,-4.56875c-0.12489,-1.12257 -1.09704,-1.95716 -2.22559,-1.91064c-0.60664,0.02496 -1.17444,0.30523 -1.56321,0.77158c-0.38877,0.46636 -0.56225,1.07534 -0.47761,1.67656l0.50811,4.03125h-29.87744v-4.3c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v4.3h-29.87744l0.50811,-4.03125c0.08573,-0.61255 -0.09647,-1.23235 -0.50006,-1.70106c-0.40359,-0.46871 -0.98946,-0.74092 -1.60795,-0.74709c-1.10305,-0.01106 -2.03555,0.8144 -2.1584,1.91064l-0.57529,4.56875h-29.68428c5.37554,-21.5006 10.74944,-42.9995 16.125,-64.5zM86,55.9l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM57.71826,56.23594l-1.72168,0.86504l-0.34014,1.89385l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM114.28174,56.23594l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM86,64.5l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM56.64746,64.76875l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM115.35254,64.76875l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM86,73.1l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM55.57246,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM116.42754,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,81.7l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM54.49746,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM117.50254,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,90.3l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM53.42246,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM118.57754,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM19.35,109.65h133.3v23.65h-12.9v-12.9c-0.00012,-1.18736 -0.96264,-2.14988 -2.15,-2.15h-103.2c-1.18736,0.00012 -2.14988,0.96264 -2.15,2.15v12.9h-12.9z"></path></g></g></svg>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="row align-items-center">
+                                <div class="col-auto">
+                                    <p class="no-margin all-caps fs-10 light">Reference</p>
+                                    <p class="no-margin text-success bold">{{data.reference ? data.reference : 'n/a'}}</p>
+                                </div>
+                                <div class="col-auto">
+                                    <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">
+                                    <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
+                                </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>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue
new file mode 100644
index 00000000..afa6384c
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue
@@ -0,0 +1,58 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <p>Plese enter your order number.</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-auto mt-10 mb-10">
+                        <div class="col p-l-0 p-r-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.orderNo">
+                                <label class="text-primary">Order Number</label>
+                                <input class="form-control" v-model="orderNo">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: Number,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        data() {
+            return {
+                orderNo: '', 
+            };
+        },
+        validations: {
+            orderNo: '', 
+
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
new file mode 100644
index 00000000..d7766718
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
@@ -0,0 +1,290 @@
+<template>
+    <div class="row">
+        <div class="col no-margin">
+            <div class="row m-b-15">
+                <div class="col col-sm-12 col-md-4">
+                    <label>Order No:</label>
+                    <input type="text" class="form-control form-input" placeholder="12345678" v-model="filters.reference_like">
+                </div>
+                <div class="col col-sm-12 col-md-4">
+                    <label>Order Status:</label>
+                    <div class="col">
+                        <div class="row m-b-5">
+                            <div class="col p-l-0 p-r-0">
+                                <div class="btn btn-xs b-grey btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="orderStatusFilterDropDownStatus = !orderStatusFilterDropDownStatus">
+                                    <div class="row">
+                                        <div class="col p-t-5 p-b-5 fs-11">
+                                            {{orderStatus}}
+                                        </div>
+                                        <div class="col-auto b-l b-success">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <i class="fa" :class="[{'fa-angle-down': !orderStatusFilterDropDownStatus}, {'fa-angle-up': orderStatusFilterDropDownStatus}]"></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': !orderStatusFilterDropDownStatus}]" 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" v-for="status in orderStatusFilterArray">
+                                                    <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': orderStatus === status}, {'text-white': orderStatus === status}, {'hover-primary': orderStatus !== status}, {'pointer': orderStatus !== status}]" @click="updateOrderStatusFilter(status)">
+                                                        <div class="row align-items-center justify-content-center">
+                                                            <div class="col">
+                                                                <div class="font-heading fs-11">{{status}}</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col-auto p-r-5">
+                            <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="updateFilters(filters)">
+                                <div class="row align-items-center">
+                                    <div class="col p-r-5">Search</div>
+                                    <div class="col-auto p-l-10">
+                                        <i class="fa fa-search fs-16"></i>
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
+                        <div class="col-auto p-l-5">
+                            <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-secondary b-rad-none bg-secondary" @click="resetFilter()">
+                                <div class="row align-items-center">
+                                    <div class="col p-r-5 text-white">Reset</div>
+                                    <div class="col-auto p-l-10">
+                                        <i class="fa fa-refresh fs-16 text-white"></i>
+                                    </div>
+                                </div>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <table class="display w-100 m-b-10">
+                                                <thead>
+                                                    <tr>
+                                                        <th class="padding-10 b-a b-grey bg-master-light pointer" :class="[{'bg-primary-lighter': filters.order_by.column == 'reference'}]" @click="updateOrderBy('reference')">Order No <i class="fa float-right" :class="[{'fa-angle-down': filters.order_by.column == 'reference' && filters.order_by.DESC == false}, {'fa-angle-up': filters.order_by.column == 'reference' && filters.order_by.DESC == true}]"></i></th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light not-allowed">Warehouse</th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light not-allowed">Delivery Address</th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light not-allowed">Marking</th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light pointer" :class="[{'bg-primary-lighter': filters.order_by.column == 'created_at'}]" @click="updateOrderBy('created_at')">Date <i class="fa float-right" :class="[{'fa-angle-down': filters.order_by.column == 'created_at' && filters.order_by.DESC == false}, {'fa-angle-up': filters.order_by.column == 'created_at' && filters.order_by.DESC == true}]"></i></th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light not-allowed">Total CBM</th>
+                                                        <th class="padding-10 b-a b-grey bg-master-light not-allowed"></th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <tr v-for="data in $store.getters.getListData(section)">
+                                                        <td class="padding-10 b-a b-grey">{{data.reference}}</td>
+                                                        <td class="padding-10 b-a b-grey">{{data.warehouse.name}} {{$store.getters.isAdmin ? data.warehouse.reference : ''}}</td>
+                                                        <td class="padding-10 b-a b-grey">{{data.address.reference}} <i class="fa fa-info-circle float-right" data-html="true" v-tooltip:right="'<h6 class=\'text-white text-left fs-13 m-t-0 m-b-5 semi-bold\'>'+data.address.reference+'</h6><p class=\'text-white text-left lh-17 no-margin\'>'+data.address.street_one+' '+(data.address.street_two ? data.address.street_two : '')+', '+ data.address.district.name+', '+data.address.post_code+' '+data.address.state.name+', '+data.address.country.name+'</p>'" ></i></td>
+                                                        <td class="padding-10 b-a b-grey"><a :href="route('customer.profile', data.company_module.marking)">{{data.company_module.marking}}</a></td>
+                                                        <td class="padding-10 b-a b-grey">{{data.created_at}}</td>
+                                                        <td class="padding-10 b-a b-grey">{{(Math.ceil((data.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + data.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + data.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + data.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</td>
+                                                            <td class="padding-10 b-a b-grey"><a :href="route('order.show', data.reference)"><i class="fa fa-eye pointer"></i></a></td>
+                                                    </tr>
+                                                    <tr v-show="metaData.total === 0">
+                                                        <td class="b-a b-grey" colspan="7">
+                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50">
+                                                                <div class="col-10">
+                                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                    </div>
+                                                                    <div class="row text-center">
+                                                                        <div class="col">
+                                                                            <div class="row m-t-20">
+                                                                                <div class="col">
+                                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="row m-t-5 align-items-center justify-content-center hide">
+                                                                                <div class="col">
+                                                                                    <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col d-flex justify-content-center flex-column">
+                                            <span>Showing {{metaData.from}} to {{metaData.to}} of {{metaData.total}} entries</span>
+                                        </div>
+                                        <div class="col d-flex justify-content-end align-items-center">
+                                            <div class="m-r-10">Show</div>
+                                            <div class="row m-b-5 m-r-10">
+                                                <div class="col p-r-0">
+                                                    <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="perPageFilterDropDownStatus = !perPageFilterDropDownStatus">
+                                                        <div class="row">
+                                                            <div class="col p-t-5 p-b-5 fs-9">
+                                                                {{filters.per_page}}
+                                                            </div>
+                                                            <div class="col-auto b-l b-success">
+                                                                <div class="row h-100 align-items-center">
+                                                                    <div class="col">
+                                                                        <i class="fa" :class="[{'fa-angle-down': !perPageFilterDropDownStatus}, {'fa-angle-up': perPageFilterDropDownStatus}]"></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': !perPageFilterDropDownStatus}]" 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" v-for="num in pageFilterArray">
+                                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': filters.per_page === num}, {'text-white': filters.per_page === num}, {'hover-primary': filters.per_page !== num}, {'pointer': filters.per_page !== num}]" @click="updatePerPageFilter(num)">
+                                                                            <div class="row align-items-center justify-content-center">
+                                                                                <div class="col">
+                                                                                    <div class="font-heading">{{num}}</div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div>entries</div> 
+                                        </div>
+                                        <div class="col-auto" v-show="filters.per_page < metaData.total">
+                                            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data(){
+            return {
+                section: 'ListOrderTableSection',
+                emptyListSection: false,
+                pageFilterArray: [2, 5, 10, 20, 50],
+                perPageFilterDropDownStatus: false,
+                orderStatus: 'Active',
+                orderStatusFilterArray: ['Active', 'Complete', 'Pending Verification', 'Cancelled'],
+                orderStatusFilterDropDownStatus: false,
+                filters: {
+                    per_page: 2, 
+                    status_in: [1], 
+                    with_packing_lists: true,
+                    reference_like: '',
+                    order_by: {
+                        column: 'id',
+                        DESC: false,
+                    },
+                },
+                metaData: {
+                    from: null,
+                    to: null,
+                    total: null,
+                    current_page: null,
+                },
+            }
+        },
+        created(){
+            this.setDecoratorDefault();
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                let listDecorators = this.$store.getters.getListDetails(this.section);
+                this.submit(this.route('api.order.list') + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters), 'get', this.section, false, false)
+            },
+            updateOrderBy(field) {
+                field == this.filters.order_by.column ? this.filters.order_by.DESC = !this.filters.order_by.DESC  : '';
+                this.filters.order_by.column = field;
+                this.updateFilters(this.filters);
+            },
+            updateOrderStatusFilter(status) {
+                this.orderStatusFilterDropDownStatus = false;
+                this.orderStatus = status;
+
+                switch(status) {
+                    case 'Active':
+                        this.filters.status_in = [2];
+                        break;
+
+                    case 'Complete':
+                        this.filters.status_in = [3];
+                        break;
+
+                    case 'Pending Verification':
+                        this.filters.status_in = [1];
+                        break;
+                        
+                    case 'Cancelled':
+                        this.filters.status_in = [4, 5, 6];
+                        break;
+                }
+
+                this.updateFilters(this.filters);
+            },
+            updatePerPageFilter(number) {
+                this.perPageFilterDropDownStatus = false;
+                this.filters.per_page = parseInt(number);
+                this.updateFilters(this.filters);
+            },
+            updateFilters(filters){
+                this.filters = filters;
+                this.setDecoratorDefault();
+                this.submit(this.route('api.order.list') + '?page=' + this.metaData.current_page + '&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.$refs.pagination.makePagination(response.payload.meta, response.payload.links);
+                this.metaData = response.payload.meta;
+            },
+            resetFilter() {
+                this.filters.order_by.column = 'id';
+                this.filters.order_by.DESC = false;
+                this.filters.reference_like = '';
+                this.updateFilters(this.filters);
+            },
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
new file mode 100644
index 00000000..3554a8f2
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
@@ -0,0 +1,218 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-15" v-for="(item, index) in serviceCurrencies" v-bind:key="item.id">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-3 b-a pointer p-t-20 p-b-20" :class="[{'b-success': item.active}, {'b-grey': !item.active}]" @click="item.active = !item.active">
+                            <div class="absolute" style="top: -10px; right: -27px;" v-if="item.active">
+                                <div class="icon-thumbnail icon-25 bg-success text-white btn-rounded fs-10">
+                                    <i class="fa fs-10 fa-check"></i>
+                                </div>
+                            </div>
+                            <currency-component :deleteable="false" :section="section" :data="item.currency_object"></currency-component>
+                        </div>
+                        <div class="col">
+                            <div class="row h-100 m-r-0 align-items-end" v-show="item.active">
+                                <div class="col p-t-15 b-t b-r b-success bg-master-lightest">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Purchase Limits
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0">
+                                        <div class="col m-r-10 p-r-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component class="no-border" :validator="$v.parameters.currencies.$each[index].minimum_limit.value">
+                                                        <label>Minimum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.minimum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].maximum_limit.value">
+                                                        <label>Maximum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.maximum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-r-0" v-show="item.active">
+                        <div class="col p-b-15 bg-master-lightest b-r b-b b-l b-success">
+                            <div class="row">
+                                <div class="col p-r-25 p-l-25">
+                                    <div class="row m-b-10 m-t-10">
+                                        <div class="col p-l-5">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Exchange Rates
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-4 p-l-5 p-r-5 m-b-10" v-for="(rate, method) in item.rates">
+                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]">
+                                                <label class="all-caps">{{rate.payment_method}}</label>
+                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandler from "../../../general/mixins/formHandler";
+    import { required, requiredIf, minValue, maxValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    currencies: []
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                currencies: {
+                    $each: {
+                        maximum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active}),
+                            }
+                        },
+                        minimum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active })
+                            }
+                        },
+                        rates: {
+                            required: true,
+                            $each: {
+                                selling: {
+                                    value:{
+                                        required: requiredIf(function (currency) { return currency.active }),
+                                        minValue: minValue(0)
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        computed: {
+            convertibleCurrencies() {
+                let vm = this;
+                return this.$store.getters.getListData('convertibleCurrenciesSection').forEach(function(value){
+                    vm.addInactiveCurrency(value)
+                });
+            },
+            serviceCurrencies: function(){
+                return this.data.currencies;
+            }
+        },
+        watch: {
+            convertibleCurrencies(){
+                this.convertibleCurrencies();
+            },
+            serviceCurrencies(currencies){
+                this.$emit('input', currencies)
+            }
+        },
+        methods: {
+            inArray(element){
+                return this.parameters.currencies.some(currency => currency.id === element.id);
+            },
+            pushIfNotExist(element){
+                if (!this.inArray(element)) {
+                    this.parameters.currencies.push(element);
+                }
+            },
+            addInactiveCurrency(element){
+                this.pushIfNotExist({
+                    currency_object: element,
+                    active: false,
+                    id: element.id,
+                    maximum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    minimum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    rates: [
+                        {
+                            payment_method: 'cash',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'cheque',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'ba',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'wallet',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'payment gateway',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        }
+                    ]
+                });
+            }
+        },
+        mixins: [formHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue
new file mode 100644
index 00000000..a23f3a7c
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                       <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M86,15.05c-17.78789,0 -32.25,14.46211 -32.25,32.25c0,15.5791 11.09434,28.60508 25.8,31.60332v63.4082l6.45,16.125l6.45,-16.125v-63.4082c14.70566,-2.99824 25.8,-16.02422 25.8,-31.60332c0,-17.78789 -14.46211,-32.25 -32.25,-32.25zM86,19.35c15.46152,0 27.95,12.48848 27.95,27.95c0,15.46152 -12.48848,27.95 -27.95,27.95c-15.46152,0 -27.95,-12.48848 -27.95,-27.95c0,-15.46152 12.48848,-27.95 27.95,-27.95zM86,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM76.27461,28.38672c-0.36113,0.0168 -0.71387,0.10918 -1.02461,0.29395c-1.02461,0.59629 -1.38574,1.90645 -0.78945,2.93105c0.28555,0.49551 0.75586,0.85664 1.31016,1.00781c0.5459,0.15117 1.13379,0.07559 1.6293,-0.20996c0.49551,-0.28555 0.85664,-0.75586 0.99941,-1.31016c0.15117,-0.5543 0.07559,-1.14219 -0.21836,-1.6377c-0.38633,-0.68027 -1.11699,-1.0918 -1.90644,-1.075zM69.13594,35.475c-0.72226,0.04199 -1.38574,0.44512 -1.75527,1.075c-0.59629,1.02461 -0.24355,2.34316 0.78105,2.93105c0.49551,0.29395 1.0834,0.36953 1.6377,0.21836c0.5543,-0.14277 1.02461,-0.50391 1.31016,-0.99941c0.58789,-1.02461 0.23516,-2.34316 -0.79785,-2.93105c-0.35273,-0.20996 -0.76426,-0.31074 -1.17578,-0.29395zM66.65,45.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,79.55h4.3v61.93848l-2.15,5.375l-2.15,-5.375z"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Postcode</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">{{data}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">
+                                <declare-postcode-area-form-component :data="data"></declare-postcode-area-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: String,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
new file mode 100644
index 00000000..6266afbe
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
@@ -0,0 +1,151 @@
+<template>
+    <div class="row no-margin">
+        <div class="col p-t-5 p-b-5 b-grey b-a">
+            <div class="row text-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.days}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Days</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.hours}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Hours</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.minutes}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Minutes</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto b-t b-b b-r b-grey pointer requestModal" data-type="paymentAttempt">
+            <div class="row h-100 align-items-center">
+                <div class="col p-l-10 p-r-10">
+                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                         width="25" height="25"
+                         viewBox="0 0 172 172"
+                         style=" fill:#000000;"><defs><linearGradient x1="64.5" y1="40.25606" x2="64.5" y2="86.92719" gradientUnits="userSpaceOnUse" id="color-1_VhrilWh3UcXU_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-2_VhrilWh3UcXU_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-3_VhrilWh3UcXU_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,75.25v-32.25c-23.74944,0 -43,19.25056 -43,43h32.25c0,-5.93669 4.81331,-10.75 10.75,-10.75z" fill="url(#color-1_VhrilWh3UcXU_gr1)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,150.5c-35.56369,0 -64.5,-28.93631 -64.5,-64.5c0,-35.56369 28.93631,-64.5 64.5,-64.5c35.56369,0 64.5,28.93631 64.5,64.5c0,35.56369 -28.93631,64.5 -64.5,64.5z" fill="url(#color-2_VhrilWh3UcXU_gr2)"></path><path d="M86,26.875c-32.60206,0 -59.125,26.52294 -59.125,59.125c0,32.60206 26.52294,59.125 59.125,59.125c32.60206,0 59.125,-26.52294 59.125,-59.125c0,-32.60206 -26.52294,-59.125 -59.125,-59.125zM139.61294,88.6875c-0.63694,12.78981 -5.74319,24.39444 -13.81375,33.31156l-5.59269,-5.59269l-3.80013,3.80013l5.59269,5.59269c-8.91712,8.07325 -20.51906,13.17681 -33.31156,13.81375v-7.92544h-5.375v7.92544c-12.78981,-0.63694 -24.39444,-5.74319 -33.31156,-13.81375l5.59269,-5.59269l-3.80013,-3.80013l-5.59269,5.59269c-8.07325,-8.91712 -13.17681,-20.51906 -13.81375,-33.31156h40.44687c1.24969,6.12481 6.67575,10.75 13.16606,10.75c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-40.44687c12.78981,0.63694 24.39444,5.74319 33.31156,13.81375l-5.59269,5.59269l3.80013,3.80013l5.59269,-5.59269c8.07325,8.91713 13.17681,20.51906 13.81375,33.31156h-7.92544v5.375zM86,77.9375c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625zM83.3125,32.38706v40.44687c-5.25675,1.07231 -9.40625,5.22181 -10.47856,10.47856h-40.44687c1.36794,-27.49044 23.435,-49.5575 50.92544,-50.92544z" fill="url(#color-3_VhrilWh3UcXU_gr3)"></path></g></g></svg>
+                </div>
+            </div>
+        </div>
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentAttempt">
+            <payment-attempt-limit-form-component :data="{
+                    segment_id: this.segment_id,
+                    name: 'Payment Attempt Duration Limit',
+                    reference: this.reference,
+                    detail: {
+                        minutes: this.minutes
+                    }
+                }" section="paymentAttemptSection" class="text-center"></payment-attempt-limit-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number,
+                default: 1
+            },
+            data:{
+                type: Number,
+                default: 0
+            }
+        },
+        data(){
+            return {
+                reference: 'PAYMENT_ATTEMPT_DURATION_LIMIT',
+                minutes: 0
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.reference);
+            },
+            timer () {
+                return {
+                    days: ('00'+Math.floor(this.minutes / 1440)).substr(('00'+Math.floor(this.minutes / 1440)).length-2),
+                    hours: ('00'+(Math.floor(this.minutes / 60) % 24)).substr(('00'+(Math.floor(this.minutes / 60) % 24)).length-2),
+                    minutes: ('00'+Math.floor(this.minutes % 60)).substr(('00'+Math.floor(this.minutes % 60)).length-2)
+                };
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchTime();
+                }
+            },
+            'data': function () {
+                this.minutes = this.data
+            }
+        },
+        created(){
+            if(this.segment_id === 1){
+                this.$store.dispatch('updateListQueue', {'name': this.reference});
+                return;
+            }
+
+            if(this.data){
+                this.minutes = this.data
+            }
+
+        },
+        methods: {
+            fetchTime(){
+                return this.submit(route('api.segment.constant.show', this.segment_id, this.reference), 'get', '', false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.reference, 'data': response.payload.data});
+                this.minutes = response.payload.data.detail.hasOwnProperty('minutes') ? response.payload.data.detail.minutes:0;
+            }
+        }
+
+    }
+</script>
+<style>
+    .blink {
+        animation: blink-animation 1s steps(5, start) infinite;
+        -webkit-animation: blink-animation 1s steps(5, start) infinite;
+    }
+    @keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+    @-webkit-keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+</style>
diff --git a/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue
new file mode 100644
index 00000000..9e58b60d
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue
@@ -0,0 +1,77 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">State</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">{{data.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">City Center Charges</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">MYR 0.00</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Outskirt Charges</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">MYR 0.00</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="editCharges">Edit</div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editCharges">
+                                <edit-state-charges-form-component :data="data"></edit-state-charges-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/UserProfileComponent.vue b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
new file mode 100644
index 00000000..fd42e9b9
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="col">
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Full Name</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserName"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editFullName">
+                    <i class="fa fa-pencil m-r-10"></i>Edit
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Password</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted">********</div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal"  data-type="resetPassword">
+                    <i class="fa fa-lock m-r-10"></i>Request Password Reset
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Email Address</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editEmail">
+                    <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
+                </div>
+            </div>
+        </div>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editFullName">
+            <edit-user-profile-fullname-form-component :data="{name: $store.getters.getUserName}" :section="section"></edit-user-profile-fullname-form-component>
+        </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="resetPassword">
+            <reset-user-password-form-component :data="{email: $store.getters.getUserEmail}"  section="resetPassword"></reset-user-password-form-component>
+        </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editEmail">
+            <edit-email-form-component :data="{email: $store.getters.getUserEmail}" section="editEmail"></edit-email-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+export default {
+  props: {
+    section: {
+      default: "editFullNameSection",
+    },
+  },
+};
+</script>
diff --git a/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue
new file mode 100644
index 00000000..59611841
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Warehouse Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">{{data.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Extra Charges</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps">MYR 0.00</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="editWarehouseCharges">Edit</div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editWarehouseCharges">
+                                <edit-warehouse-charges-form-component :data="data"></edit-warehouse-charges-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
new file mode 100644
index 00000000..a29f7572
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -0,0 +1,128 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">{{this.data?"Update":"Create"}} Announcement</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.title">
+                                <label>Title</label>
+                                <input type="text" class="form-control" v-model="parameters.title">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.description">
+                                <label>Message</label>
+                                <textarea class="form-control h-75" v-model="parameters.description"  rows="20"></textarea>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+
+                    <div class="row m-b-20">
+                        <div class="col-6">
+                            <validation-wrapper-component :validator="$v.parameters.starting_on">
+                                <label>Start Date</label>
+                                <input type="date" v-model="parameters.starting_on">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-6">
+                            <validation-wrapper-component :validator="$v.parameters.ending_on">
+                                <label>End Date</label>
+                                <input type="date" v-model="parameters.ending_on">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>  
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data?"Update":"Create"}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        props : {            
+            closable: {
+                type: Boolean,
+                default: true
+            },
+            country_id: {
+                type: Number,
+                default: 1
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    starting_on:'',
+                    ending_on:'',                    
+                    // segment_id: '',
+                    title: '',
+                    description: '',                    
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                title: {
+                    required
+                },
+                description: {
+                    required
+                },
+                // segment_id: {
+                //     required
+                // }, 
+                starting_on:{
+                    required
+                },
+                ending_on:{
+                    required
+                },                
+            }
+        },
+        computed:{
+
+        },
+        created(){
+            console.log("lado form");
+        },
+        methods: {
+            submitForm(){
+                //this.submit(route('api.announcement.create'), 'post', this.section, true, false);
+                this.submit((this.data ? this.route('api.announcement.update', this.data.id) : this.route('api.announcement.create')), (this.data ? 'put' : 'post'), this.section, true, false)
+            },
+            // successHandler(response){
+            //     this.closeModal();
+            //     //this.formHandler();
+            //     this.resetForm();
+            // },
+            // errorHandler(error){
+            //     this.formHandler(error.message);
+            // }
+        },
+        mixins: [ModalFormHandler],
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
new file mode 100644
index 00000000..5c59b264
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
@@ -0,0 +1,33 @@
+<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 delete announcement with title <b>{{item.title}}</b> ?</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.announcement.delete', item.id), 'delete', section, true, true)">Delete</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]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
new file mode 100644
index 00000000..d44cd44f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
@@ -0,0 +1,58 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h5 class="all-caps m-b-5 bold no-margin">Change Email Address</h5>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.email">
+                                <label>New Email Address</label>
+                                <input type="text" class="form-control" v-model="parameters.email">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.company.team.create'), 'post', section, true, false)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required, email } from "vuelidate/lib/validators";
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: this.data.email,
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                email: { required, email  }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue
new file mode 100644
index 00000000..ac4052c6
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue
@@ -0,0 +1,62 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col">
+                    <h2 class="text-center bold">{{data.name}}</h2>
+                </div>
+            </div>
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.cityCenterCharges">
+                <label class="text-primary">City Center Charges (MYR)</label>
+                <div class="controls">
+                    <input type="text" class="form-control fs-12" v-model="cityCenterCharges">
+                </div>
+            </validation-wrapper-component>
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.outskirtCharges">
+                <label class="text-primary">Outskirt Charges (MYR)</label>
+                <div class="controls">
+                    <input type="text" class="form-control fs-12" v-model="outskirtCharges">
+                </div>
+            </validation-wrapper-component>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        data() {
+            return {
+                cityCenterCharges: '', 
+                outskirtCharges : '', 
+            };
+        },
+        validations: {
+            parameters: {
+                cityCenterCharges: { required },
+                outskirtCharges: { required },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
new file mode 100644
index 00000000..95e79174
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Full Name</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Full Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.user.update', $store.getters.getUserId), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    name: this.data.name,
+                }
+            }
+        },
+        mixins: [updateProfileFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue
new file mode 100644
index 00000000..a078576f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue
@@ -0,0 +1,54 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col">
+                    <h2 class="text-center">{{data.name}}</h2>
+                </div>
+            </div>
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.extraCharges">
+                <label class="text-primary">Extra Charges (MYR)</label>
+                <div class="controls">
+                    <input type="text" class="form-control fs-12" v-model="extraCharges">
+                </div>
+            </validation-wrapper-component>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: false
+            },
+            section: {
+                default: ''
+            },
+        },
+        data() {
+            return {
+                extraCharges: '', 
+            };
+        },
+        validations: {
+            parameters: {
+                extraCharges: { required },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
new file mode 100644
index 00000000..63be0142
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
@@ -0,0 +1,111 @@
+<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" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <h6 class="all-caps m-b-0 bold">Payment Attempt Limit</h6>
+                            <div class="font-heading fs-10 all-caps muted">Set the payment grace duration before the attempts expires</div>
+                        </div>
+                    </div>
+                    <div class="row  justify-content-center m-b-20">
+                        <div class="col-8 bg-master-dark padding-15 b-rad-lg">
+                            <div class="row justify-content-center">
+                                <div class="col-3 p-r-5 p-l-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Days</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="days" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Hours</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="hours" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Minutes</label>
+                                        <input class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="minutes" v-mask="'##'" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.constant.update', data.segment_id), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import {TheMask} from 'vue-the-mask'
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        components: {TheMask},
+        data(){
+            return {
+                minutes: '00',
+                hours: '00',
+                days: '00',
+                parameters: {}
+
+            }
+        },
+        watch: {
+            'days' : function (value) {
+                this.days = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'hours' : function (value) {
+                if(value > 23){ value = value - 24; this.days = parseInt(this.days) + 1 }
+                this.hours = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'minutes' : function (value) {
+                if(value > 59){ value = value - 60; this.hours = parseInt(this.hours) + 1 }
+                this.minutes = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'data' : function () {
+                this.days = Math.floor(this.data.detail.minutes / 1440);
+                this.hours = Math.floor(this.data.detail.minutes / 60) % 24;
+                this.minutes = Math.floor(this.data.detail.minutes % 60);
+            }
+        },
+        methods: {
+            updateMinutes(){
+                this.parameters.detail.minutes = parseInt((parseInt(this.days) * 1440) + (parseInt(this.hours) * 60) + parseInt(this.minutes));
+            },
+            formatTime(value){
+                return ('00'+value).substr(('00'+value).length-2)
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
new file mode 100644
index 00000000..1a735522
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Reset Password</h3>
+                            <p>A reset password link will send to your email account</p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.authentication.password.forget'), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import resetPasswordFormValidation from '../../../general/mixins/accounts/validation/resetPasswordFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: this.$store.getters.getUserEmail,
+                }
+            }
+        },
+        mixins: [resetPasswordFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
new file mode 100644
index 00000000..c8f114cf
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Custom Segment</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Segment Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.create'), 'post', section, true, false)">Create Segment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required: true
+                }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
new file mode 100644
index 00000000..5405ae6e
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
@@ -0,0 +1,293 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-20">
+                        <div class="col-auto pointer bg-master-lightest p-t-15 p-b-15" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For this</div>
+                                    <div class="font-heading fs-8 all-caps">Segment's Customers</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20 m-l-0 m-r-0">
+                        <div class="col p-l-10 p-r-10">
+                            <div class="row">
+                                <div class="col p-l-5 p-r-5">
+                                    <div class="row">
+                                        <div class="col-5 p-r-0">
+                                            <validation-wrapper-component selecatable :validator="$v.custom_field">
+                                                <label>Custom Fields</label>
+                                                <select-component :options="inActiveFields" v-model="custom_field"></select-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto p-l-25 p-r-25 bg-success pointer" @click="activateCustomField(custom_field, true)">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa fa-plus text-white"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col p-l-5">
+                                    <div class="row no-margin">
+                                        <div class="col padding-10 bg-master-lightest">
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.tax.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax" >
+                                                        <label>Tax</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('tax', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.service_charge.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge" >
+                                                        <label>Service Charge</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('service_charge', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.minimum_charge.active">
+                                                    <div class="row">
+                                                        <div class="col p-r-0">
+                                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge" >
+                                                                <label>Minimum Charge</label>
+                                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge"  v-money="money">
+                                                                <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                                    <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('minimum_charge', false)"></i>
+                                                                </div>
+                                                            </validation-wrapper-component>
+                                                        </div>
+                                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                            <div class="row h-100 align-items-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-5">
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.po_limit.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit" >
+                                                        <label>Abandoned PO Limit **</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit" v-money="integer">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('po_limit', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-7 p-l-5 p-r-5" v-show="custom_fields.bank_id.active">
+                                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id" >
+                                                        <label>Receivable Bank Account</label>
+                                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('bank_id', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10" v-show="custom_fields.po_limit.active">
+                                                <div class="col p-l-5 p-r-5">
+                                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                custom_fields: {
+                    bank_id: {
+                        name: 'Receivable Bank Account',
+                        active: false
+                    },
+                    po_limit: {
+                        name: 'Abandoned PO Limit',
+                        active: false
+                    },
+                    tax: {
+                        name: 'Tax',
+                        active: false
+                    },
+                    minimum_charge: {
+                        name: 'Minimum Charge',
+                        active: false
+                    },
+                    service_charge: {
+                        name: 'Service Charge',
+                        active: false
+                    }
+                },
+                custom_field: '',
+                parameters: {
+                    id: null,
+                    configurations: {
+                        active: false,
+                        bank_id: '',
+                        service_charge: {
+                            value: 0
+                        },
+                        minimum_charge: {
+                            value: 0
+                        },
+                        tax: {
+                            value: 0
+                        },
+                        po_limit: {
+                            value: 0
+                        },
+                        currencies: [],
+                    }
+                }
+            }
+        },
+        validations: {
+            custom_field: {},
+            parameters: {
+                configurations: {
+                    bank_id: {},
+                    service_charge: {},
+                    minimum_charge: {},
+                    tax: {},
+                    po_limit: {}
+                }
+            }
+        },
+        watch: {
+            'data': function() {
+                this.updateActiveCustomFields();
+            }
+        },
+        created(){
+            this.updateActiveCustomFields();
+        },
+        computed: {
+            inActiveFields(){
+                return Object.keys(this.custom_fields).map(function(key) {
+                    return {id: key, text: this.custom_fields[key].name}
+                }, this);
+            }
+        },
+        methods: {
+            submitForm(){
+                this.parameters.custom_fields = {
+                    bank_id: this.custom_fields.bank_id.active ? this.parameters.configurations.bank_id : null,
+                    service_charge: this.custom_fields.service_charge.active ? {type: 'percentage', value: this.parameters.configurations.service_charge} : null,
+                    minimum_charge: this.custom_fields.minimum_charge.active ? {type: 'fixed_amount', value: this.parameters.configurations.minimum_charge} : null,
+                    tax: this.custom_fields.tax.active ? {type: 'percentage', value: this.parameters.configurations.tax} : null,
+                    po_limit: this.custom_fields.po_limit.active ? {type: 'fixed_amount', value: this.parameters.configurations.po_limit}: null,
+                };
+
+                this.submit(this.route('api.segment.constant.service.update', this.segment_id, this.parameters.id), 'put', 'segmentSection', true, true)
+            },
+            activateCustomField(fieldName, status){
+                if(fieldName !== ''){
+                    this.custom_fields[fieldName].active = status
+                    if(!status) this.parameters[fieldName] = '';
+                }
+            },
+            updateActiveCustomFields() {
+
+                if(this.data.detail){
+                    Object.keys(this.data.detail).forEach((key) => {
+                        if(this.custom_fields.hasOwnProperty(key)){
+                            this.custom_fields[key].active = true;
+                        }
+                    });
+                }
+
+                if(this.data.configurations){
+                    this.parameters.configurations = {
+                        active: this.data.configurations.hasOwnProperty('active') ? this.data.configurations.active : false,
+                        bank_id: this.data.configurations.hasOwnProperty('bank_id') ? this.data.configurations.bank_id : '',
+                        service_charge: this.data.configurations.hasOwnProperty('service_charge') ? this.data.configurations.service_charge.value : 0,
+                        minimum_charge: this.data.configurations.hasOwnProperty('minimum_charge') ? this.data.configurations.minimum_charge.value : 0,
+                        tax: this.data.configurations.hasOwnProperty('tax') ? this.data.configurations.tax.value : 0,
+                        po_limit: this.data.configurations.hasOwnProperty('po_limit') ? this.data.configurations.po_limit.value : 0,
+                        currencies: this.data.configurations.hasOwnProperty('currencies') ? this.data.configurations.currencies : []
+                    };
+                }
+
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
new file mode 100644
index 00000000..eac2a388
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
@@ -0,0 +1,218 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col-5 p-r-10">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Service Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest m-r-10 d-none" @click="parameters.configurations.billable = !parameters.configurations.billable">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.billable}, {'bg-white': !parameters.configurations.billable}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Billable Service</div>
+                                    <div class="font-heading fs-8 all-caps">Include Billing</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For Default</div>
+                                    <div class="font-heading fs-8 all-caps">Customer segment</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <!-- <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
+                                        <label>Service Charge</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div> -->
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
+                                        <label>Price Per CBM</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5 p-r-20">
+                                    <div class="row">
+                                        <div class="col p-r-0">
+                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge.value">
+                                                <label>Minimum Charge</label>
+                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge.value"  v-money="money">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-l-5 d-none" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax.value">
+                                        <label>Tax</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-5 d-none">
+                                <div class="col-5 p-r-0" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit.value">
+                                        <label>Abandoned PO Limit **</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit.value" >
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col">
+                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id">
+                                        <label>Receivable Bank Account</label>
+                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-10 d-none" v-show="parameters.configurations.billable">
+                                <div class="col">
+                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    configurations: {
+                        bank_id: '',
+                        service_charge: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        minimum_charge: {
+                            type: 'fixed_amount',
+                            value: 0
+                        },
+                        tax: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        po_limit: {
+                            type: 'fixed_amount',
+                            value: 1
+                        },
+                        billable: true,
+                        currencies: []
+                    },
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                configurations: {
+                    bank_id: {
+                        required
+                    },
+                    service_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    minimum_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    tax: {
+                        value:{
+                            required
+                        }
+                    },
+                    po_limit: {
+                        value:{
+                            required,
+                            minValue: minValue(1)
+                        }
+                    }
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit((this.data ? this.route('api.service_type.update', this.data.id) : this.route('api.service_type.create')), (this.data ? 'put' : 'post'), this.section, true, true)
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
new file mode 100644
index 00000000..aef5b89f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
@@ -0,0 +1,33 @@
+<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 {{item.status !== 2 ? 'Activate':'Deactivate'}} <b>{{item.name}}</b> service?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': item.status === 2}, {'btn-success': item.status !== 2}]" @click="submit(route('api.service_type.status', item.id, item.status === 2 ? 'inactive' : 'active'), 'put', section, true, true)">{{item.status !== 2 ? 'Activate':'Deactivate'}}</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]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/elements/UserComponent.vue b/resources/assets/vue/components/user/elements/UserComponent.vue
new file mode 100644
index 00000000..601c0097
--- /dev/null
+++ b/resources/assets/vue/components/user/elements/UserComponent.vue
@@ -0,0 +1,61 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M68.21211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-6.78594,5.54297 -11.11113,11.10274 -11.11113,11.10274l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,6.02168 0.92383,10.88438 1.38574,12.94199c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.19863 5.33301,5.30781c0.39473,8.33125 4.40918,15.68828 10.52324,20.53418v8.02051c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-4.94668,2.33477 -9.91855,5.14824 -13.79024,8.48242c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976v12.9h111.8v-12.9c0,-2.31797 -0.72226,-4.46797 -1.91484,-6.45h32.01484v-8.17168c0,-3.7793 -2.34316,-6.92871 -5.34141,-9.51543c-2.99824,-2.58672 -6.81113,-4.73672 -10.59043,-6.52559c-6.85313,-3.225 -12.95039,-5.00547 -14.16816,-5.3498v-0.5375h22.23906l0.37793,-1.67969c0,0 3.18301,-14.03379 3.18301,-30.17559c0,-10.17891 -2.61191,-18.76211 -6.86152,-24.90977c-4.04805,-5.82851 -9.7002,-9.38945 -15.83105,-9.75059c-0.95742,-1.18418 -5.51778,-6.58437 -13.85742,-6.58437c-5.57656,0 -11.43027,1.34375 -16.60371,3.56934c-0.31074,-0.31074 -0.61309,-0.62988 -0.93223,-0.91543c-3.50215,-3.07383 -7.61738,-4.3084 -11.2623,-4.56875c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM68.21211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94063,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM116.1,34.4c6.9959,0 11.16992,5.57656 11.16992,5.57656l0.64668,0.87344h1.0834c4.87109,0 9.59941,2.76309 13.24434,8.0373c3.65332,5.27422 6.10566,13.01758 6.10566,22.45742c0,14.09258 -2.30117,25.29609 -2.77988,27.55527h-18.60254c5.41699,-3.7541 8.48242,-10.34687 8.48242,-17.60312v-9.95215c0,-5.3918 -1.76367,-9.07871 -3.61973,-11.32949c-1.85605,-2.25078 -3.94726,-3.16621 -3.94726,-3.16621l-1.50332,-0.62988l-1.01621,1.26816c0,0 -1.22617,1.57891 -4.05645,3.09062c-2.82188,1.51172 -7.09668,2.85547 -13.11836,1.96524l-0.62988,4.24961c6.95391,1.03301 12.27012,-0.5375 15.78066,-2.42715c2.40195,-1.28496 2.89746,-2.05762 3.68691,-2.86387c0.41153,0.23516 0.67188,0.25195 1.49492,1.25137c1.26816,1.53691 2.62871,4.10684 2.62871,8.5916v9.95215c0,8.44043 -4.38398,14.95762 -12.11895,16.33496l-0.61309,0.11758l-0.45351,0.41152c-0.51231,0.46191 -1.14219,0.73906 -1.86445,0.73906c-0.72226,0 -1.35215,-0.26875 -1.86445,-0.73906l-0.45352,-0.41152l-0.61309,-0.11758c-7.17227,-1.27656 -11.41348,-7.0043 -12.00137,-14.55449c1.16738,-0.62988 2.07441,-1.65449 2.51953,-2.90586c0.58789,0.94902 1.6209,1.52851 2.73789,1.52851c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225c-0.57109,0 -1.13379,0.15117 -1.6293,0.44512c0.27715,-0.94063 0.5543,-1.91484 0.5543,-3.02344c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.39473,-2.26758 2.02402,-11.97617 2.02402,-18.8041c0,-4.99707 -1.21777,-9.06191 -3.12422,-12.25332c4.41758,-1.74688 9.34746,-2.79668 13.87422,-2.79668zM86,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.46191 -3.10742,-1.22617l-0.45352,-0.41992l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89688c-0.73906,0 -1.20937,-0.50391 -1.20937,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM59.125,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM82.775,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM123.625,75.25c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.93418,88.81348c1.36895,4.19082 3.89688,7.77695 7.41582,10.17891v4.72832c-1.93164,0.57109 -9.98574,3.04023 -17.2,6.60117v-5.99648c4.8375,-3.84649 8.33125,-9.28028 9.78418,-15.51191zM122.55,101.11719v6.38281c-0.25195,0.49551 -1.83926,3.43496 -6.45,3.43496c-4.61074,0 -6.19805,-2.93945 -6.45,-3.43496v-6.37441c0.72227,0.24356 1.45293,0.46191 2.22559,0.62149c1.17578,0.88184 2.62871,1.45293 4.22441,1.45293c1.5957,0 3.05703,-0.57109 4.23281,-1.45293c0.76426,-0.16797 1.50332,-0.37793 2.21719,-0.62988zM58.05,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM105.35,108.21387v0.47031l0.22676,0.45352c0,0 3.2334,6.09726 10.52324,6.09726c7.28984,0 10.52324,-6.09726 10.52324,-6.09726l0.22676,-0.45352v-0.44512c2.23399,0.68027 6.79434,2.1332 12.32891,4.73672c3.56934,1.68809 7.11348,3.72891 9.62461,5.8957c2.51113,2.1668 3.84648,4.3168 3.84648,6.25684v3.87168h-31.20859c-0.44512,-0.42832 -0.90703,-0.84824 -1.38574,-1.25976c-1.44453,-1.24297 -3.08223,-2.39356 -4.77871,-3.50215c0.5207,-0.40313 0.82305,-1.02461 0.82305,-1.68809c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.03301,0 -1.92324,0.73906 -2.11641,1.75527c-1.82246,-1.02461 -3.68691,-2.00722 -5.56816,-2.89746c-5.51777,-2.60351 -10.91797,-4.56035 -14.67207,-5.81172c5.17344,-2.38516 10.81719,-4.2916 13.75664,-5.23223zM53.75,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM122.55,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM27.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM36.55,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM53.75,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM62.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM70.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM105.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.email}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                                <i class="fa fa-times"></i>
+                            </button>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">
+                                <delete-user-form-component :data="item" section="suppliersSection" class="text-center"></delete-user-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
new file mode 100644
index 00000000..cb8af386
--- /dev/null
+++ b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
@@ -0,0 +1,33 @@
+<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 delete this admin account?</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.account.user.delete', item.id), 'delete', section, true, true)">Delete</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]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue
new file mode 100644
index 00000000..5d283733
--- /dev/null
+++ b/resources/assets/vue/components/user/form/UserFormComponent.vue
@@ -0,0 +1,117 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Add Admin Account</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.email">
+                                <label>Email</label>
+                                <input type="text" class="form-control" v-model="parameters.email">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password">
+                                <label>Password</label>
+                                <input type="password" class="form-control" v-model="parameters.password">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                <label>Password Confirmation</label>
+                                <input type="password" class="form-control" v-model="parameters.password_confirmation">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Admin</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import { required, sameAs, minLength , email} from "vuelidate/lib/validators";
+    export default {
+        props : {
+            closable: {
+                type: Boolean,
+                default: true
+            },
+        },
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    email: '',
+                    password: '',
+                    password_confirmation: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                email: {
+                    required,
+                    email
+                },
+                password: {
+                    required,
+                    minLength: minLength(6)
+                },
+                password_confirmation: {
+                    required,
+                    sameAsPassword: sameAs('password')
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(route('api.account.user.admin.create'), 'post', this.section, true, false);
+            },
+            successHandler(response){
+                this.closeModal();
+                this.$emit('createdAdmin', response.payload.data);
+                this.formHandler();
+                this.resetForm();
+            },
+            errorHandler(error){
+                this.formHandler(error.message);
+            }
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/emails/layout/base.blade.php b/resources/views/emails/layout/base.blade.php
index 0f58c396..ec9a6f85 100644
--- a/resources/views/emails/layout/base.blade.php
+++ b/resources/views/emails/layout/base.blade.php
@@ -82,6 +82,9 @@
         .pointer {
             cursor: pointer;
         }
+        .not-allowed {
+            cursor: not-allowed;
+        }
         .text-complete {
             color: #009add;
         }
diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index b8ab329b..b4f2acb8 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -1,13 +1,5 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-<div class="row m-1 mt-3 mb-3 hide">
-    <div class="col col-10 m-r-5">
-        <div class="row border p-1">Search</div>
-    </div>
-    <div class="col col m-l-5">
-        <div class="row border p-1">Filter</div>
-    </div>
-</div>
 
 <div class="row m-b-15" v-if="false" v-show="!$store.getters.isShowing('createContainerFormSection')">
     <div class="col">
@@ -15,8 +7,9 @@
     </div>
 </div>
 
+<container-search-component section="containerListSection"></container-search-component>
 <create-load-container-form-component section="containerListSection" v-show="$store.getters.isShowing('createContainerFormSection')"></create-load-container-form-component>
-<div class="row tabsContainer" v-show="!$store.getters.isShowing('createContainerFormSection')">
+<div class="row tabsContainer" v-show="!$store.getters.isShowing('createContainerFormSection') && !$store.getters.isShowing('searchContainerSection')">
     <div class="col no-padding">
         <div class="row m-l-0 m-r-0">
             <div class="col col-md-4 m-r-5">
diff --git a/resources/views/pages/orders/table.blade.php b/resources/views/pages/orders/table.blade.php
new file mode 100644
index 00000000..9f42cef6
--- /dev/null
+++ b/resources/views/pages/orders/table.blade.php
@@ -0,0 +1,13 @@
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.4/css/jquery.dataTables.css">
+
+@extends('layouts.base_portal')
+@section('inner_content')
+    {{--<div class="row m-b-20" v-if="$store.getters.isAdmin">--}}
+        {{--<div class="col"></div>--}}
+        {{--<div class="col-auto">--}}
+            {{--<a :href="route('orders.refresh')"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>--}}
+        {{--</div>--}}
+    {{--</div>--}}
+    {{--<order-search-section-component v-show="!$store.getters.isShowing('createOrderForm')"></order-search-section-component>--}}
+    <orders-table-section-component></orders-table-section-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
new file mode 100644
index 00000000..b6d89f9f
--- /dev/null
+++ b/resources/views/pages/settings.blade.php
@@ -0,0 +1,445 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row">
+    <div class="col">
+        <div class="row tabsContainer">
+            <div class="col-12 col-md-auto">
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-b-5">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col bg-master-light active tabButton" tab-name="profile">
+                                                <div class="row align-items-center">
+                                                    <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M86,15.05c-39.16191,0 -70.95,31.78809 -70.95,70.95c0,39.16191 31.78809,70.95 70.95,70.95c39.16191,0 70.95,-31.78809 70.95,-70.95c0,-39.16191 -31.78809,-70.95 -70.95,-70.95zM86,19.35c36.83555,0 66.65,29.81445 66.65,66.65c0,36.83555 -29.81445,66.65 -66.65,66.65c-36.83555,0 -66.65,-29.81445 -66.65,-66.65c0,-36.83555 29.81445,-66.65 66.65,-66.65zM86,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM97.37988,26.90859c-1.0498,-0.0252 -1.95684,0.70547 -2.1668,1.73848c-0.22676,1.15898 0.5291,2.29277 1.69649,2.52793c1.15898,0.22676 2.29277,-0.5291 2.52793,-1.68809c0.22676,-1.16738 -0.5291,-2.30117 -1.68809,-2.53633c-0.12598,-0.0168 -0.24355,-0.03359 -0.36953,-0.04199zM74.6873,26.91699c-0.14277,0 -0.28555,0.0084 -0.42832,0.03359c-1.16738,0.23516 -1.92324,1.36895 -1.68809,2.53633c0.10918,0.5543 0.43672,1.0498 0.91543,1.36895c0.47031,0.31074 1.0498,0.42832 1.6125,0.31914c1.16738,-0.23516 1.92324,-1.36055 1.68809,-2.52793c-0.20156,-0.99941 -1.075,-1.72168 -2.09961,-1.73008zM63.80293,30.21758c-0.28555,0 -0.57109,0.05039 -0.83984,0.15957c-1.10019,0.46191 -1.6209,1.71328 -1.15898,2.81348c0.45351,1.1002 1.70488,1.6209 2.80508,1.16738c1.1002,-0.46191 1.6209,-1.71328 1.16738,-2.81348c-0.33594,-0.79785 -1.10859,-1.31855 -1.97363,-1.32695zM108.26426,30.21758c-0.89024,-0.0168 -1.69649,0.50391 -2.04082,1.32695c-0.45351,1.1002 0.06719,2.35156 1.16738,2.81348c1.1002,0.45351 2.35156,-0.06719 2.80508,-1.16738c0.46191,-1.1002 -0.05879,-2.35156 -1.15898,-2.81348c-0.24355,-0.10078 -0.5123,-0.15117 -0.77266,-0.15957zM53.7752,35.57578c-0.43672,0 -0.86504,0.12598 -1.22617,0.36953c-0.98262,0.65508 -1.25137,1.99043 -0.58789,2.98145c0.65508,0.98262 1.99043,1.25137 2.98145,0.58789c0.99101,-0.65508 1.25137,-1.99043 0.59629,-2.97305c-0.39472,-0.59629 -1.0582,-0.95742 -1.76367,-0.96582zM118.28359,35.57578c-0.73066,-0.0084 -1.41934,0.35274 -1.82246,0.96582c-0.66348,0.98262 -0.39473,2.31797 0.58789,2.97305c0.99102,0.66348 2.32637,0.39473 2.98145,-0.58789c0.31914,-0.47031 0.43672,-1.0582 0.32754,-1.6125c-0.10918,-0.5627 -0.43672,-1.0582 -0.91543,-1.36895c-0.34434,-0.23516 -0.73906,-0.36113 -1.15899,-0.36953zM44.98203,42.79844c-0.57949,0 -1.14219,0.22676 -1.54531,0.63828c-0.83984,0.83145 -0.83984,2.20039 0,3.03184c0.83145,0.83984 2.20039,0.83984 3.03184,0c0.83984,-0.83144 0.83984,-2.20039 0,-3.03184c-0.39472,-0.40312 -0.92383,-0.62988 -1.48652,-0.63828zM127.07676,42.79844c-0.57949,0 -1.14219,0.22676 -1.54531,0.63828c-0.83984,0.83145 -0.83984,2.20039 0,3.03184c0.83145,0.83984 2.20039,0.83984 3.03184,0c0.83984,-0.83144 0.83984,-2.20039 0,-3.03184c-0.39473,-0.40312 -0.92383,-0.62988 -1.48652,-0.63828zM83.16973,49.45c-8.53281,0 -16.22578,4.61074 -21.84434,9.07031c-5.61856,4.45117 -9.24668,8.92754 -9.24668,8.92754l-2.06601,2.55313l3.16621,0.87344c0,0 1.1002,0.29395 2.34316,1.43613c1.24297,1.14219 2.52793,2.97305 2.52793,6.55078c0,5.9293 0.97422,10.67441 1.16738,11.58144c-0.72227,0.83145 -1.16738,1.87285 -1.16738,3.08223c0,1.24297 0.34434,2.22559 0.61309,3.2082c0.14278,0.48711 0.27715,0.94063 0.36113,1.28496c0.09238,0.33594 0.10078,0.67188 0.10078,0.34434c0,2.1752 1.6293,3.7373 3.62812,4.33359c1.21777,10.12012 8.65879,18.2666 18.52695,20.29062c1.31016,1.01621 2.91426,1.71328 4.71992,1.71328c1.80566,0 3.40977,-0.69707 4.71992,-1.71328c9.86816,-2.02402 17.30918,-10.17051 18.52695,-20.29062c1.99883,-0.59629 3.62813,-2.1584 3.62813,-4.33359c0,0.32754 0.0084,-0.0084 0.10078,-0.34434c0.08399,-0.34434 0.21836,-0.79785 0.36113,-1.28496c0.26875,-0.98262 0.61309,-1.96524 0.61309,-3.2082c0,-1.15898 -0.41992,-2.1668 -1.0918,-2.98145c0.08398,-0.82305 1.0918,-10.54844 1.0918,-16.44414c0,-6.30723 -2.28437,-11.01875 -5.63535,-13.9918c-3.06543,-2.71269 -6.88672,-3.83809 -10.52324,-4.03965c-0.41992,-0.73906 -0.68867,-1.56211 -2.41035,-2.92266c-2.39355,-1.90645 -6.34082,-3.69531 -12.21133,-3.69531zM134.29102,51.6c-0.43672,-0.0084 -0.85664,0.11758 -1.21778,0.36113c-0.98262,0.65508 -1.25137,1.99043 -0.58789,2.97305c0.65508,0.99102 1.99043,1.25977 2.97305,0.59629c0.99102,-0.66348 1.25977,-1.99043 0.59629,-2.98145c-0.39473,-0.58789 -1.0582,-0.94902 -1.76367,-0.94902zM37.76777,51.6c-0.73066,-0.0168 -1.41934,0.34434 -1.82246,0.94902c-0.65508,0.99102 -0.39473,2.32637 0.59629,2.98145c0.99101,0.66348 2.31797,0.39473 2.98145,-0.58789c0.65508,-0.99102 0.39472,-2.32637 -0.59629,-2.98145c-0.34434,-0.22676 -0.73906,-0.35274 -1.15899,-0.36113zM83.16973,53.75c5.02226,0 7.87773,1.43613 9.54063,2.75469c1.66289,1.32695 2.05762,2.36836 2.05762,2.36836l0.5459,1.32695h1.43613c3.02344,0 6.28203,0.98262 8.70918,3.13262c2.43555,2.15 4.19082,5.45899 4.19082,10.7668c0,1.36895 -0.06719,3.06543 -0.16797,4.8459c-0.68867,-5.05586 -3.49375,-8.5832 -6.21484,-10.70801c-3.13262,-2.45234 -6.31562,-3.30059 -6.31562,-3.30059l-1.51172,-0.41152l-0.85664,1.31855c0,0 -0.44512,0.82305 -2.50274,1.97363c-2.06601,1.15059 -5.61016,2.41875 -11.45547,2.41875c-3.31738,0 -7.60898,1.15898 -11.36309,3.7793c-3.12422,2.18359 -5.81172,5.56816 -6.63477,10.00254c-0.15117,-1.5957 -0.27715,-3.30898 -0.27715,-5.15664c0,-4.69473 -1.94004,-7.90293 -3.92207,-9.72539c-0.58789,-0.5291 -0.66347,-0.36953 -1.21777,-0.70547c1.0582,-1.22617 2.65391,-3.26699 6.78594,-6.55078c5.22383,-4.14043 12.23652,-8.12969 19.17363,-8.12969zM139.64922,61.63613c-0.28555,-0.0084 -0.57109,0.05039 -0.83984,0.15957c-1.1002,0.45351 -1.6209,1.71328 -1.16738,2.80508c0.46191,1.1002 1.71328,1.6209 2.81348,1.16738c1.1002,-0.45352 1.6209,-1.71328 1.16738,-2.81348c-0.33594,-0.78945 -1.10859,-1.31855 -1.97363,-1.31855zM32.41797,61.63613c-0.89023,-0.0168 -1.69648,0.50391 -2.03242,1.32695c-0.45352,1.1002 0.06719,2.35156 1.15898,2.81348c1.1002,0.45352 2.35996,-0.06719 2.81348,-1.16738c0.45351,-1.10019 -0.06719,-2.35156 -1.16738,-2.80508c-0.24355,-0.10918 -0.50391,-0.15957 -0.77266,-0.16797zM96.61563,69.50547c0.60469,0.19316 1.99043,0.5459 4.00605,2.11641c2.41875,1.89805 4.72832,4.76191 4.72832,9.71699v13.14356l3.2082,-1.81406c0.06719,-0.04199 0.09238,-0.05039 0.15117,-0.08399c0.50391,0.10078 0.94062,0.40313 0.94062,0.94062c0,0.05879 -0.19316,1.11699 -0.46191,2.04082c-0.12597,0.46191 -0.26035,0.92383 -0.37793,1.36055c-0.10918,0.44512 -0.23516,0.73906 -0.23516,1.43613c0,0.31914 -0.21836,0.5375 -0.5375,0.5375h-2.62871l-0.10918,2.04082c-0.47031,9.07031 -7.15547,16.45254 -15.88145,18.00625l-0.61309,0.10918l-0.45352,0.41992c-0.64668,0.57949 -1.44453,0.92383 -2.35156,0.92383c-0.90703,0 -1.70488,-0.34434 -2.35156,-0.92383l-0.45351,-0.41992l-0.61309,-0.10918c-8.72597,-1.55371 -15.41113,-8.93594 -15.88144,-18.00625l-0.10918,-2.04082h-2.62871c-0.31914,0 -0.5375,-0.21836 -0.5375,-0.5375c0,-0.69707 -0.12598,-0.99101 -0.23516,-1.43613c-0.11758,-0.43672 -0.25195,-0.89863 -0.37793,-1.36055c-0.26875,-0.92383 -0.46191,-1.98203 -0.46191,-2.04082c0,-0.5375 0.43672,-0.83984 0.94063,-0.94062c0.05879,0.03359 0.08399,0.04199 0.15117,0.08399l3.2082,1.81406v-7.67617c0,-4.34199 2.1416,-7.22266 5.07266,-9.27187c2.92266,-2.04082 6.68516,-2.99824 8.90234,-2.99824c6.4668,0 10.80039,-1.42774 13.54668,-2.96465c1.67129,-0.93223 1.82246,-1.38574 2.44395,-2.06602zM142.94141,72.52891c-0.14277,-0.0084 -0.28555,0.0084 -0.42832,0.03359c-1.15898,0.23516 -1.91484,1.36895 -1.68809,2.52793c0.23516,1.16738 1.36895,1.92324 2.52793,1.69649c1.16738,-0.23516 1.92324,-1.36895 1.69649,-2.53633c-0.20156,-0.99941 -1.0834,-1.72168 -2.10801,-1.72168zM29.12578,72.52891c-1.0498,-0.0252 -1.95684,0.69707 -2.1668,1.72168c-0.10918,0.5627 0,1.15059 0.31914,1.6209c0.31914,0.47871 0.81465,0.80625 1.37734,0.91543c0.5543,0.10918 1.13379,-0.0084 1.6125,-0.31914c0.47031,-0.31914 0.79785,-0.81465 0.90703,-1.37734c0.23516,-1.15898 -0.5207,-2.29277 -1.67969,-2.52793c-0.12598,-0.0168 -0.24355,-0.03359 -0.36953,-0.03359zM27.95,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM144.05,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM75.25,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM29.07539,95.17109c-0.14278,0 -0.28555,0.0168 -0.42832,0.04199c-1.16738,0.23516 -1.92324,1.36895 -1.68809,2.53633c0.23516,1.15898 1.36055,1.91484 2.52793,1.68809c1.16738,-0.23516 1.92324,-1.36895 1.68809,-2.52793c-0.20156,-1.00781 -1.075,-1.73008 -2.09961,-1.73848zM142.9918,95.17109c-1.04981,-0.0252 -1.95684,0.70547 -2.1668,1.73848c-0.22676,1.15898 0.5291,2.29277 1.68809,2.52793c1.16738,0.22676 2.30117,-0.5291 2.53633,-1.68809c0.22676,-1.16738 -0.5291,-2.30117 -1.69649,-2.53633c-0.11758,-0.0168 -0.23516,-0.03359 -0.36113,-0.04199zM139.68281,106.05547c-0.89023,-0.0168 -1.69648,0.5123 -2.04082,1.33535c-0.45351,1.0918 0.06719,2.35156 1.16738,2.80508c1.1002,0.45352 2.35156,-0.06719 2.81348,-1.15898c0.45351,-1.1002 -0.06719,-2.35996 -1.16738,-2.81348c-0.24355,-0.10078 -0.5123,-0.15957 -0.77266,-0.16797zM32.38438,106.06387c-0.28555,0 -0.57109,0.05039 -0.83984,0.15957c-0.5207,0.21836 -0.94063,0.63828 -1.15898,1.16738c-0.21836,0.5291 -0.21836,1.11699 -0.0084,1.64609c0.46191,1.1002 1.71328,1.6209 2.81348,1.15898c0.5291,-0.20996 0.94902,-0.62988 1.16738,-1.15898c0.21836,-0.5291 0.21836,-1.11699 0,-1.64609c-0.32754,-0.79785 -1.10859,-1.31855 -1.97363,-1.32695zM134.30781,116.1c-0.73066,-0.0168 -1.41934,0.34434 -1.82246,0.94902c-0.66348,0.99102 -0.39473,2.31797 0.58789,2.98145c0.47031,0.31914 1.0582,0.43672 1.6125,0.31914c0.5627,-0.10918 1.0582,-0.43672 1.36895,-0.91543c0.66348,-0.98262 0.39473,-2.31797 -0.59629,-2.97305c-0.33594,-0.23516 -0.73906,-0.36113 -1.15059,-0.36113zM37.75938,116.1c-0.43672,-0.0084 -0.85664,0.11758 -1.21777,0.36113c-0.98262,0.66348 -1.25137,1.99043 -0.59629,2.98145c0.66348,0.98262 1.99883,1.25137 2.98984,0.58789c0.98262,-0.65508 1.25137,-1.99043 0.58789,-2.98145c-0.39473,-0.58789 -1.0582,-0.94062 -1.76367,-0.94902zM44.98203,124.90156c-0.57949,-0.0084 -1.14219,0.21836 -1.54531,0.62988c-0.83984,0.83145 -0.83984,2.20039 0,3.03184c0.83145,0.83984 2.20039,0.83984 3.03184,0c0.83984,-0.83145 0.83984,-2.20039 0,-3.03184c-0.39472,-0.40313 -0.92383,-0.62988 -1.48652,-0.62988zM127.07676,124.90156c-0.57949,-0.0084 -1.14219,0.21836 -1.54531,0.62988c-0.83984,0.83145 -0.83984,2.20039 0,3.03184c0.83145,0.83984 2.20039,0.83984 3.03184,0c0.83984,-0.83145 0.83984,-2.20039 0,-3.03184c-0.39473,-0.40313 -0.92383,-0.62988 -1.48652,-0.62988zM53.79199,132.11582c-0.73066,-0.0168 -1.41934,0.34434 -1.82246,0.94902c-0.66348,0.99102 -0.39473,2.32637 0.59629,2.98984c0.98262,0.65508 2.31797,0.38633 2.97305,-0.59629c0.66348,-0.99101 0.39473,-2.31797 -0.58789,-2.98144c-0.34434,-0.22676 -0.74746,-0.36113 -1.15899,-0.36113zM118.2752,132.11582c-0.43672,-0.0084 -0.85664,0.11758 -1.21777,0.35273c-0.47871,0.31914 -0.80625,0.81465 -0.91543,1.37734c-0.10918,0.5543 0.0084,1.14219 0.32754,1.6125c0.65508,0.98262 1.99043,1.25137 2.98145,0.59629c0.98262,-0.66348 1.25137,-1.99883 0.58789,-2.98984c-0.38633,-0.58789 -1.0498,-0.94902 -1.76367,-0.94902zM63.83652,137.47402c-0.89023,-0.0168 -1.69648,0.51231 -2.03242,1.33535c-0.45352,1.0918 0.06719,2.35156 1.15898,2.80508c1.1002,0.45351 2.35996,-0.06719 2.81348,-1.15899c0.45352,-1.1002 -0.06719,-2.35996 -1.16738,-2.81348c-0.24355,-0.10078 -0.50391,-0.15957 -0.77266,-0.16797zM108.23066,137.47402c-0.28555,0 -0.57109,0.05879 -0.83145,0.16797c-0.5291,0.21836 -0.94902,0.63828 -1.16738,1.15899c-0.21836,0.5291 -0.21836,1.12539 -0.0084,1.65449c0.46191,1.0918 1.71328,1.6125 2.81348,1.15899c0.5291,-0.21836 0.94902,-0.63828 1.16738,-1.15899c0.21836,-0.5291 0.21836,-1.12539 0,-1.64609c-0.32754,-0.80625 -1.10859,-1.32695 -1.97363,-1.33535zM74.7377,140.78301c-1.0498,-0.0252 -1.96524,0.70547 -2.1668,1.73008c-0.23516,1.16738 0.5207,2.29278 1.68809,2.52793c1.16738,0.23516 2.29277,-0.5207 2.52793,-1.68809c0.23516,-1.16738 -0.5207,-2.29277 -1.68809,-2.52793c-0.11758,-0.0252 -0.24356,-0.04199 -0.36113,-0.04199zM97.32949,140.79141c-0.14277,-0.0084 -0.28555,0.0084 -0.41992,0.03359c-1.16738,0.23516 -1.92324,1.36055 -1.69649,2.52793c0.11758,0.5627 0.44512,1.04981 0.91543,1.36895c0.47871,0.31914 1.0582,0.43672 1.6209,0.32754c0.5543,-0.11758 1.0498,-0.44512 1.36895,-0.91543c0.31074,-0.47871 0.42832,-1.0582 0.31914,-1.6209c-0.20156,-0.99941 -1.0834,-1.72168 -2.10801,-1.72168zM86,141.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                                    </div>
+                                                    <div class="col">
+                                                        <div class="fs-12 m-t-5 all-caps m-b-5">User Profile</div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <template v-if="$store.getters.isSuperAdmin">
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="team">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M68.21211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-6.78594,5.54297 -11.11113,11.10274 -11.11113,11.10274l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,6.02168 0.92383,10.88438 1.38574,12.94199c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.19863 5.33301,5.30781c0.39473,8.33125 4.40918,15.68828 10.52324,20.53418v8.02051c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-4.94668,2.33477 -9.91855,5.14824 -13.79024,8.48242c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976v12.9h111.8v-12.9c0,-2.31797 -0.72226,-4.46797 -1.91484,-6.45h32.01484v-8.17168c0,-3.7793 -2.34316,-6.92871 -5.34141,-9.51543c-2.99824,-2.58672 -6.81113,-4.73672 -10.59043,-6.52559c-6.85313,-3.225 -12.95039,-5.00547 -14.16816,-5.3498v-0.5375h22.23906l0.37793,-1.67969c0,0 3.18301,-14.03379 3.18301,-30.17559c0,-10.17891 -2.61191,-18.76211 -6.86152,-24.90977c-4.04805,-5.82851 -9.7002,-9.38945 -15.83105,-9.75059c-0.95742,-1.18418 -5.51778,-6.58437 -13.85742,-6.58437c-5.57656,0 -11.43027,1.34375 -16.60371,3.56934c-0.31074,-0.31074 -0.61309,-0.62988 -0.93223,-0.91543c-3.50215,-3.07383 -7.61738,-4.3084 -11.2623,-4.56875c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM68.21211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94063,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM116.1,34.4c6.9959,0 11.16992,5.57656 11.16992,5.57656l0.64668,0.87344h1.0834c4.87109,0 9.59941,2.76309 13.24434,8.0373c3.65332,5.27422 6.10566,13.01758 6.10566,22.45742c0,14.09258 -2.30117,25.29609 -2.77988,27.55527h-18.60254c5.41699,-3.7541 8.48242,-10.34687 8.48242,-17.60312v-9.95215c0,-5.3918 -1.76367,-9.07871 -3.61973,-11.32949c-1.85605,-2.25078 -3.94726,-3.16621 -3.94726,-3.16621l-1.50332,-0.62988l-1.01621,1.26816c0,0 -1.22617,1.57891 -4.05645,3.09062c-2.82188,1.51172 -7.09668,2.85547 -13.11836,1.96524l-0.62988,4.24961c6.95391,1.03301 12.27012,-0.5375 15.78066,-2.42715c2.40195,-1.28496 2.89746,-2.05762 3.68691,-2.86387c0.41153,0.23516 0.67188,0.25195 1.49492,1.25137c1.26816,1.53691 2.62871,4.10684 2.62871,8.5916v9.95215c0,8.44043 -4.38398,14.95762 -12.11895,16.33496l-0.61309,0.11758l-0.45351,0.41152c-0.51231,0.46191 -1.14219,0.73906 -1.86445,0.73906c-0.72226,0 -1.35215,-0.26875 -1.86445,-0.73906l-0.45352,-0.41152l-0.61309,-0.11758c-7.17227,-1.27656 -11.41348,-7.0043 -12.00137,-14.55449c1.16738,-0.62988 2.07441,-1.65449 2.51953,-2.90586c0.58789,0.94902 1.6209,1.52851 2.73789,1.52851c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225c-0.57109,0 -1.13379,0.15117 -1.6293,0.44512c0.27715,-0.94063 0.5543,-1.91484 0.5543,-3.02344c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.39473,-2.26758 2.02402,-11.97617 2.02402,-18.8041c0,-4.99707 -1.21777,-9.06191 -3.12422,-12.25332c4.41758,-1.74688 9.34746,-2.79668 13.87422,-2.79668zM86,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.46191 -3.10742,-1.22617l-0.45352,-0.41992l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89688c-0.73906,0 -1.20937,-0.50391 -1.20937,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM59.125,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM82.775,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM123.625,75.25c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.93418,88.81348c1.36895,4.19082 3.89688,7.77695 7.41582,10.17891v4.72832c-1.93164,0.57109 -9.98574,3.04023 -17.2,6.60117v-5.99648c4.8375,-3.84649 8.33125,-9.28028 9.78418,-15.51191zM122.55,101.11719v6.38281c-0.25195,0.49551 -1.83926,3.43496 -6.45,3.43496c-4.61074,0 -6.19805,-2.93945 -6.45,-3.43496v-6.37441c0.72227,0.24356 1.45293,0.46191 2.22559,0.62149c1.17578,0.88184 2.62871,1.45293 4.22441,1.45293c1.5957,0 3.05703,-0.57109 4.23281,-1.45293c0.76426,-0.16797 1.50332,-0.37793 2.21719,-0.62988zM58.05,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM105.35,108.21387v0.47031l0.22676,0.45352c0,0 3.2334,6.09726 10.52324,6.09726c7.28984,0 10.52324,-6.09726 10.52324,-6.09726l0.22676,-0.45352v-0.44512c2.23399,0.68027 6.79434,2.1332 12.32891,4.73672c3.56934,1.68809 7.11348,3.72891 9.62461,5.8957c2.51113,2.1668 3.84648,4.3168 3.84648,6.25684v3.87168h-31.20859c-0.44512,-0.42832 -0.90703,-0.84824 -1.38574,-1.25976c-1.44453,-1.24297 -3.08223,-2.39356 -4.77871,-3.50215c0.5207,-0.40313 0.82305,-1.02461 0.82305,-1.68809c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.03301,0 -1.92324,0.73906 -2.11641,1.75527c-1.82246,-1.02461 -3.68691,-2.00722 -5.56816,-2.89746c-5.51777,-2.60351 -10.91797,-4.56035 -14.67207,-5.81172c5.17344,-2.38516 10.81719,-4.2916 13.75664,-5.23223zM53.75,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM122.55,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM27.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM36.55,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM53.75,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM62.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM70.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM105.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Team</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="standardSegment">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M103.92227,17.59053l-9.83877,4.07744l0.13017,10.95576c-1.57504,1.30197 -3.01888,2.74608 -4.32099,4.321l-10.95996,-0.13018l-4.07744,9.83877l7.75596,7.57119c-0.11019,1.02709 -0.22676,2.05006 -0.22676,3.14102c0,1.08989 0.11674,2.11488 0.22676,3.14101l-7.75596,7.57119l4.07744,9.83877l10.95996,-0.13017c1.30164,1.57438 2.74661,3.01935 4.32099,4.32099l-0.13017,10.95996l9.83877,4.07744l7.57119,-7.75596c1.02614,0.11002 2.05112,0.22676 3.14101,0.22676c1.09096,0 2.11393,-0.11657 3.14102,-0.22676l7.57119,7.75596l9.83877,-4.07744l-0.13018,-10.95996c1.57492,-1.30211 3.01903,-2.74596 4.321,-4.32099l10.95576,0.13017l4.07744,-9.83877l-7.75596,-7.56699c0.11027,-1.02745 0.23096,-2.05385 0.23096,-3.14521c0,-1.09099 -0.12077,-2.11391 -0.23096,-3.14102l7.75596,-7.57119l-4.07744,-9.83877l-10.95996,0.13018c-1.30132,-1.57392 -2.74288,-3.01548 -4.3168,-4.3168l0.13018,-10.95996l-9.83877,-4.07744l-7.57119,7.75596c-1.02711,-0.11019 -2.05003,-0.23096 -3.14102,-0.23096c-1.09137,0 -2.11777,0.12068 -3.14521,0.23096zM102.87666,22.67578l6.9875,7.15967l1.0708,-0.14277c1.24766,-0.16622 2.47242,-0.27715 3.69951,-0.27715c1.22709,0 2.45186,0.11092 3.69951,0.27715l1.0708,0.14277l6.9833,-7.15967l4.46377,1.84766l-0.12178,10.00674l0.85664,0.65508c1.96739,1.506 3.72202,3.26064 5.22803,5.22803l0.65508,0.85664l10.00674,-0.12178l1.84766,4.46377l-7.15967,6.9833l0.14277,1.0708c0.16622,1.24765 0.27715,2.47242 0.27715,3.69951c0,1.22709 -0.11094,2.45185 -0.27715,3.69951l-0.14277,1.0708l7.15967,6.9875l-1.84766,4.45957l-10.00674,-0.12178l-0.65508,0.85664c-1.506,1.96739 -3.26064,3.72202 -5.22803,5.22803l-0.85664,0.65928l0.12178,10.00254l-4.46377,1.84766l-6.9833,-7.15547l-1.0708,0.14278c-1.24766,0.16621 -2.47242,0.27295 -3.69951,0.27295c-1.22709,0 -2.45185,-0.10673 -3.69951,-0.27295l-1.0708,-0.14278l-6.9875,7.15547l-4.45957,-1.84766l0.12178,-10.00254l-0.85664,-0.65928c-1.96739,-1.506 -3.72202,-3.26064 -5.22803,-5.22803l-0.65928,-0.85664l-10.00254,0.12178l-1.84766,-4.45957l7.15547,-6.9875l-0.14278,-1.0708c-0.16621,-1.24766 -0.27295,-2.47242 -0.27295,-3.69951c0,-1.22709 0.10673,-2.45186 0.27295,-3.69951l0.14278,-1.0708l-7.15547,-6.9833l1.84766,-4.46377l10.00254,0.12178l0.65928,-0.85664c1.506,-1.96739 3.26064,-3.72202 5.22803,-5.22803l0.85664,-0.65508l-0.0126,-1.0708c0.24311,-0.35649 0.37333,-0.77788 0.37373,-1.20938c0.00046,-0.45042 -0.14055,-0.8896 -0.40312,-1.25557l-0.07978,-6.471zM114.63447,38.01553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM106.03027,40.3209c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.23447,40.3251c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM129.5249,46.61553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM99.73564,46.61973c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM114.63447,48.76553c-4.72418,0 -8.6,3.87582 -8.6,8.6c0,4.72418 3.87582,8.6 8.6,8.6c4.72418,0 8.6,-3.87582 8.6,-8.6c0,-4.72418 -3.87582,-8.6 -8.6,-8.6zM114.63447,53.06553c2.40029,0 4.3,1.89971 4.3,4.3c0,2.40029 -1.89971,4.3 -4.3,4.3c-2.40029,0 -4.3,-1.89971 -4.3,-4.3c0,-2.40029 1.89971,-4.3 4.3,-4.3zM97.43447,55.21553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM131.83447,55.21553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM99.73564,63.81553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM129.5249,63.81973c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.23027,70.11016c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM106.03027,70.11436c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM114.63447,72.41553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM49.45,86c-2.11154,0 -4.12462,0.40493 -5.97969,1.096c-0.06413,0.00938 0.01818,-0.03126 -0.22676,0.05039l0.05459,-0.02099c-4.64514,1.41446 -26.67344,7.55439 -26.67344,7.55439c-0.76639,0.18192 -1.37197,0.76834 -1.57843,1.52848c-0.20646,0.76015 0.01924,1.57234 0.58829,2.11698c0.56905,0.54464 1.39036,0.73454 2.14073,0.49496c0,0 21.52723,-5.99093 26.62725,-7.5376c0.15215,-0.02315 0.30138,-0.06257 0.44512,-0.11758c1.44208,-0.55307 2.98231,-0.86504 4.60234,-0.86504c2.36119,0 4.55577,0.64061 6.4626,1.75107c0.07465,0.04237 0.15178,0.08023 0.23096,0.11338c0.01655,0.00774 0.03373,0.01741 0.05039,0.02519c13.54894,6.39656 41.06534,20.17357 41.13974,20.21084l0.0084,0.0084c-0.12666,-0.06762 -0.11425,-0.05951 0.14697,0.10918c0.0478,0.03134 0.09683,0.06075 0.14697,0.08818c2.03299,1.09607 3.41397,3.17961 3.41397,5.64375c0,1.2892 -0.38041,2.46929 -1.03301,3.48115c-1.89169,2.94404 -5.54832,3.56604 -8.96953,1.91904c-0.04002,-0.01945 -0.08063,-0.03766 -0.12178,-0.05459l-1.46553,-0.59629c-0.71687,-0.31914 -1.55067,-0.22243 -2.17545,0.25233c-0.62478,0.47476 -0.94132,1.25218 -0.82588,2.02834c0.11544,0.77616 0.64453,1.4278 1.38043,1.70019l1.46553,0.59629l-0.12178,-0.05459c4.32595,2.08254 9.60504,1.61508 12.98818,-1.67549l2.33897,1.5999c0.59985,0.40945 1.36585,0.48842 2.03662,0.20996l35.27764,-14.58389l-0.89443,-1.78467c0.50837,1.01501 1.71821,1.45997 2.76309,1.01621c0.76924,-0.32508 1.61096,-0.50391 2.50693,-0.50391c3.58724,0 6.45,2.86276 6.45,6.45c0,2.4485 -1.36482,4.52585 -3.38037,5.63115c-0.98097,0.53722 -1.3863,1.73677 -0.93222,2.75889l-0.80625,-1.81406l-42.38691,22.49941c0.07149,-0.03502 0.00882,-0.00473 -0.08818,0.02519c-0.10074,0.03192 -0.19899,0.07122 -0.29395,0.11758c-1.15922,0.5584 -2.39759,0.88184 -3.71211,0.88184c-1.26631,0 -2.45713,-0.29156 -3.56934,-0.80205c-0.04957,-0.02291 -0.1,-0.04392 -0.15117,-0.06299c-0.16146,-0.0598 -0.18877,-0.07168 -0.07559,-0.02099l-53.41826,-22.596c-0.48138,-0.20312 -1.02025,-0.22402 -1.51592,-0.05879l-25.8,8.6c-1.12711,0.3757 -1.73625,1.59398 -1.36055,2.72109c0.3757,1.12711 1.59398,1.73625 2.72109,1.36055l25.03154,-8.34385l52.61201,22.25166c0.32436,0.14743 0.39308,0.15071 0.31494,0.12178c1.57664,0.70101 3.33724,1.12959 5.21123,1.12959c2.02658,0 3.915,-0.50557 5.57656,-1.30596c0.12964,-0.04597 0.24436,-0.07554 0.40732,-0.15537c0.02118,-0.01085 0.04218,-0.02205 0.06299,-0.03359l44.22197,-23.46943c0.35464,-0.19087 0.64855,-0.4775 0.84824,-0.82725c2.77594,-1.93469 4.78291,-4.96385 4.78291,-8.6084c0,-5.91146 -4.83854,-10.75 -10.75,-10.75c-1.17645,0 -2.26543,0.31974 -3.32998,0.67188h-0.0042c-0.28668,-0.00166 -0.5708,0.05402 -0.83564,0.16377l-36.05449,14.90303l-1.76367,-1.20517c0.48858,-1.22559 1.13799,-2.38764 1.13799,-3.7835c0,-4.08476 -2.32253,-7.62501 -5.67314,-9.43145l0.14697,0.08818c0.07159,0.04625 -0.07108,-0.08802 -0.45352,-0.29395c-0.01805,-0.01006 -0.03625,-0.01986 -0.05459,-0.02939c0,0 -27.6589,-13.85379 -41.33291,-20.30742c-0.01531,-0.00718 -0.03071,-0.01418 -0.04619,-0.021c-0.2354,-0.10462 -0.25894,-0.10527 -0.14278,-0.05879c-2.46942,-1.3791 -5.31271,-2.19619 -8.34385,-2.19619zM62.35,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM68.8,116.1c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM75.25,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM81.7,120.4c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Service Setup</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="customSegment">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M83.26211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-0.69707,0.57109 -1.35215,1.13379 -1.99043,1.70488c-0.36953,-0.0168 -0.73066,-0.03359 -1.10859,-0.03359c-8.80996,0 -16.6541,4.80391 -22.33984,9.43984c-5.69414,4.64434 -9.32226,9.30547 -9.32226,9.30547l-1.99043,2.55313l3.12422,0.83984c0,0 1.0834,0.27715 2.31797,1.43613c1.24297,1.15898 2.54473,3.04863 2.54473,6.79434v14.78125h0.0252c0.05879,1.0918 0.36113,1.99043 0.62148,2.87227c0.14278,0.48711 0.28555,0.94063 0.36953,1.28496c0.09238,0.33594 0.10078,0.67188 0.10078,0.31914c0,2.07441 1.50332,3.48535 3.33418,4.19082c0.25195,6.93711 3.47695,13.09316 8.44883,17.24199v6.96231c-2.86387,0.86504 -8.73437,2.77148 -14.74766,5.55137c-4.16562,1.93164 -8.37324,4.25801 -11.65703,7.02949c-3.29219,2.77988 -5.84531,6.15605 -5.84531,10.1957v11.00195h21.5v8.6h111.8v-8.6h21.5v-11.00195c0,-4.03965 -2.55313,-7.41582 -5.84531,-10.1957c-3.28379,-2.77148 -7.49141,-5.09785 -11.65703,-7.02949c-6.01328,-2.77988 -11.88379,-4.68633 -14.74766,-5.55137v-6.9707c4.97187,-4.14043 8.19687,-10.30488 8.44883,-17.24199c1.83086,-0.69707 3.33418,-2.11641 3.33418,-4.18242c0,0.34434 0.0084,0.0168 0.10078,-0.31914c0.08398,-0.34434 0.22676,-0.79785 0.36953,-1.28496c0.26035,-0.88184 0.5627,-1.78047 0.62148,-2.87227h0.0252v-19.71113c0,-12.26172 -7.40742,-18.21621 -14.05059,-18.77051c-0.43672,-0.60469 -1.01621,-1.6293 -3.14941,-3.07383c-2.7127,-1.83086 -6.9791,-3.59453 -13.03437,-3.59453c-0.26875,0 -0.5375,0.0168 -0.80625,0.0252c-3.36777,-2.7127 -7.22266,-3.84649 -10.65762,-4.09004c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM83.26211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94062,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM116.98184,36.75156c3.46016,0.44512 5.85371,1.57051 7.45781,2.65391c2.05762,1.39414 2.72109,2.55313 2.72109,2.55313l0.62988,1.04141h1.20938c4.41758,0 10.75,3.54414 10.75,14.68887v8.96113c0,-12.40449 -9.64141,-18.32539 -9.64141,-18.32539l-1.6209,-0.97422l-1.16738,1.47812c0,0 -2.26758,2.87226 -7.09668,4.87109c0.10078,-1.46973 0.17637,-2.92266 0.17637,-4.24961c0,-5.23223 -1.34375,-9.43984 -3.41816,-12.69844zM49.85313,36.95313c-2.62031,2.7127 -4.24961,4.72832 -4.24961,4.72832l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,0.05039 0,0.08399 0.0084,0.12598c-0.5459,0.03359 -1.1002,0.05039 -1.67129,0.05039c-3.31738,0 -7.60898,1.15899 -11.36309,3.7877c-3.7625,2.62031 -6.91191,6.95391 -6.91191,12.79922v-9.50703c0,-4.8207 -1.92324,-8.0793 -3.90527,-9.93535c-0.62149,-0.57109 -0.70547,-0.40312 -1.28496,-0.75586c1.02461,-1.23457 2.6875,-3.44336 6.92871,-6.90352c4.36719,-3.56094 9.98574,-6.9707 15.86465,-8.0709zM101.05,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.45351 -3.09902,-1.21777l-0.46191,-0.42832l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89687c-0.73906,0 -1.20938,-0.50391 -1.20938,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM129.0252,53.04453c1.6293,1.15059 6.4248,4.90469 6.4248,13.60547v11.12793l3.15781,-1.65449c0.0252,-0.0168 0.04199,-0.0252 0.06719,-0.03359c0.60469,0.09238 1.075,0.44512 1.075,0.94902c0,0.03359 -0.20156,1.0918 -0.47031,2.01563c-0.14277,0.47031 -0.27715,0.93223 -0.40312,1.36895c-0.11758,0.44512 -0.24355,0.73066 -0.24355,1.45293c0,0.26875 -0.21836,0.5375 -0.65508,0.5375h-2.52793v2.81348c0,9.54062 -6.87832,17.40996 -15.93184,19.02246l-0.61309,0.11758l-0.45352,0.41152c-0.63828,0.58789 -1.44453,0.93223 -2.35156,0.93223c-0.90703,0 -1.71328,-0.34434 -2.35156,-0.93223l-0.45351,-0.41152l-0.61309,-0.11758c-2.40195,-0.42832 -4.65273,-1.31016 -6.65996,-2.53633c4.48477,-4.71152 7.36543,-10.96836 7.69297,-17.93066c2.88906,-0.10078 5.34141,-2.38516 5.34141,-5.30781c0,0.31074 0.0252,-0.09238 0.13438,-0.50391c0.10918,-0.41152 0.27715,-0.95742 0.44512,-1.54531c0.34434,-1.16738 0.76426,-2.35996 0.76426,-3.7541c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.22676,-1.34375 0.88184,-5.375 1.38574,-9.80938c5.03906,-1.6041 7.75176,-3.91367 9.26348,-5.4002zM52.34746,59.78008c0.28555,3.93047 0.88184,7.0043 1.22617,8.52441c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.20703 5.34141,5.30781c0.32754,6.9623 3.2082,13.21074 7.69297,17.91387c-2.01562,1.23457 -4.25801,2.1332 -6.65996,2.56153l-0.61309,0.10918l-0.45352,0.41152c-0.63828,0.58789 -1.44453,0.93223 -2.35156,0.93223c-0.90703,0 -1.71328,-0.34434 -2.35156,-0.93223l-0.45351,-0.41152l-0.61309,-0.10918c-9.05351,-1.6125 -15.93184,-9.49024 -15.93184,-19.03086v-2.81348h-2.52793c-0.43672,0 -0.65508,-0.26035 -0.65508,-0.5375c0,-0.72226 -0.12597,-1.00781 -0.24355,-1.45293c-0.12598,-0.43672 -0.26035,-0.89863 -0.40313,-1.36055c-0.26875,-0.92383 -0.47031,-1.99043 -0.47031,-2.02403c0,-0.50391 0.47871,-0.85664 1.075,-0.94902c0.03359,0.0168 0.04199,0.0168 0.06719,0.03359l3.15781,1.67129v-5.66895c0,-4.35039 2.1416,-7.23105 5.07266,-9.27188c2.92266,-2.04922 6.68516,-3.01504 8.90234,-3.01504c0.62149,0 1.23457,-0.02519 1.82246,-0.05879zM74.175,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.825,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM46.225,75.25c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM125.775,75.25c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM68.8,104.98047v7.35703c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-0.71387,0.33594 -1.41094,0.69707 -2.11641,1.0498c-2.20879,-1.52012 -3.19141,-3.2082 -3.41816,-3.61133v-10.54844c1.88125,0.96582 3.89688,1.70488 6.03008,2.1416c1.31016,1.01621 2.91426,1.72168 4.71992,1.72168c1.75527,0 3.31738,-0.68027 4.60234,-1.64609c3.01504,-0.60469 5.81172,-1.76367 8.29766,-3.38457zM103.2,104.98887c2.47754,1.6041 5.27422,2.75469 8.27246,3.35098c1.29336,0.98262 2.86387,1.67129 4.62754,1.67129c1.80566,0 3.42656,-0.70547 4.73672,-1.73008c2.1248,-0.43672 4.14043,-1.16738 6.01328,-2.1332v10.54844c-0.22676,0.41992 -1.25976,2.06601 -3.46016,3.59453c-0.69707,-0.34434 -1.37734,-0.70547 -2.07441,-1.03301c-7.57539,-3.57773 -15.01641,-5.97969 -18.11543,-6.92031zM73.1,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM40.85,114.78145v3.05703l0.22676,0.44512c0,0 1.0666,2.11641 3.40137,4.23281c-2.74629,1.57891 -5.3582,3.30899 -7.58379,5.22383c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976h-17.2v-6.70195c0,-2.1584 1.51172,-4.54356 4.3168,-6.90352c2.80508,-2.36836 6.72715,-4.58555 10.69121,-6.41641c5.06426,-2.34316 9.92695,-3.99766 12.94199,-4.94668zM131.15,114.78145c3.01504,0.94902 7.87774,2.60351 12.94199,4.94668c3.96406,1.83086 7.88613,4.04805 10.69121,6.41641c2.80508,2.35996 4.3168,4.74512 4.3168,6.90352v6.70195h-17.2c0,-4.68633 -2.92266,-8.67559 -6.79434,-12.00976c-2.22559,-1.91484 -4.8291,-3.63653 -7.57539,-5.22383c2.33477,-2.10801 3.39297,-4.23281 3.39297,-4.23281l0.22676,-0.44512zM68.8,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM17.2,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM144.05,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM152.65,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="announcement">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M140.825,21.5c-4.06484,0 -7.39062,3.30059 -7.49141,7.34863c-17.69551,15.97383 -40.65684,24.90137 -64.53359,24.90137h-30.1c-2.81348,0 -5.20703,1.85605 -6.08047,4.39238c-9.82617,0.89863 -17.56953,9.19629 -17.56953,19.25762v4.3c0,9.90176 7.59219,17.78789 17.2,18.91328v0.43672h0.37793c0.70547,1.93164 2.30957,3.43496 4.3,4.02285c8.49082,8.84355 11.69903,26.55586 12.65645,41.07676c0.50391,7.49141 8.02891,12.58086 15.15918,10.2041l7.48301,-2.49434c5.82012,-1.94844 9.1543,-8.18008 7.43262,-14.10098c-1.91484,-6.60957 -4.96347,-9.33906 -6.90351,-17.2084h2.1332c3.72891,0 6.65996,-3.36777 6.14766,-7.05469l-1.31016,-9.49863c19.8791,2.29278 38.63281,10.7332 53.60723,24.25469c0.10078,4.04805 3.42656,7.34863 7.49141,7.34863c4.13203,0 7.525,-3.39297 7.525,-7.525v-40.21172c4.14043,-0.88184 7.28145,-4.02285 8.16328,-8.16328h0.43672v-2.15c0,-5.17344 -3.71211,-9.52383 -8.6,-10.53164v-39.99336c0,-4.13203 -3.39297,-7.525 -7.525,-7.525zM140.825,25.8c1.80566,0 3.225,1.41934 3.225,3.225v101.05c0,1.80566 -1.41934,3.225 -3.225,3.225c-1.80566,0 -3.225,-1.41934 -3.225,-3.225v-1.84766l-0.69707,-0.63828c-18.03984,-16.56172 -41.50508,-25.8084 -65.95293,-26.3375v-43.40312c24.44785,-0.5291 47.91309,-9.77578 65.95293,-26.3375l0.69707,-0.63828v-1.84766c0,-1.80566 1.41934,-3.225 3.225,-3.225zM135.45,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM38.7,58.05h27.95v43h-27.95c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-38.7c0,-1.21777 0.93223,-2.15 2.15,-2.15zM32.25,62.78672v33.52656c-4.14883,-0.61309 -7.75176,-2.82188 -10.09492,-6.01328h1.49492v-4.3h-3.65332c-0.41152,-1.35215 -0.64668,-2.79668 -0.64668,-4.3h4.3v-4.3h-4.3c0,-1.50332 0.23516,-2.94785 0.64668,-4.3h3.65332v-4.3h-1.49492c2.34316,-3.19141 5.94609,-5.4002 10.09492,-6.01328zM43,64.5v4.3h8.6v-4.3zM135.45,64.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,73.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,73.98184c2.39355,0.94062 4.3,2.82188 4.3,5.56816c0,2.74629 -1.90645,4.62754 -4.3,5.56816zM43,77.4v4.3h8.6v-4.3zM135.45,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,90.3v4.3h8.6v-4.3zM135.45,90.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,98.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM42.23574,105.35h24.55703c0.41153,23.73399 6.27363,27.11016 8.74278,35.60938c1.075,3.72891 -0.97422,7.59219 -4.67793,8.82676l-7.47461,2.48594c-4.56035,1.52012 -9.17949,-1.6041 -9.49863,-6.40801c-0.90703,-13.55508 -3.62812,-29.78926 -11.64863,-40.51406zM70.98359,105.39199c1.45293,0.04199 2.90586,0.10918 4.35879,0.20996l1.44453,10.47285c0.15957,1.19258 -0.69707,2.1752 -1.89805,2.1752h-2.98984c-0.5123,-3.35937 -0.83984,-7.56699 -0.91543,-12.85801zM135.45,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,116.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Announcements</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="postcodes">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M86,15.05c-17.78789,0 -32.25,14.46211 -32.25,32.25c0,15.5791 11.09434,28.60508 25.8,31.60332v63.4082l6.45,16.125l6.45,-16.125v-63.4082c14.70566,-2.99824 25.8,-16.02422 25.8,-31.60332c0,-17.78789 -14.46211,-32.25 -32.25,-32.25zM86,19.35c15.46152,0 27.95,12.48848 27.95,27.95c0,15.46152 -12.48848,27.95 -27.95,27.95c-15.46152,0 -27.95,-12.48848 -27.95,-27.95c0,-15.46152 12.48848,-27.95 27.95,-27.95zM86,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM76.27461,28.38672c-0.36113,0.0168 -0.71387,0.10918 -1.02461,0.29395c-1.02461,0.59629 -1.38574,1.90645 -0.78945,2.93105c0.28555,0.49551 0.75586,0.85664 1.31016,1.00781c0.5459,0.15117 1.13379,0.07559 1.6293,-0.20996c0.49551,-0.28555 0.85664,-0.75586 0.99941,-1.31016c0.15117,-0.5543 0.07559,-1.14219 -0.21836,-1.6377c-0.38633,-0.68027 -1.11699,-1.0918 -1.90644,-1.075zM69.13594,35.475c-0.72226,0.04199 -1.38574,0.44512 -1.75527,1.075c-0.59629,1.02461 -0.24355,2.34316 0.78105,2.93105c0.49551,0.29395 1.0834,0.36953 1.6377,0.21836c0.5543,-0.14277 1.02461,-0.50391 1.31016,-0.99941c0.58789,-1.02461 0.23516,-2.34316 -0.79785,-2.93105c-0.35273,-0.20996 -0.76426,-0.31074 -1.17578,-0.29395zM66.65,45.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,79.55h4.3v61.93848l-2.15,5.375l-2.15,-5.375z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Postcodes</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="stateCharges">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">States Charges</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="warehouseCharges">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Warehouse Charges</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                    </div>
+                </div>
+            </div>
+            <div class="col bg-master-lightest p-l-25 p-r-25 p-t-15 p-b-15">
+                <div class="row tabsContainer tabContent" tab-name="profile">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                <div class="row m-b-25">
+                                    <div class="col p-b-15 b-b b-grey">
+                                        <div class="font-heading all-caps fs-10 hint-text">
+                                            Account Settings
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row no-margin ">
+                                            <div class="col parentContainer">
+                                                <user-profile-component></user-profile-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <template v-if="$store.getters.isSuperAdmin">
+                    <div class="row tabsContainer hide tabContent" tab-name="team">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('accountsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('accountsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Admin Accounts
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Add Admin Account
+                                            </button>
+                                            <modal-form-component section="accountsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <user-form-component :section="section"></user-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="accountsSection" :endpoint="route('api.account.user.list')" :options="{'type': 2}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <user-component :data="data"></user-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="standardSegment">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12 hint-text">
+                                                Service Configuration
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <div class="row align-items-center parentContainer">
+                                                <div class="col-auto m-r-50">
+                                                    <div class="row m-b-5">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
+                                                        </div>
+                                                    </div>
+                                                    <payment-attempt-component :segment_id="1"></payment-attempt-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20 parentContainer">
+                                        <div class="col">
+                                            <div class="row align-items-center m-l-0 m-r-0 m-b-10 p-b-5 b-b b-grey">
+                                                <div class="col p-l-0">
+                                                    <div class="font-heading all-caps fs-10 hint-text muted">
+                                                        Exchange Services
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-r-0">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Create New Service
+                                                    </button>
+                                                    <modal-form-component size="large" section="serviceTypeSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <service-form-component :section="section"></service-form-component>
+                                                        </template>
+                                                    </modal-form-component>
+                                                </div>
+                                            </div>
+                                            <list-component section="serviceTypeSection" :endpoint="route('api.service_type.list')">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <service-component :data="data"></service-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="customSegment">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('segmentsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('segmentsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Custom Segments
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Create Segment
+                                            </button>   
+                                            <modal-form-component section="segmentsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <segment-form-component :section="section"></segment-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="segmentsSection" :endpoint="route('api.segment.list')" :options="{'type': 2}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <segment-component :data="data"></segment-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="announcement">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('announcementsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('announcementsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Announcements
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Create Announcement
+                                            </button>
+                                            <modal-form-component section="allAnnouncementsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <announcement-form-component :section="section"></announcement-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="allAnnouncementsSection" :endpoint="route('api.announcement.list')" :options="{}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <announcement-list-component :data="data"></announcement-list-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="postcodes">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('postcodes')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('postcodes')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Postcodes
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="allPostcodesSection" :endpoint="route('api.address.district.list')" :options="{country_id: 1}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <list-postcode-component :data="item" v-for="item in JSON.parse(data.postcode)"></list-postcode-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="stateCharges">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('postcodes')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('postcodes')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                State Charges
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="allStateChargesSection" :endpoint="route('api.address.state.list')" :options="{country_id: 1}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <states-charges-component :data="data"></states-charges-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="warehouseCharges">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('postcodes')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('postcodes')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Warehouse Charges
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                        <list-component key="2" section="warhouseListSection" :endpoint="route('api.company.list')" :options="{'has_business_module_type': 3}">
+                                            <template slot="list" slot-scope="{data}">
+                                            <warehouse-charges-component :data="data"></warehouse-charges-component>
+                                            </template>
+                                        </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/unclaimed_packinglist.blade.php b/resources/views/pages/unclaimed_packinglist.blade.php
new file mode 100644
index 00000000..451ea574
--- /dev/null
+++ b/resources/views/pages/unclaimed_packinglist.blade.php
@@ -0,0 +1,13 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col-7">
+            <list-component section="unclaimedPackinglistSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1, status: 4}">
+                <template slot="list" slot-scope="{data}">
+                    <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>
+                </template>
+            </list-component>
+
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index d3a15ad2..685d3f27 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -17,6 +17,15 @@
                     </div>
                 </div>
             </div>
+            <div class="col-auto m-r-5 d-none d-md-inline">
+                <a href="{{route('settings')}}">
+                    <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
+                        <div class="col p-r-10 p-l-10">
+                            <i class="fa fa-cog fs-18 m-t-5 muted"></i>
+                        </div>
+                    </div>
+                </a>
+            </div>
             <div class="col-auto p-r-20 d-none d-md-inline">
                 <logout-component></logout-component>
             </div>
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index c32eb3df..cf62bda3 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -129,6 +129,14 @@
                                 <a href="{{route('template.shipping-queue')}}"><h6 class="no-margin light fs-18 all-caps">Shipping Queue</h6></a>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center d-md-none">
+                            <div class="col-auto p-r-0">
+                                <i class="fa fa-cog fs-25 m-t-5 text-dark"></i>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('settings')}}"><h6 class="no-margin light fs-18 all-caps">Settings</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 justify-content-center d-md-none">
                             <div class="col">
                                 <logout-component></logout-component>
diff --git a/routes/address.php b/routes/address.php
index 5b3c6a1b..96cfe8ab 100644
--- a/routes/address.php
+++ b/routes/address.php
@@ -11,6 +11,8 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
 
     Route::get('district/list', 'ListDistrictsController@list')->name('district.list');
 
+    Route::get('state/list', 'ListStatesController@list')->name('state.list');
+
     Route::post('/create', 'CreateAddressController@create')->name('create');
 
     Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
diff --git a/routes/announcement.php b/routes/announcement.php
index 6b460a01..b6016706 100644
--- a/routes/announcement.php
+++ b/routes/announcement.php
@@ -5,12 +5,11 @@ use Illuminate\Support\Facades\Route;
 Route::group(['prefix' => 'announcement', 'as' => 'announcement.', 'namespace' => 'Announcements'], function () {
     Route::get('/list', 'ListAnnouncementsController@list')->name('list');
     Route::post('/create', 'CreateAnnouncementController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update');
+    Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update');    
     Route::delete('/delete/{id}', 'DeleteAnnouncementController@delete')->name('delete');
-
-    Route::group(['prefix' => '/{id}/segment', 'as' => 'segment.'], function () {
+    
+    Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
         Route::post('/assign', 'AssignAnnouncementToSegmentController@assign')->name('assign');
         Route::delete('/detach/{segment_id}', 'RemoveSegmentFromAnnouncementController@detach')->name('detach');
     });
-
 });
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index b53b1b95..c8f886e1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -52,6 +52,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/segment.php';
 
+        require __DIR__ . '/announcement.php';
+
         Route::get('/report/customer/{marking}/{from?}/{to?}', 'Reports\MonthlyReportController@customerReport')->name('report.customer');
         Route::get('/report/sales/{from?}/{to?}', 'Reports\MonthlyReportController@salesReport')->name('report.sales');
         Route::get('/report/profit/{model}/{value}/{from?}/{to?}', 'Reports\MonthlyReportController@profitModelReport')->name('report.profit');
diff --git a/routes/company.php b/routes/company.php
index 7d898117..55c731b2 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -9,6 +9,8 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
 
+    Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
+
     Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
         Route::post('/assign', 'AssignCompanyToSegmentController@assign')->name('assign');
         Route::delete('/detach/{segment_id}', 'RemoveCompanyFromSegmentController@detach')->name('detach');
diff --git a/routes/document.php b/routes/document.php
index 12419c9e..06f6badc 100644
--- a/routes/document.php
+++ b/routes/document.php
@@ -6,4 +6,6 @@ Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Docum
     Route::get('/list', 'ListDocumentsController@list')->name('list');
     Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
     Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
+
+    Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
 });
\ No newline at end of file
diff --git a/routes/packing_list.php b/routes/packing_list.php
index 6716ada9..fe889ddb 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -17,6 +17,8 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
     Route::put('/update-drop-date/{id}', 'UpdateDropDatePackingListController@update')->name('update_drop_date');
     Route::put('/complete/{id}', 'CompletePackingListController@complete')->name('complete');
     Route::put('/assign-remark/{id}', 'AssignPackingListRemarkController@create')->name('assign.remark');
+    Route::put('/assign-order/{id}/{reference}', 'AssignPackingListOrderController@assign')->name('assign.order');
+
 
     Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () {
         Route::get('/{id}/show', 'FetchContainerController@fetch')->name('show');
diff --git a/routes/segment.php b/routes/segment.php
index edde7247..ada2b84d 100644
--- a/routes/segment.php
+++ b/routes/segment.php
@@ -5,4 +5,13 @@ use Illuminate\Support\Facades\Route;
 Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segments'], function () {
     Route::post('/create', 'CreateSegmentController@create')->name('create');
     Route::delete('/delete/{id}', 'DeleteSegmentController@destroy')->name('delete');
+    Route::get('/{id}/show', 'FetchSegmentController@fetch')->name('show');
+    Route::put('/update/{id}', 'UpdateSegmentController@update')->name('update');
+    Route::get('/list', 'ListSegmentsController@list')->name('list');
+
+    Route::group(['prefix' => '{id}/constant', 'as' => 'constant.'], function () {
+        Route::put('/service/update', 'UpdateCustomServiceConstantController@update')->name('service.update');
+        Route::put('/update', 'UpdateConstantController@update')->name('update');
+        Route::get('/show/{reference}', 'FetchConstantController@fetch')->name('show');
+    });
 });
\ No newline at end of file
diff --git a/routes/transaction.php b/routes/transaction.php
index cab4d241..7b4f7fd0 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -5,11 +5,13 @@ use Illuminate\Support\Facades\Route;
 Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' => 'transaction.'], function () {
 
     Route::get('/list', 'ListTransactionsController@list')->name('list');
-    Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
+    // Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
 
-    route::post('/supplier/{id}/bill/create', 'CreateSupplierTransactionController@create')->name('supplier.create');
-    route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
+    route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('supplier.create');
 
-    Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
+
+    // route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
+
+    // Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
 
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index fba7ac9f..e29f6333 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,7 +3,6 @@
 use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
 use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
 use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
-use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
@@ -64,6 +63,10 @@ Route::get('/orders', function () {
     return view('pages.orders.index');
 })->name('orders');
 
+Route::get('/orders-table', function () {
+    return view('pages.orders.table');
+})->name('ordersTable');
+
 Route::get('/order/show/{order_number}', function ($orderNumber) {
     return view('pages.orders.profile', ['id' => $orderNumber]);
 })->name('order.show');
@@ -76,6 +79,10 @@ Route::get('/warehouse-list', function () {
     return view('pages.warehouse_list');
 })->name('warehouse.list');
 
+Route::get('/unclaimed-packinglist', function () {
+    return view('pages.unclaimed_packinglist');
+})->name('unclaimed-packinglist.list');
+
 Route::get('/containers', function () {
     return view('pages.containers');
 })->name('containers');
@@ -186,3 +193,11 @@ Route::get('/yd', function (){
 });
 
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
+Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListController@export')->name('container.packaging_list.export');
+
+Route::get('/settings', function () {
+    return view('pages.settings');
+})->name('settings');
+Route::get('/settings', function () {
+    return view('pages.settings');
+})->name('settings');