From 29477c179e5be6632779879695190fc904a68438 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 15 Oct 2024 01:05:44 +0800
Subject: [PATCH 1/2] remove logging

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 6078f445..fe64404f 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -21,7 +21,6 @@ use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
 
 class UpdateAddressLogic extends AbstractControllerLogic
 {
@@ -123,8 +122,6 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
         $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
 
-        Log::info($remark);
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

From 32bd0001955b610e082fc37c5084d6ace5a77634 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 16 Oct 2024 00:45:25 +0800
Subject: [PATCH 2/2] update address extra fields

---
 .../addresses/forms/AddressFormComponent.vue         |  7 +++++--
 .../orders/forms/ChangeOrderAddressFormComponent.vue |  2 +-
 .../addresses/validation/addressFormValidation.js    | 12 ++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index a995caab..e118dabd 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -131,7 +131,7 @@
                 </div>
                 <div class="row m-b-15">
                     <div class="col">
-                        <div class="form-group no-margin form-group-default p-b-5">
+                        <validation-wrapper-component :validator="$v.parameters.atLeastOneSelected">
                             <label>Available to receive goods on: </label> 
                             <div class="row">
                                 <div class="col-12 col-md pb-3 pb-md-0">
@@ -159,7 +159,10 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                            <span v-if="$v.parameters.atLeastOneSelected.$error" class="text-danger fs-10">
+                                You must choose at least one option.
+                            </span>
+                        </validation-wrapper-component>
                     </div>
                 </div>
                 <div class="row m-b-15">
diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
index 31316368..b9d41532 100644
--- a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
@@ -25,7 +25,7 @@
                                         </div>
                                         <div class="col-auto semi-bold">New Address</div>
                                     </div>
-                                    <div class="row" v-show="!parameters.address_id">
+                                    <div class="row" v-show="!parameters.address_id && !this.expanded_address_id">
                                         <div class="col">
                                             <address-form-component :id="data.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
                                         </div>
diff --git a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
index c2778a26..c114248c 100644
--- a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
+++ b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
@@ -22,6 +22,18 @@ export default {
             person_in_charge: { required },
             property_type: { required },
             additional_request: {  },
+            receive_goods_working_hours: {},
+            receive_goods_after_hours: {},
+            receive_goods_on_saturday: {},
+            atLeastOneSelected: {
+                required: function () {
+                    return (
+                        this.parameters.receive_goods_working_hours ||
+                        this.parameters.receive_goods_after_hours ||
+                        this.parameters.receive_goods_on_saturday
+                    );
+                }
+            }
         }
     },
     mixins: [addressFormHandler]