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

design changes and fixed minor issue

This commit is contained in:
shivam kumar 2019-10-21 15:37:51 +05:30
parent fd8a1fb851
commit ce6766b305
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Http/routes.php
View File

@ -166,7 +166,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
Route::get('/resend/verification/{email}', 'Webkul\Customer\Http\Controllers\RegistrationController@resendVerificationEmail')->name('customer.resend.verification-email');
// for customer login checkout
Route::post('/custome/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
Route::post('/customer/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
// Auth Routes
Route::group(['middleware' => ['customer']], function () {

3
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -495,7 +495,8 @@ return [
'paypal-desc' => 'Paypal Standard',
'free-desc' => 'This is a free shipping',
'flat-desc' => 'This is a flat rate',
'password' => 'Password'
'password' => 'Password',
'login-exist-message' => 'You already have an account with us, Sign in or continue as guest.'
],
'total' => [

8
packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
View File

@ -7,11 +7,13 @@
<span class="control-error" v-if="errors.has('address-form.password')">
@{{ errors.first('address-form.password') }}
</span>
</span> <br>
<span>{{ __('shop::app.checkout.onepage.login-exist-message') }}</span>
</div>
<div class="control-group" id="login-and-forgot-btn" style="display:inline-block;">
<div class="forgot-password-link">
<div class="control-group" id="login-and-forgot-btn">
<div class="forgot-password-link" style="float: right;margin-right: 503px; margin-top: 11px;">
<a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
<div class="mt-10">
@if (Cookie::has('enable-resend'))

39
packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
View File

@ -76,6 +76,23 @@
@endauth
</div>
<div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
<label for="billing[email]" class="required">
{{ __('shop::app.checkout.onepage.email') }}
</label>
<input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
<span class="control-error" v-if="errors.has('address-form.billing[email]')">
@{{ errors.first('address-form.billing[email]') }}
</span>
</div>
{{-- for customer login checkout --}}
@if (! auth()->guard('customer')->check())
@include('shop::checkout.onepage.customer-checkout')
@endif
<div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
<label for="billing[first_name]" class="required">
{{ __('shop::app.checkout.onepage.first-name') }}
@ -100,23 +117,6 @@
</span>
</div>
<div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
<label for="billing[email]" class="required">
{{ __('shop::app.checkout.onepage.email') }}
</label>
<input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
<span class="control-error" v-if="errors.has('address-form.billing[email]')">
@{{ errors.first('address-form.billing[email]') }}
</span>
</div>
{{-- for customer login checkout --}}
@if (! auth()->guard('customer')->check())
@include('shop::checkout.onepage.customer-checkout')
@endif
<div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
<label for="billing_address_0" class="required">
{{ __('shop::app.checkout.onepage.address1') }}
@ -480,7 +480,10 @@
if (data == true) {
$("#password").show();
$('#login-and-forgot-btn').show();
}
} else {
$("#password").hide();
$('#login-and-forgot-btn').hide();
}
}
});
});