merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2448 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2020-02-12 17:59:25 +05:30 committed by GitHub
parent 5f9039f781 f738cf4240
commit cd02a651e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
View File

@ -204,22 +204,23 @@
let form = $(document).find('form[data-vv-scope=address-form]');
// validate that if all the field contains some value
if (form) {
form.find(':input').each((index, element) => {
let value = $(element).val();
var requiredField = ['first_name', 'last_name', 'email', 'address1', 'city', 'state', 'postcode', 'phone', 'country'];
if (value == "" && element.id != 'billing[company_name]' && element.id != 'shipping[company_name]') {
isManualValidationFail = true;
}
});
}
// validate that if customer wants to use different shipping address
if (this.address.billing.use_for_shipping) {
if (this.address.shipping.address_id) {
requiredField.forEach(field => {
if (! this.address.billing[field]) {
isManualValidationFail = true;
}
}
if (this.address.billing.use_for_shipping) {
if (this.address.shipping.address_id) {
isManualValidationFail = true;
}
} else {
if (! this.address.shipping[field]) {
isManualValidationFail = true;
}
}
});
}
if (!isManualValidationFail) {