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

Merge pull request #2310 from shubhwebkul/velocity-updated 

Misc. bug fixes
This commit is contained in:
Jitendra Singh 2020-02-06 11:10:19 +05:30 committed by GitHub
parent a196e13a03 d6ef323ba5
commit 3909285942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,9 +203,12 @@
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();
}
}
@ -225,6 +228,9 @@
this_this.$http.post("{{ route('customer.checkout.exist') }}", {email: this_this.address.billing.email})
.then(function(response) {
this_this.is_customer_exist = response.data ? 1 : 0;
if (response.data)
document.body.style.cursor = 'default';
})
.catch(function (error) {})

24
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-checkout.blade.php Normal file
View File

@ -0,0 +1,24 @@
<div class="col-12 form-field" id="password" v-if="is_customer_exist">
<label for="password">{{ __('shop::app.checkout.onepage.password') }}</label>
<input
id="password"
type="password"
class="control"
name="password"
v-model="address.billing.password" />
<div class="forgot-password-link">
<a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
<div class="mt-10">
@if (Cookie::has('enable-resend') && Cookie::get('enable-resend') == true)
<a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
@endif
</div>
</div>
<button type='button' id="" class="theme-btn" @click="loginCustomer">
{{ __('shop::app.customer.login-form.button_title') }}
</button>
</div>

2
packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
View File

@ -28,7 +28,7 @@
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}" />
<div class="show-content">
<div class="show-content" v-text="'{{ $slider['content'] }}'">
<div class="show-content" v-html="'{{ $slider['content'] }}'">
</div>
</div>
</a>