From 4f704ef6a058517bd657eb08944f277c12ee4bdf Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 11 Jun 2024 10:20:09 +0800
Subject: [PATCH 1/3] updated address form component with Hours, Property Type
 and Tools Required

---
 .../addresses/forms/AddressFormComponent.vue  | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 3dc9325c..602980cc 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -71,6 +71,67 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-15">
+                                <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                        <label>收货时间 Available Hours</label>
+                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-12 col-md pl-md-1">
+                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                        <label>最晚收货时间 Latest Available Hours</label>
+                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                    </validation-wrapper-component> 
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                    <label>房型 Receiver's Property Type</label>
+                                    <div class="dropdown">
+                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <div class="mr-3">
+                                                <span id="dropdownMenuButtonText">Property Type</span>
+                                            </div>
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                                            <a class="dropdown-item" href="#">住家-Landed house</a>
+                                            <a class="dropdown-item" href="#">公寓-Condominium (Drop on lobby only)</a>
+                                            <a class="dropdown-item" href="#">工厂-Factory</a>
+                                            <a class="dropdown-item" href="#">店面-Shop</a>
+                                            <a class="dropdown-item" href="#">商场-Shopping Mall (Drop on loading bay only)</a>
+                                            <a class="dropdown-item" href="#">Others</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-12 col-md pl-md-1">
+                                    <label>卸货工具 Tools required to unload goods</label>
+                                    <div class="dropdown">
+                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <div class="mr-3">
+                                                <span id="dropdownMenuButtonText">Options</span>
+                                            </div>
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                                            <a class="dropdown-item" href="#">Manpower</a>
+                                            <a class="dropdown-item" href="#">Forklift</a>
+                                            <a class="dropdown-item" href="#">None of the above</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col no-padding">
+                                <div class="row">
+                                    <div class="col"></div>
+                                    <div class="col-12 col-sm-7">
+                                        <h6 class="text-right fs-12 text-danger m-b-15 text-right">**kindly reply within 2 hours while warehouse contact to arrange for delivery, otherwise, reschedule of delivery date will apply.</h6>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="row" v-if="[7,8].includes($store.getters.getCompanyModuleType)">

From 5d01757d60b72abc239e7299d770f7f9ebacca95 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 12 Jun 2024 01:38:42 +0800
Subject: [PATCH 2/3] added pickup_time, latest_pickup_time, property_type and
 tools_required

---
 .../mixins/addresses/validation/addressFormValidation.js      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
index 4552a9d5..f38dae16 100644
--- a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
+++ b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
@@ -19,6 +19,10 @@ export default {
             remark: {},
             phone: {required, numeric},
             person_in_charge: { required },
+            pickup_time: { required },
+            latest_pickup_time: { required },
+            property_type: {},
+            tools_required: {},
         }
     },
     mixins: [addressFormHandler]

From 928430caecffc8cfb5452c5f1d3b6950e86d1b14 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 12 Jun 2024 01:39:45 +0800
Subject: [PATCH 3/3] changed property type and tools required dropdown into
 vue Select-component

---
 .../addresses/forms/AddressFormComponent.vue  | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 602980cc..38e8cc33 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -75,51 +75,30 @@
                         <div class="col">
                             <div class="row m-b-15">
                                 <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                    <validation-wrapper-component :validator="$v.parameters.pickup_time">
                                         <label>收货时间 Available Hours</label>
-                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                        <input type="time" class="form-control" name="pickup_time" v-model="parameters.pickup_time">
                                     </validation-wrapper-component>
                                 </div>
                                 <div class="col-12 col-md pl-md-1">
-                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                    <validation-wrapper-component :validator="$v.parameters.latest_pickup_time">
                                         <label>最晚收货时间 Latest Available Hours</label>
-                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                        <input type="time" class="form-control" name="latest_pickup_time" v-model="parameters.latest_pickup_time">
                                     </validation-wrapper-component> 
                                 </div>
                             </div>
                             <div class="row m-b-15">
                                 <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                                    <label>房型 Receiver's Property Type</label>
-                                    <div class="dropdown">
-                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <div class="mr-3">
-                                                <span id="dropdownMenuButtonText">Property Type</span>
-                                            </div>
-                                        </button>
-                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                            <a class="dropdown-item" href="#">住家-Landed house</a>
-                                            <a class="dropdown-item" href="#">公寓-Condominium (Drop on lobby only)</a>
-                                            <a class="dropdown-item" href="#">工厂-Factory</a>
-                                            <a class="dropdown-item" href="#">店面-Shop</a>
-                                            <a class="dropdown-item" href="#">商场-Shopping Mall (Drop on loading bay only)</a>
-                                            <a class="dropdown-item" href="#">Others</a>
-                                        </div>
-                                    </div>
+                                    <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.property_type">
+                                        <label class="text-primary">房型 Receiver's Property Type</label>
+                                        <select-component :options="propertyOptions" v-model="parameters.property_type"></select-component>
+                                    </validation-wrapper-component>
                                 </div>
                                 <div class="col-12 col-md pl-md-1">
-                                    <label>卸货工具 Tools required to unload goods</label>
-                                    <div class="dropdown">
-                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <div class="mr-3">
-                                                <span id="dropdownMenuButtonText">Options</span>
-                                            </div>
-                                        </button>
-                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                            <a class="dropdown-item" href="#">Manpower</a>
-                                            <a class="dropdown-item" href="#">Forklift</a>
-                                            <a class="dropdown-item" href="#">None of the above</a>
-                                        </div>
-                                    </div>
+                                    <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.tools_required">
+                                        <label class="text-primary">卸货工具 Tools required to unload goods</label>
+                                        <select-component :options="[{'id': 1, 'text': 'Manpower'}, {'id': 2, 'text': 'Forklift'}, {'id': 3, 'text': 'None of the above'}]" v-model="parameters.tools_required"></select-component>
+                                    </validation-wrapper-component>
                                 </div>
                             </div>
                             <div class="col no-padding">
@@ -235,8 +214,19 @@
                     remark: '',
                     phone: '',
                     person_in_charge: '',
-				}
-
+                    pickup_time: '',
+                    latest_pickup_time: '',
+                    property_type: '',
+                    tools_required: '',
+				},
+                propertyOptions: [
+                { id: 1, text: '住家-Landed house' },
+                { id: 2, text: '公寓-Condominium (Drop on lobby only)' },
+                { id: 3, text: '工厂-Factory' },
+                { id: 4, text: '店面-Shop' },
+                { id: 5, text: '商场-Shopping Mall (Drop on loading bay only)' },
+                { id: 6, text: 'Others' },
+                ],
             }            
 		},
         created(){