From decb6265eb2ac7ae053e6b4450f2e1b4ada43b9e Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Mon, 2 Aug 2021 23:42:51 +0800
Subject: [PATCH 01/12] add: list order api.

---
 .../ControllersLogic/ListOrdersLogic.php      | 55 +++++++++++++++++++
 .../Modules/Orders/Services/ListsOrders.php   | 31 +++++++++++
 .../Orders/Standards/Rules/CanListOrders.php  | 40 ++++++++++++++
 .../Orders/ListOrdersController.php           | 22 ++++++++
 4 files changed, 148 insertions(+)
 create mode 100644 app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
 create mode 100644 app/Classes/Modules/Orders/Services/ListsOrders.php
 create mode 100644 app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php
 create mode 100644 app/Http/Controllers/Orders/ListOrdersController.php

diff --git a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
new file mode 100644
index 00000000..bf960049
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
@@ -0,0 +1,55 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Http\Resources\OrderResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListOrdersLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Orders',
+            'message' => 'You have successfully retrieved a list of Orders'
+        ];
+    }
+
+    /** @var CanListOrders */
+    private $canListOrders;
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /**
+     * ListOrdersLogic constructor.
+     * @param CanListOrders $canListOrders
+     * @param ListsOrders $listsOrders
+     */
+    public function __construct(CanListOrders $canListOrders, ListsOrders $listsOrders)
+    {
+        $this->canListOrders = $canListOrders;
+        $this->listsOrders = $listsOrders;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListOrders->passes();
+
+        $query = $this->listsOrders->execute($this->listsOrders->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(OrderResource::collection($query));
+
+    }
+
+
+
+}
diff --git a/app/Classes/Modules/Orders/Services/ListsOrders.php b/app/Classes/Modules/Orders/Services/ListsOrders.php
new file mode 100644
index 00000000..8b9c835b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/ListsOrders.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Services;
+
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\Order;
+
+class ListsOrders extends AbstractListRecord
+{
+    /** @var Order */
+    private $repository;
+
+    /**
+     * ListsOrders constructor.
+     * @param Order $repository
+     */
+    public function __construct(Order $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php b/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php
new file mode 100644
index 00000000..b7d48485
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php
@@ -0,0 +1,40 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+
+
+class CanListOrders extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param BookingObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param BookingObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Http/Controllers/Orders/ListOrdersController.php b/app/Http/Controllers/Orders/ListOrdersController.php
new file mode 100644
index 00000000..05a886fa
--- /dev/null
+++ b/app/Http/Controllers/Orders/ListOrdersController.php
@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Orders;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Orders\ControllersLogic\ListOrdersLogic;
+
+
+class ListOrdersController
+{
+    /**
+     * @param Request $request
+     * @param ListOrdersLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListOrdersLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

From 73505b140c9522fcca52b29ad61b18a4f68cf3a4 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 02:45:58 +0800
Subject: [PATCH 02/12] add: eloquent polymorph with companyModule filter.

---
 .../Filters/HasMorphCompanyModule.php         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php

diff --git a/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php b/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php
new file mode 100644
index 00000000..ad80e9d0
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasMorphCompanyModule implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        logger("calling");
+        return $builder->whereHasMorph('owner', ['App\Models\CompanyModule'], function ($query) use($value) {
+                $query->where('id',$value);
+            });
+    }
+}

From 60210fc6769c651c51ca29d9320857ddc6c345b8 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 02:49:20 +0800
Subject: [PATCH 03/12] fix: save address with companyModule polymorph
 relationship.

---
 .../ControllersLogic/CreateAddressLogic.php   | 16 ++++-----
 .../Addresses/Services/CreatesAddress.php     |  6 ++--
 .../Services/FetchesCompanyModule.php         | 34 +++++++++++++++++++
 3 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 app/Classes/Modules/Companies/Services/FetchesCompanyModule.php

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index e8d432b8..d746ac31 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -8,7 +8,7 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Http\Resources\AddressResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -33,8 +33,8 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
-    /** @var FetchesCompany */
-    private $fetchesCompany;
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
 
     /** @var CreatesAddress */
     private $createsAddress;
@@ -43,14 +43,14 @@ class CreateAddressLogic extends AbstractControllerLogic
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
-     * @param FetchesCompany $fetchesCompany
+     * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatesAddress $createsAddress
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
-        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsAddress = $createsAddress;
     }
 
@@ -70,10 +70,10 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $this->canCreateAddress->passes($object);
 
-        $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+        $query = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
         return $this->resourceResponse(new AddressResource($query));
 
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/CreatesAddress.php b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
index e6a7b8b3..0e650f07 100644
--- a/app/Classes/Modules/Addresses/Services/CreatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
@@ -6,7 +6,7 @@ use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Models\Address;
-use App\Models\Company;
+use App\Models\CompanyModule;
 
 class CreatesAddress extends AbstractUpdateRelationshipRecord
 {
@@ -17,7 +17,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $company, AddressObject $object) {
+    public function execute(CompanyModule $companyModule, AddressObject $object) {
         $model = new Address();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
@@ -26,7 +26,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
 
-        return $this->handler($company->addresses(), $model);
+        return $this->handler($companyModule->addresses(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php b/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php
new file mode 100644
index 00000000..f04d39cc
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\CompanyModule;
+
+class FetchesCompanyModule extends AbstractFetchRecord
+{
+
+    /** @var Company */
+    private $repository;
+
+
+    /**
+     * FetchesCompany constructor.
+     * @param Company $repository
+     */
+    public function __construct(CompanyModule $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file

From 96342f6e01a5d4ee923bd14eb44159a821f9b15f Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 02:58:35 +0800
Subject: [PATCH 04/12] add: component of create order.

---
 .../address/forms/AddressFormComponent.vue    | 128 +++++++++++++++
 .../elements/orderInstructionComponent.vue    |  63 ++++++++
 .../orders/elements/orderListComponent.vue    |  86 ++++++++++
 .../orders/forms/selectAddressComponent.vue   |  86 ++++++++++
 .../orders/forms/selectWarehouseComponent.vue |  79 +++++++++
 .../orders/sections/createOrderComponent.vue  | 151 ++++++++++++++++++
 .../validation/createOrderFormValidation.js   |  14 ++
 7 files changed, 607 insertions(+)
 create mode 100644 resources/assets/vue/components/address/forms/AddressFormComponent.vue
 create mode 100644 resources/assets/vue/components/orders/elements/orderInstructionComponent.vue
 create mode 100644 resources/assets/vue/components/orders/elements/orderListComponent.vue
 create mode 100644 resources/assets/vue/components/orders/forms/selectAddressComponent.vue
 create mode 100644 resources/assets/vue/components/orders/forms/selectWarehouseComponent.vue
 create mode 100644 resources/assets/vue/components/orders/sections/createOrderComponent.vue
 create mode 100644 resources/assets/vue/general/mixins/accounts/validation/createOrderFormValidation.js

diff --git a/resources/assets/vue/components/address/forms/AddressFormComponent.vue b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
new file mode 100644
index 00000000..6bd8840d
--- /dev/null
+++ b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
@@ -0,0 +1,128 @@
+<template>
+    <div class="row p-t-25 text-left">
+        <div class="col">
+
+             <div class="shadow p-3 bg-white rounded">
+        <div class="d-flex flex-row align-items-center">
+            <input type="radio" name="answer" id="answer-2"
+                v-model="computeAddressId"                
+                :value='-1'
+                :checked="new_address == true"
+            >                                        
+            <label for="answer-2" data-question-number="2" class="mb-0 pl-2 pl-md-2 bold">Add New Address</label>
+        </div>
+        <div class="col-0" v-if="computeAddressId==-1">
+            <div class="d-flex flex-column flex-sm-row">
+                <div class="col px-0 pr-sm-2">
+                    <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
+                    <label class="text-primary fs-12">District</label>
+                    <div class="controls">
+                        <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                    </div>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col px-0 pl-sm-2">
+                    <validation-wrapper-component :validator="$v.parameters.post_code">
+                    <label class="text-primary fs-12">Post Code</label>
+                    <div class="controls">
+                        <input type="text" class="form-control fs-12" v-model="parameters.post_code">
+                    </div>
+                    </validation-wrapper-component>
+                </div>
+            </div>
+
+            <div class="d-flex flex-column flex-sm-row">
+                <div class="col px-0 pr-sm-2">
+                    <validation-wrapper-component :validator="$v.parameters.street_one">
+                    <label class="text-primary fs-12">Street one</label>
+                    <div class="controls">
+                        <input type="text" class="form-control fs-12"
+                        v-model="parameters.street_one"
+                        >
+                    </div>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col px-0 pl-sm-2">
+                    <validation-wrapper-component :validator="$v.parameters.street_two">
+                    <label class="text-primary fs-12">Street two</label>
+                    <div class="controls">
+                        <input type="text" class="form-control fs-12"
+                        v-model="parameters.street_two"
+                        >
+                    </div>
+                    </validation-wrapper-component>
+                </div>
+            </div>
+
+             <div class="row  m-t-25">
+                <div class="col">
+                    <div class="row">
+                        <div class="col text-right">
+                            <button type="button" class="btn btn-sm btn-primary b-rad-none" @click="submitForm()">New Address</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required ,requiredIf } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            address_id: null
+        },
+        watch: {
+        },
+        data() {
+			return {
+                parameters : {
+                    company_module_id:this.$store.getters.getCompanyModuleId,
+                    street_one: '',
+                    street_two: '',
+                    district_id: '',
+                    post_code: '',
+				},
+                new_address:false
+
+            }            
+		},
+
+        computed: {
+            computeAddressId:{
+                get() {
+                     return this.address_id;
+                },
+                set(val) {                    
+                    this.$emit('input', val);
+                }
+
+            },
+
+        },
+        
+        validations: {
+            parameters: {
+                street_one: { required:requiredIf(function () { return this.computeAddressId === -1 }) },
+                street_two: {},
+                district_id: { required },
+                post_code: { required },                
+            }
+        },
+        methods:{
+            submitForm(){
+                if(!this.validate()){
+                    return;
+                }
+                this.isLoading = true;
+                this.submit((this.route('api.address.create')), 'post', 'addressList', true, true);
+            },
+            successHandler(response){
+                this.$emit('input', response.payload.data.id);
+                this.resetForm();                
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/elements/orderInstructionComponent.vue b/resources/assets/vue/components/orders/elements/orderInstructionComponent.vue
new file mode 100644
index 00000000..1fd8c06d
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/orderInstructionComponent.vue
@@ -0,0 +1,63 @@
+<template>
+    <div>
+        <div class="row">
+            <div class="col">
+                <div class="row m-b-20">
+                    <div class="col">
+                        <div class="font-heading fs-18 text-primary all-caps m-b-50">
+                            Order instruction
+                        </div>
+                        <div class="row align-items-center">
+                            <div class="col">
+                                <div class="card" style="width: 18rem">
+                                    <div class="card-body">
+                                        <h5 class="card-title">Step 1</h5>
+                                        <h6 class="card-subtitle mb-2 text-muted">Card subtitle</h6>
+                                        <p class="card-text">
+                                            Some quick example text to build on the card title and
+                                            make up the bulk of the card's content.
+                                        </p>                    
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="card" style="width: 18rem">
+                                    <div class="card-body">
+                                        <h5 class="card-title">Step 2</h5>
+                                        <h6 class="card-subtitle mb-2 text-muted">Card subtitle</h6>
+                                        <p class="card-text">
+                                            Some quick example text to build on the card title and
+                                            make up the bulk of the card's content.
+                                        </p>                    
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="card" style="width: 18rem">
+                                    <div class="card-body">
+                                        <h5 class="card-title">Step 3</h5>
+                                        <h6 class="card-subtitle mb-2 text-muted">Card subtitle</h6>
+                                        <p class="card-text">
+                                            Some quick example text to build on the card title and
+                                            make up the bulk of the card's content.
+                                        </p>                    
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+
+export default {
+  data() {
+    return {
+    };
+  },
+  methods: {},
+};
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/elements/orderListComponent.vue b/resources/assets/vue/components/orders/elements/orderListComponent.vue
new file mode 100644
index 00000000..384b7943
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/orderListComponent.vue
@@ -0,0 +1,86 @@
+<template>
+    <div>
+        <div class="row">
+            <div class="col">
+                <div class="row m-b-20">
+                    <div class="col">
+                        <div class="font-heading fs-18 text-primary all-caps">Completed QR Code</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row m-b-15">
+            <div class="col">
+                <slot name="createOrderButton"></slot>
+            </div>
+        </div>
+
+        <div class="row  m-b-15">
+            <div class="col">
+                <nav>
+                    <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                        <a class="nav-item nav-link active" v-show="section!='orderList'" id="nav-order-completed-tab" data-toggle="tab" href="#nav-order-completed" role="tab" aria-controls="nav-order-completed" aria-selected="true">Completed</a>
+                        <a class="nav-item nav-link" id="nav-order-history-tab" data-toggle="tab" href="#nav-order-history" role="tab" aria-controls="nav-order-history" aria-selected="tab">Order History</a>
+                    </div>
+                </nav>
+                <div class="tab-content" id="nav-tabContent">
+                    <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="!completedOrder && section!='orderList'" ></loading-component>
+                    <div class="tab-pane fade show active" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab">
+                        <!-- each order component-->
+                        <div class="card m-t-15" v-if="completedOrder">
+                            <div class="card-body">
+                                <h5 class="card-title">Parcel Information</h5>
+                                <h6 class="card-subtitle mb-2 text-muted">Order Number {{completedOrder.id}}</h6>
+                                <h5 class="card-title">Delivery Information</h5>
+                                <h6 class="card-subtitle mb-2 text-muted">subtitle</h6>
+                                <p class="card-text">{{completedOrder}}</p>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="tab-pane fade" id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab">
+                        <list-component key="2" section="purchaseOrderSection1" :endpoint="route('api.order.list')" :options="{per_page: 10, CompanyModuleId :company_module_id}">
+                            <template slot="list" slot-scope="{data}">
+                                <div class="card m-t-15">
+                            <div class="card-body">
+                                <h5 class="card-title">title</h5>
+                                <h6 class="card-subtitle mb-2 text-muted">subtitle</h6>
+                                <p class="card-text">{{data}}</p>
+                            </div>
+                        </div>
+                            </template>
+                        </list-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            company_module_id:{
+                type: Number,
+                default: 1
+            },
+            completedOrder:{
+                default: null
+            },
+            section:null,
+        },
+        data(){
+          return {
+            }
+        },
+        computed: {
+        },
+        watch: {
+        },
+        created(){
+        },
+        methods: {
+        },
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/forms/selectAddressComponent.vue b/resources/assets/vue/components/orders/forms/selectAddressComponent.vue
new file mode 100644
index 00000000..b17e5c83
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/selectAddressComponent.vue
@@ -0,0 +1,86 @@
+<template>
+    <div>
+        <div class="row">
+            <div class="col">
+                <div class="row m-b-20">
+                    <div class="col">
+                        <div class="font-heading fs-18 text-primary all-caps m-b-50">Select Address</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row  m-b-15">
+            <div class="col">
+                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+                <list-component v-show="!isLoading" key="2" section="addressList" :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule :company_module_id}">
+                    <template slot="list" slot-scope="{data}">
+                        <div class="shadow p-3 mb-3 bg-white rounded">
+                            <div class="d-flex flex-column flex-md-row align-items-center">
+                                <div class="flex-row align-self-start pb-2 pb-sm-0">
+                                    <input type="radio" name="answer" id="answer-1"
+                                        v-model="computeAddress"
+                                        :value="data.id"
+                                    >
+                                    <label for="answer-1" data-question-number="1" class="mb-0 pl-2 pl-md-2 bold">[name]</label>
+                                </div>
+                                <div>
+                                    <span class="fs-12 pl-sm-3 pl-lg-5" style="color: #a6a6a6;">{{data.country.name}}  {{data.street_one}} {{data.street_two}} {{data.post_code}} {{data.district.name}} {{data.state.name}}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </list-component>
+            </div>
+        </div>
+        <div class="row m-b-15">
+            <div class="col">
+                <slot name="addressForm" :data="item"></slot>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            company_module_id: {
+                type: Number,
+                default: 1
+            },
+            address_id:null
+        },
+        data(){
+            return {
+                isLoading: false,
+                createAddress: false,
+                selectedAddress: null,
+                item:{
+                    id:null
+                },
+                status:{
+                    error:false,
+                    message:null,
+                    direction:null,
+                },
+            }
+        },
+        computed: {
+            computeAddress:{
+                get() {
+                     return this.address_id;
+                },
+                set(val) {
+                    this.$emit('input', val);
+                }
+            },
+        },
+        watch: {
+        },
+        created(){
+        },
+        methods: {
+        },
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/forms/selectWarehouseComponent.vue b/resources/assets/vue/components/orders/forms/selectWarehouseComponent.vue
new file mode 100644
index 00000000..1480b515
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/selectWarehouseComponent.vue
@@ -0,0 +1,79 @@
+<template>
+    <div>
+        <div class="row">
+            <div class="col">
+                <div class="row m-b-20">
+                    <div class="col">
+                        <div class="font-heading fs-18 text-primary all-caps m-b-50">Select Warehouse</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row  m-b-15">
+            <div class="col">
+                <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.company.list')" :options="{per_page: 10, status: 2 ,WithCompanyModuleType :4}">
+                    <template slot="list" slot-scope="{data}">
+                        <div class="shadow p-3 mb-3 bg-white rounded">
+                            <div class="d-flex flex-column flex-md-row align-items-center">
+                                <div class="flex-row align-self-start pb-2 pb-sm-0">
+                                    <input type="radio" name="warehouse"
+                                        v-model="computeWarehouse"
+                                        :value="data.id"
+                                    >
+                                    <label for="answer-1" data-question-number="1" class="mb-0 pl-2 pl-md-2 bold">{{data.name}}</label>
+                                </div>
+                                <div>
+                                    <span class="fs-12 pl-sm-3 pl-lg-5" style="color: #a6a6a6;">GuangZhou, China </span>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </list-component>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        warehouse: null,
+    },
+    data() {
+        return {
+            isLoading: true,
+            billingAddress: [],
+            createAddress: false,
+            addressDropdownLaunch: {
+                status: false,
+            },
+            selectedAddress: null,
+            item: {
+                id: null,
+            },
+            status: {
+                error: false,
+                message: null,
+            },
+        };
+    },
+    computed: {
+        computeWarehouse: {
+            get() {
+                return this.warehouse;
+            },
+            set(val) {
+                this.$emit("input", val);
+            },
+        },
+    },
+    watch: {
+    },
+    created() {
+    },
+    methods: {
+    },
+};
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/createOrderComponent.vue b/resources/assets/vue/components/orders/sections/createOrderComponent.vue
new file mode 100644
index 00000000..f6fc8196
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/createOrderComponent.vue
@@ -0,0 +1,151 @@
+<template>
+    <div class="row">
+        <div class="col ">
+            <div class="col">
+
+                <section  v-if="step === 1" class="m-b-20">
+                    <order-instruction-component  v-if="step === 1" :section="section" v-show="$store.getters.getOrder == 0" v-on:updateStatus="updateStatus($event)"></order-instruction-component>
+                </section>
+
+                <section v-if="step === 2"  class="m-b-20">
+                    <validation-wrapper-component :validator="$v.parameters.warehouse_id" class="m-b-15">
+                        <select-warehouse-component
+                            :section="section"
+                            :warehouse="parameters.warehouse_id"
+                            @input="parameters.warehouse_id = $event"
+                        >
+                        </select-warehouse-component>
+                    </validation-wrapper-component>
+                </section>
+
+                <section v-if="step === 3" class="m-b-20">
+                    <validation-wrapper-component :validator="$v.parameters.address_id">
+                        <select-address-component
+                            :section="section"
+                            :key="parameters.address_id"
+                            :company_module_id="parameters.company_module_id"
+                            :address_id="parameters.address_id"
+                            @input="parameters.address_id = $event"
+                        >
+
+                            <template slot="addressForm">
+                                <div class="row">
+                                    <div class="col">
+                                        <address-form-component
+                                            :address_id="parameters.address_id"
+                                            @input="parameters.address_id = $event"
+                                        ></address-form-component>
+                                    </div>
+                                </div>
+                            </template>
+
+                        </select-address-component>
+                    </validation-wrapper-component>
+                </section>
+
+                <section v-if="step === 4" class="m-b-20">
+                    <order-list-component :section="section"
+                    :company_module_id="parameters.company_module_id"
+                    :completedOrder="completedOrder"
+                    ></order-list-component>
+                </section>
+
+                <div class="row">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col text-center" v-if="step === 1">
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="changeStep('next')">Next</button>
+                            </div>
+                            <div class="col text-center" v-if="step === 2">
+                                <button v-show="!this.$store.getters.orderExist" type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="changeStep('back')">Back</button>
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="changeStep('next')">Next</button>
+                            </div>
+                            <div class="col text-center" v-if="step === 3">
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="changeStep('back')">Back</button>
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="createOrder">Next(create order)</button>
+                            </div>
+                            <div class="col text-center" v-if="step === 4">
+                                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="changeStep('reset')">Done</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import CreateOrderformValitaion from '../../../general/mixins/accounts/validation/createOrderFormValidation';
+    export default {
+        data() {
+            return {
+                section: 'createOrderSection',
+                error: '',
+                step: this.$store.getters.orderExist==0?1:2,
+                parameters : {
+                    email: '',
+                    warehouse_id:'',
+                    address_id:'',
+                    company_module_id:this.$store.getters.getCompanyModuleId,
+                    street_one:'',
+                    street_two:'',
+                    district_id:'',
+                    post_code:'',
+                },
+                completedOrder:null,
+                  status:{
+                    error:false,
+                    message:null,
+                    direction:null,
+                },
+            }
+        },
+        computed:{
+        },
+        methods:{
+            changeStep(direction){
+
+                if(direction === 'next'){
+                    if(!this.validate()){
+                        return;
+                    }
+
+                    this.step += 1;
+                    this.status.direction = direction;
+                    this.$emit('updateStatus',this.status);
+                    this.$v.$reset();
+                    return;
+
+                }else if(direction === 'reset'){
+                    this.$store.dispatch('showOrderList');
+                    this.step = this.$store.getters.orderExist==0?1:2;
+                    this.resetForm();
+                    return;
+                }
+                this.step -= 1;
+                return;
+            },
+
+            createOrder(){
+                if(!this.validate()){
+                    return;
+                }
+                this.step += 1;
+                this.submit((this.route('api.order.create')), 'post', 'bookingDetailSection', true, true);
+            },
+            successHandler(response){
+                this.completedOrder = response.payload.data;
+                this.$store.dispatch('updateIfCreateNewOrder');
+            },
+            updateStatus(event){
+                console.log("receive event bus" ,event);
+                if(event.direction === 'next'){
+                    this.step += 1;
+                }else if(event.direction === 'back'){
+                    this.step -= 1;
+                }
+            },
+        },
+        mixins: [CreateOrderformValitaion]
+    }
+</script>
diff --git a/resources/assets/vue/general/mixins/accounts/validation/createOrderFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/createOrderFormValidation.js
new file mode 100644
index 00000000..99e88049
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/createOrderFormValidation.js
@@ -0,0 +1,14 @@
+import { required, email, numeric, sameAs, requiredUnless, requiredIf } from "vuelidate/lib/validators";
+import authenticationHandler from '../authenticationHandler'
+export default {
+    validations: {
+        parameters: {
+            warehouse_id: {
+                required: requiredIf(function () { return this.step === 2 })
+            },
+            address_id: {
+                required:requiredIf(function () { return this.step === 3})
+            },
+        }
+    },
+}
\ No newline at end of file

From 6d3b4bc4f0fa4248034f1276bea697f334f0fe50 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 02:59:14 +0800
Subject: [PATCH 05/12] update: vuex module for order operation.

---
 resources/assets/vue/vuex/modules/order.js | 26 ++++++++++++++++++++++
 resources/assets/vue/vuex/store.js         |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/vuex/modules/order.js

diff --git a/resources/assets/vue/vuex/modules/order.js b/resources/assets/vue/vuex/modules/order.js
new file mode 100644
index 00000000..93fadf7b
--- /dev/null
+++ b/resources/assets/vue/vuex/modules/order.js
@@ -0,0 +1,26 @@
+export default {
+    state: {
+        orderExist:localStorage.getItem('new-order') || 0,
+    },
+    getters: {
+        orderExist: (state, getters) => getters.getOrder > 0 || state.orderExist,
+    },
+    mutations: {
+        order(state){
+            state.isNewOrder = 0;
+        },
+    },
+    actions: {
+        updateIfCreateNewOrder(store){
+            localStorage.setItem('new-order', 1);
+            store.commit('UPDATE_IF_NEW_ORDER');
+        },
+        showCreateOrderForm(store){
+            store.dispatch('toggleSection', {name: 'createOrderForm', status: true})
+        },
+        showOrderList(store){
+            store.dispatch('toggleSection', {name: 'orderList', status: true})
+            store.dispatch('toggleSection', {name: 'createOrderForm', status: false})
+        },
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/vue/vuex/store.js b/resources/assets/vue/vuex/store.js
index 2c3d911b..15339f90 100644
--- a/resources/assets/vue/vuex/store.js
+++ b/resources/assets/vue/vuex/store.js
@@ -6,6 +6,7 @@ import createNotification from './modules/createNotification'
 import crudRequest from './modules/crudRequest'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
+import order from './modules/order'
 
 Vue.use(Vuex);
 
@@ -16,6 +17,7 @@ export default new Vuex.Store({
         loadRequestQueue,
         createNotification,
         crudRequest,
-        authentication
+        authentication,
+        order
     }
 })
\ No newline at end of file

From 3b1218e1ea9f9853822ee48866d6c27a908467a4 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 02:59:43 +0800
Subject: [PATCH 06/12] style: validation component. - remove border.

---
 .../vue/components/general/forms/ValidationWrapperComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue b/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
index d30fdbaf..c03f3507 100644
--- a/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationWrapperComponent.vue
@@ -2,7 +2,7 @@
     <div class="animate__animated" :class="[{'animate__shake': validator.$error}]">
         <div class="row">
             <div class="col">
-                <div class="form-group no-margin form-group-default" :class="[{' has-error': validator.$error}, {'form-group-default-select2': selecatable}, {'p-b-5': selecatable}]">
+                <div class="form-group no-margin" :class="[{' has-error': validator.$error}, {'form-group-default-select2': selecatable}, {'p-b-5': selecatable}]">
                     <slot></slot>
                 </div>
             </div>

From efae44cfb067bc459c7b91e7a5f9930f795dc3b0 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 03:02:26 +0800
Subject: [PATCH 07/12] update: add onboarding create order flow component.

---
 resources/views/pages/dashboards/customer.blade.php | 2 +-
 resources/views/pages/dashboards/index.blade.php    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/dashboards/customer.blade.php b/resources/views/pages/dashboards/customer.blade.php
index c5e842c2..134139e5 100644
--- a/resources/views/pages/dashboards/customer.blade.php
+++ b/resources/views/pages/dashboards/customer.blade.php
@@ -1,5 +1,5 @@
 <div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
     <div class="col">
-        <customer-dashboard-section-component></customer-dashboard-section-component>
+        <create-order-component v-show="$store.getters.isLoading('createOrderSection')||$store.getters.getOrder==0"></create-order-component>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/index.blade.php b/resources/views/pages/dashboards/index.blade.php
index 039ab52c..64918d08 100644
--- a/resources/views/pages/dashboards/index.blade.php
+++ b/resources/views/pages/dashboards/index.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.base_portal')
 @section('inner_content')
+    @include('pages.dashboards.customer')
     <h1>TEWTASE</h1>
     <h1>TEWTASE</h1>
     <h1>TEWTASE</h1>

From a18c9afe3e7e1b6b981696a88b3382aa76c76746 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 03:05:51 +0800
Subject: [PATCH 08/12] update: routes and it respective blade files/

---
 .../views/pages/addresses/index.blade.php     |  4 ++++
 resources/views/pages/orders/index.blade.php  | 20 +++++++++++++++++++
 resources/views/partials/menu.blade.php       |  6 +++---
 routes/order.php                              |  2 +-
 routes/web.php                                |  8 ++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 resources/views/pages/addresses/index.blade.php
 create mode 100644 resources/views/pages/orders/index.blade.php

diff --git a/resources/views/pages/addresses/index.blade.php b/resources/views/pages/addresses/index.blade.php
new file mode 100644
index 00000000..5bf256c2
--- /dev/null
+++ b/resources/views/pages/addresses/index.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    {{-- @include('pages.dashboards.customer') --}}
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
new file mode 100644
index 00000000..3808538d
--- /dev/null
+++ b/resources/views/pages/orders/index.blade.php
@@ -0,0 +1,20 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <order-list-component
+        v-show="!$store.getters.isShowing('createOrderForm')"
+        section="orderList"
+        :company_module_id="$store.getters.getCompanyModuleId"
+        completedOrder=""
+    >
+        <template slot="createOrderButton">
+            <div class="row m-t-20">
+                <div class="col text-right">
+                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="$store.dispatch('showCreateOrderForm')">Create Order</button>
+                </div>
+            </div>
+        </template>
+
+    </order-list-component>
+
+    <create-order-component v-show="$store.getters.isShowing('createOrderForm')"></create-order-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 7f220dfc..7d319ea0 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -22,7 +22,7 @@
                                      style=" fill:#4a90e2;"><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="#912873"><path d="M86,12.51367l-70.95,44.34375v20.12266l3.29219,-2.05762l1.00781,-0.63828v78.36582h133.3v-78.35742l4.3,2.6875v-20.12266zM86,17.58633l66.65,41.65625v9.98574l-66.65,-41.66465l-66.65,41.66465v-9.98574zM86,32.63633l62.35,38.96875v61.69492c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v10.75h-43v-10.75c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15v-38.7h-38.7v38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v10.75h-43v-10.75c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15v-61.70332zM66.65,53.75v25.8h38.7v-25.8zM70.95,58.05h12.9v17.2h-12.9zM88.15,58.05h12.9v17.2h-12.9zM70.95,98.9h30.1v49.45h-30.1zM93.525,122.55c-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.225zM32.25,133.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.15zM40.85,133.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.15zM49.45,133.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.15zM58.05,133.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.15zM113.95,133.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.15zM122.55,133.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.15zM131.15,133.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.15zM139.75,133.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.15z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <h6 class="no-margin semi-bold">Dashboard</h6>
+                                <a href="{{route('dashboard')}}"><h6 class="no-margin semi-bold">Dashboard</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center">
@@ -33,7 +33,7 @@
                                      style=" fill:#4a90e2;"><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="#912873"><path d="M21.5,21.5v47.3h47.3v-47.3zM103.2,21.5v47.3h47.3v-47.3zM83.85,23.65c-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,23.65c-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,25.8h38.7v38.7h-38.7zM107.5,25.8h38.7v38.7h-38.7zM32.25,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.15zM40.85,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.15zM49.45,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.15zM58.05,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.15zM77.4,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.15zM90.3,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.15zM113.95,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.15zM122.55,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.15zM131.15,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.15zM139.75,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.15zM83.85,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.15zM96.75,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.15zM32.25,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.15zM58.05,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.15zM113.95,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.15zM139.75,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.15zM40.85,40.85v8.6h8.6v-8.6zM122.55,40.85v8.6h8.6v-8.6zM77.4,43c-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.15zM90.3,43c-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.15zM32.25,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.15zM58.05,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.15zM113.95,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.15zM139.75,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.15zM96.75,49.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.15zM32.25,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.15zM40.85,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.15zM49.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.15zM58.05,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.15zM77.4,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.15zM113.95,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.15zM122.55,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.15zM131.15,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.15zM139.75,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.15zM96.75,62.35c-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,68.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.15zM45.15,75.25c-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.15zM58.05,75.25c-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,75.25c-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,75.25c-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,75.25c-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.15zM109.65,75.25c-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,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.15zM90.3,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.15zM103.2,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.15zM116.1,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.15zM129,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.15zM141.9,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.15zM32.25,88.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.15zM45.15,88.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,88.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.15zM96.75,88.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.15zM109.65,88.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.15zM122.55,88.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.15zM135.45,88.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.15zM148.35,88.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,94.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.15zM38.7,94.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.15zM51.6,94.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.15zM64.5,94.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.15zM77.4,94.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.15zM90.3,94.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.15zM103.2,94.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.15zM83.85,101.05c-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,101.05c-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.15zM109.65,101.05c-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.15zM21.5,103.2v47.3h47.3v-47.3zM25.8,107.5h38.7v38.7h-38.7zM77.4,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.15zM103.2,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.15zM116.1,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.15zM129,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.15zM141.9,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.15zM32.25,111.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.15zM40.85,111.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.15zM49.45,111.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.15zM58.05,111.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.15zM83.85,113.95c-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.15zM109.65,113.95c-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.15zM122.55,113.95c-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,113.95c-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,113.95c-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.15zM32.25,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.15zM58.05,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.15zM77.4,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.15zM103.2,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.15zM141.9,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.15zM40.85,122.55v8.6h8.6v-8.6zM83.85,126.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.15zM122.55,126.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.15zM148.35,126.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.15zM32.25,129c-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.15zM58.05,129c-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,133.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.15zM103.2,133.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.15zM116.1,133.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.15zM141.9,133.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.15zM32.25,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.15zM40.85,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.15zM49.45,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.15zM58.05,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.15zM83.85,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.15zM109.65,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.15zM148.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.15zM77.4,146.2c-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,146.2c-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.15zM141.9,146.2c-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">
-                                <h6 class="no-margin semi-bold">My Orders</h6>
+                                <a href="{{route('order')}}"><h6 class="no-margin semi-bold">My Orders</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center">
@@ -55,7 +55,7 @@
                                      style=" fill:#4a90e2;"><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="#912873"><path d="M107.5,19.35c-8.63359,0 -16.27617,4.2832 -20.9625,10.81719l-22.0375,-4.40918l-45.15,9.02832v111.88398l45.15,-9.02832l43,8.6l45.15,-9.02832v-111.88399l-24.1875,4.8375c-4.68633,-6.53398 -12.32891,-10.81719 -20.9625,-10.81719zM107.5,23.65c11.90059,0 21.5,9.59941 21.5,21.5c0,2.62031 -1.34375,6.94551 -3.50215,11.66543c-2.1584,4.72832 -5.08105,9.90176 -8.01211,14.68047c-4.98867,8.15488 -8.6168,13.05957 -9.98574,14.94082c-1.36895,-1.88125 -4.99707,-6.78594 -9.98574,-14.94082c-2.93105,-4.77871 -5.85371,-9.95215 -8.01211,-14.68047c-2.1584,-4.71992 -3.50215,-9.04512 -3.50215,-11.66543c0,-11.90059 9.59941,-21.5 21.5,-21.5zM64.5,30.14199l19.72793,3.94727c-1.6041,3.35098 -2.52793,7.09668 -2.52793,11.06074c0,3.91367 1.6125,8.49082 3.88848,13.4627c2.27598,4.96348 5.26582,10.26289 8.24726,15.13398c5.97129,9.75059 11.93418,17.82988 11.93418,17.82988l1.73008,2.35156l1.73008,-2.35156c0,0 5.96289,-8.0793 11.93418,-17.82988c2.98145,-4.87109 5.97129,-10.17051 8.24726,-15.13398c2.27598,-4.97187 3.88848,-9.54902 3.88848,-13.4627c0,-3.96406 -0.92383,-7.70976 -2.52793,-11.06074l17.57793,-3.51895v103.11602l-40.85,8.17168l-43,-8.6l-40.85,8.17168v-103.11601zM64.5,32.25c-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.15zM107.5,36.55c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM64.5,40.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.15zM107.5,40.85c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM64.5,49.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.15zM64.5,58.05c-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.15zM64.5,66.65c-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.15zM64.5,75.25c-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.15zM64.5,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.15zM64.5,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.15zM107.5,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.15zM64.5,101.05c-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.15zM107.5,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.15zM64.5,109.65c-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.15zM107.5,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.15zM64.5,118.25c-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.15zM107.5,124.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.15zM64.5,126.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.15zM107.5,133.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.15z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <h6 class="no-margin semi-bold">My Addresses</h6>
+                                <a href="{{route('address')}}"><h6 class="no-margin semi-bold">My Addresses</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center">
diff --git a/routes/order.php b/routes/order.php
index b2e951a6..305633dc 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], function () {
     #Route::get('/{id}/show', 'FetchOrderController@fetch')->name('show');
-    #Route::get('/list', 'ListOrdersController@list')->name('list');
+    Route::get('/list', 'ListOrdersController@list')->name('list');
     Route::post('/create', 'CreateOrderController@create')->name('create');
     Route::put('/confirm/{id}', 'ConfirmOrderController@confirm')->name('confirm');
     #Route::put('/update/{id}', 'UpdateOrderController@update')->name('update');
diff --git a/routes/web.php b/routes/web.php
index 6fc5897b..93cf6d4f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -43,3 +43,11 @@ Route::get('/account/password/reset/{token}', function ($token) {
 Route::get('/dashboard', function () {
     return view('pages.dashboards.index');
 })->name('dashboard');
+
+Route::get('/order', function () {
+    return view('pages.orders.index');
+})->name('order');
+
+Route::get('/address', function () {
+    return view('pages.addresses.index');
+})->name('address');

From e0df8ac524799d117cb031c45cf421bc2e67fc90 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 03:36:57 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix=EF=BC=9A=20remove=20new-order=20param?=
 =?UTF-8?q?=20in=20localstorage=20when=20logout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue/components/accounts/forms/LogOutFormComponent.vue     | 1 +
 resources/assets/vue/vuex/modules/order.js                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
index de1c6443..e38ac3bf 100644
--- a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
@@ -53,6 +53,7 @@
             },
             successHandler(){
                 this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+                this.$store.dispatch('updateIfCreateNewOrder','');
             },
             errorHandler(){
                 this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
diff --git a/resources/assets/vue/vuex/modules/order.js b/resources/assets/vue/vuex/modules/order.js
index 93fadf7b..d03a0722 100644
--- a/resources/assets/vue/vuex/modules/order.js
+++ b/resources/assets/vue/vuex/modules/order.js
@@ -11,8 +11,8 @@ export default {
         },
     },
     actions: {
-        updateIfCreateNewOrder(store){
-            localStorage.setItem('new-order', 1);
+        updateIfCreateNewOrder(store ,order){
+            localStorage.setItem('new-order', order);
             store.commit('UPDATE_IF_NEW_ORDER');
         },
         showCreateOrderForm(store){

From 93e5371882df22004599c3a5463e913d40b18b78 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 03:38:24 +0800
Subject: [PATCH 10/12] fix: order list tab visibility based on condition.

---
 .../orders/elements/orderListComponent.vue     | 18 ++++++++++++++----
 .../orders/sections/createOrderComponent.vue   |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/orderListComponent.vue b/resources/assets/vue/components/orders/elements/orderListComponent.vue
index 384b7943..1197fec2 100644
--- a/resources/assets/vue/components/orders/elements/orderListComponent.vue
+++ b/resources/assets/vue/components/orders/elements/orderListComponent.vue
@@ -20,13 +20,17 @@
             <div class="col">
                 <nav>
                     <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                        <a class="nav-item nav-link active" v-show="section!='orderList'" id="nav-order-completed-tab" data-toggle="tab" href="#nav-order-completed" role="tab" aria-controls="nav-order-completed" aria-selected="true">Completed</a>
-                        <a class="nav-item nav-link" id="nav-order-history-tab" data-toggle="tab" href="#nav-order-history" role="tab" aria-controls="nav-order-history" aria-selected="tab">Order History</a>
+                        <li class="nav-item">
+                            <a class="nav-item nav-link"  v-bind:class="{ active: isCreateOrderSection }" v-show="section!='orderList'" id="nav-order-completed-tab" data-toggle="tab" href="#nav-order-completed" role="tab" aria-controls="nav-order-completed" aria-selected="tab">Completed</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-item nav-link" v-bind:class="{ active: isOrderList }"  id="nav-order-history-tab" data-toggle="tab" href="#nav-order-history" role="tab" aria-controls="nav-order-history" aria-selected="true">Order History</a>
+                        </li>
                     </div>
                 </nav>
                 <div class="tab-content" id="nav-tabContent">
                     <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="!completedOrder && section!='orderList'" ></loading-component>
-                    <div class="tab-pane fade show active" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab">
+                    <div class="tab-pane fade" v-bind:class="{ active: isCreateOrderSection ,show:isCreateOrderSection }" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab">
                         <!-- each order component-->
                         <div class="card m-t-15" v-if="completedOrder">
                             <div class="card-body">
@@ -39,7 +43,7 @@
                         </div>
 
                     </div>
-                    <div class="tab-pane fade" id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab">
+                    <div class="tab-pane fade" v-bind:class="{ active: isOrderList ,show:isOrderList }"  id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab">
                         <list-component key="2" section="purchaseOrderSection1" :endpoint="route('api.order.list')" :options="{per_page: 10, CompanyModuleId :company_module_id}">
                             <template slot="list" slot-scope="{data}">
                                 <div class="card m-t-15">
@@ -75,6 +79,12 @@
             }
         },
         computed: {
+            isOrderList(){
+                return this.section == 'orderList';
+            },
+            isCreateOrderSection(){
+                return this.section == 'createOrderSection';
+            }
         },
         watch: {
         },
diff --git a/resources/assets/vue/components/orders/sections/createOrderComponent.vue b/resources/assets/vue/components/orders/sections/createOrderComponent.vue
index f6fc8196..34b365a0 100644
--- a/resources/assets/vue/components/orders/sections/createOrderComponent.vue
+++ b/resources/assets/vue/components/orders/sections/createOrderComponent.vue
@@ -135,7 +135,7 @@ import CreateOrderformValitaion from '../../../general/mixins/accounts/validatio
             },
             successHandler(response){
                 this.completedOrder = response.payload.data;
-                this.$store.dispatch('updateIfCreateNewOrder');
+                this.$store.dispatch('updateIfCreateNewOrder','1');
             },
             updateStatus(event){
                 console.log("receive event bus" ,event);

From 7c1f5ffaf80258d45dba6cec505605ee4312fbc3 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 11:17:00 +0800
Subject: [PATCH 11/12] revert tab active show manipulation.

---
 .../orders/elements/orderListComponent.vue          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/orderListComponent.vue b/resources/assets/vue/components/orders/elements/orderListComponent.vue
index 1197fec2..3ff056a8 100644
--- a/resources/assets/vue/components/orders/elements/orderListComponent.vue
+++ b/resources/assets/vue/components/orders/elements/orderListComponent.vue
@@ -20,17 +20,21 @@
             <div class="col">
                 <nav>
                     <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                        <li class="nav-item">
+                         <a class="nav-item nav-link active" v-show="section!='orderList'" id="nav-order-completed-tab" data-toggle="tab" href="#nav-order-completed" role="tab" aria-controls="nav-order-completed" aria-selected="true">Completed</a>
+                         <a class="nav-item nav-link" id="nav-order-history-tab" data-toggle="tab" href="#nav-order-history" role="tab" aria-controls="nav-order-history" aria-selected="tab">Order History</a>
+ 
+                        <!-- <li class="nav-item">
                             <a class="nav-item nav-link"  v-bind:class="{ active: isCreateOrderSection }" v-show="section!='orderList'" id="nav-order-completed-tab" data-toggle="tab" href="#nav-order-completed" role="tab" aria-controls="nav-order-completed" aria-selected="tab">Completed</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-item nav-link" v-bind:class="{ active: isOrderList }"  id="nav-order-history-tab" data-toggle="tab" href="#nav-order-history" role="tab" aria-controls="nav-order-history" aria-selected="true">Order History</a>
-                        </li>
+                        </li> -->
                     </div>
                 </nav>
                 <div class="tab-content" id="nav-tabContent">
                     <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="!completedOrder && section!='orderList'" ></loading-component>
-                    <div class="tab-pane fade" v-bind:class="{ active: isCreateOrderSection ,show:isCreateOrderSection }" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab">
+                    <!-- <div class="tab-pane fade" v-bind:class="{ active: isCreateOrderSection ,show:isCreateOrderSection }" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab"> -->
+                    <div class="tab-pane fade show active" id="nav-order-completed" role="tabpanel" aria-labelledby="nav-order-completed-tab">
                         <!-- each order component-->
                         <div class="card m-t-15" v-if="completedOrder">
                             <div class="card-body">
@@ -43,7 +47,8 @@
                         </div>
 
                     </div>
-                    <div class="tab-pane fade" v-bind:class="{ active: isOrderList ,show:isOrderList }"  id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab">
+                    <div class="tab-pane fade" id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab">
+                    <!-- <div class="tab-pane fade" v-bind:class="{ active: isOrderList ,show:isOrderList }"  id="nav-order-history" role="tabpanel" aria-labelledby="nav-order-history-tab"> -->
                         <list-component key="2" section="purchaseOrderSection1" :endpoint="route('api.order.list')" :options="{per_page: 10, CompanyModuleId :company_module_id}">
                             <template slot="list" slot-scope="{data}">
                                 <div class="card m-t-15">

From 1005ec9c83454e3e81be7517762692368fcbec12 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 5 Aug 2021 11:18:43 +0800
Subject: [PATCH 12/12] fix: getterstate.

---
 resources/assets/vue/vuex/modules/order.js    |   4 +-
 .../views/pages/dashboards/customer.blade.php |   2 +-
 .../views/pages/dashboards/index.blade.php    | 179 +++++++++---------
 3 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/resources/assets/vue/vuex/modules/order.js b/resources/assets/vue/vuex/modules/order.js
index d03a0722..ec98bd9d 100644
--- a/resources/assets/vue/vuex/modules/order.js
+++ b/resources/assets/vue/vuex/modules/order.js
@@ -6,8 +6,8 @@ export default {
         orderExist: (state, getters) => getters.getOrder > 0 || state.orderExist,
     },
     mutations: {
-        order(state){
-            state.isNewOrder = 0;
+        UPDATE_IF_NEW_ORDER(state){
+            state.orderExist = 0;
         },
     },
     actions: {
diff --git a/resources/views/pages/dashboards/customer.blade.php b/resources/views/pages/dashboards/customer.blade.php
index 134139e5..c5d7c3a8 100644
--- a/resources/views/pages/dashboards/customer.blade.php
+++ b/resources/views/pages/dashboards/customer.blade.php
@@ -1,5 +1,5 @@
 <div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
     <div class="col">
-        <create-order-component v-show="$store.getters.isLoading('createOrderSection')||$store.getters.getOrder==0"></create-order-component>
+        <create-order-component v-show="$store.getters.isLoading('createOrderSection')||!$store.getters.orderExist"></create-order-component>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/index.blade.php b/resources/views/pages/dashboards/index.blade.php
index 64918d08..d7430c5c 100644
--- a/resources/views/pages/dashboards/index.blade.php
+++ b/resources/views/pages/dashboards/index.blade.php
@@ -1,93 +1,94 @@
 @extends('layouts.base_portal')
 @section('inner_content')
     @include('pages.dashboards.customer')
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-    <h1>TEWTASE</h1>
-
+    <template v-if="$store.getters.orderExist">
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+        <h1>TEWTASE</h1>
+    </template>
 @endsection
\ No newline at end of file