cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-09-01 02:44:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vapor-address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development

Browse Source
This commit is contained in:
edmondlang
2024-10-16 00:46:15 +08:00
parent b9861f6d49 32bd000195
commit 484adac71c
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+5 -2
View File
@@ -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">
resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
+1 -1
View File
@@ -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>
resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
Vendored
+12
View File
@@ -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]