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

Merge pull request #2460 from shubhwebkul/velocity-updated 

WIP: misc. updates
This commit is contained in:
Jitendra Singh 2020-02-13 19:01:55 +05:30 committed by GitHub
parent 3fb2b8a5c9 78c3b98869
commit 5b032c2f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,35 +201,7 @@
var isManualValidationFail = false;
if (scope == 'address-form') {
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();
let elementId = element.id;
if (value == ""
&& element.id != 'billing[company_name]'
&& element.id != 'shipping[company_name]'
) {
if (elementId.match('address_field_')) {
if (elementId == 'address_field_0') {
isManualValidationFail = true;
}
} else {
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 && ! this.new_shipping_address) {
isManualValidationFail = true;
}
}
isManualValidationFail = this.validateAddressForm();
}
if (!isManualValidationFail) {
@ -237,17 +209,29 @@
.then(result => {
if (result) {
document.body.style.cursor = 'wait';
if (scope == 'address-form') {
this.saveAddress();
document.body.style.cursor = 'default';
} else if (scope == 'shipping-form') {
document.body.style.cursor = 'wait';
this.saveShipping();
} else if (scope == 'payment-form') {
document.body.style.cursor = 'wait';
this.savePayment();
switch (scope) {
case 'address-form':
this.saveAddress();
document.body.style.cursor = 'default';
break;
case 'shipping-form':
document.body.style.cursor = 'wait';
this.saveShipping();
break;
case 'payment-form':
document.body.style.cursor = 'wait';
this.savePayment();
this.isPlaceOrderEnabled = ! this.validateAddressForm();
break;
default:
break;
}
this.isPlaceOrderEnabled = true;
} else {
this.isPlaceOrderEnabled = false;
}
@ -257,6 +241,48 @@
}
},
validateAddressForm: function () {
var isManualValidationFail = false;
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();
let elementId = element.id;
if (value == ""
&& element.id != 'billing[company_name]'
&& element.id != 'shipping[company_name]'
) {
// check for multiple line address
if (elementId.match('billing_address_')
|| elementId.match('shipping_address_')
) {
// only first line address is required
if (elementId == 'billing_address_0'
|| elementId == 'shipping_address_0'
) {
isManualValidationFail = true;
}
} else {
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 && ! this.new_shipping_address) {
isManualValidationFail = true;
}
}
return isManualValidationFail;
},
isCustomerExist: function() {
this.$validator.attach('email', 'required|email');

5
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
View File

@ -94,6 +94,7 @@
class="control"
id="shipping_address_{{ $i }}"
name="shipping[address1][{{ $i }}]"
@change="validateForm('address-form')"
v-model="address.shipping.address1[{{$i}}]" />
</div>
@endfor
@ -513,8 +514,8 @@
type="checkbox"
id="billing[use_for_shipping]"
name="billing[use_for_shipping]"
@change="validateForm('address-form')"
v-model="address.billing.use_for_shipping" />
v-model="address.billing.use_for_shipping"
@change="setTimeout(() => validateForm('address-form'), 0)" />
<span class="ml-5">
{{ __('shop::app.checkout.onepage.use_for_shipping') }}