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

Merge pull request #2372 from shubhwebkul/velocity-updated 

misc. bug fixes
This commit is contained in:
Jitendra Singh 2020-02-07 15:28:21 +05:30 committed by GitHub
parent 88cacbf997 79a8faa028
commit c24b6a5e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 172 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=65a146da75db9d89424d",
"/css/velocity.css": "/css/velocity.css?id=b10c5f40830f0e5a94e7",
"/js/velocity.js": "/js/velocity.js?id=86ab12533244dd4304cc",
"/css/velocity.css": "/css/velocity.css?id=1027f2c6d88fa0c74fa0",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

5
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -175,7 +175,9 @@ $(document).ready(function () {
},
mounted: function () {
// this.addServerErrors();
setTimeout(() => {
this.addServerErrors();
}, 0);
document.body.style.display = "block";
this.$validator.localize(document.documentElement.lang);
@ -227,6 +229,7 @@ $(document).ready(function () {
name: inputName,
scope: scope
});
if (field) {
this.$validator.errors.add({
id: field.id,

1
packages/Webkul/Velocity/src/Resources/assets/sass/app.scss vendored
View File

@ -222,6 +222,7 @@ body {
}
.modal-content {
top: 0;
padding: 0;
ul {

7
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -860,4 +860,11 @@ button[disabled] {
.border-normal {
border: $border-normal;
}
.has-error {
input,
select {
border-color: $border-danger !important;
}
}

16
packages/Webkul/Velocity/src/Resources/lang/ar/app.php
View File

@ -34,6 +34,22 @@ return [
'payment-methods' => 'طرق الدفع',
'shipping-methods' => 'طرق الشحن',
],
'products' => [
'short-description' => 'أوصاف قصيرة',
'more-infomation' => 'معلومات اكثر',
'details' => 'تفاصيل',
'customer-rating' => 'تقييم العملاء',
'reviews' => 'التعليقات',
'view-all-reviews' => 'عرض جميع التقييمات',
'write-your-review' => 'اكتب مراجعتك',
'quick-view' => 'نظرة سريعة',
'recently-viewed' => 'المنتجات المعروضة مؤخرا',
'not-available' => 'غير متوفر',
'review-by' => 'روجع من قبل',
'be-first-review' => 'كن أول من يكتب نقد',
'submit-review' => 'إرسال المراجعة',
]
]
?>

8
packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
View File

@ -25,11 +25,15 @@
{{ __('velocity::app.admin.contents.content.link-target') }}
</label>
<select class="control" id="link_target" name="link_target" value="">
@php
$linkTarget = isset($locale) ? (old($locale)['link_target'] ?? $content->translate($locale)['link_target']) : '';
@endphp
<select class="control" id="link_target" name="{{$locale}}[link_target]" value="">
<option value="0">
{{ __('velocity::app.admin.contents.self') }}
</option>
<option value="1">
<option value="1" @if ($linkTarget == 1) selected="selected" @endif>
{{ __('velocity::app.admin.contents.new-tab') }}
</option>
</select>

4
packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
View File

@ -6,7 +6,9 @@
@section('content')
<div class="content">
<?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
@php
$locale = request()->get('locale') ?: app()->getLocale();
@endphp
<form
method="POST"

8
packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
View File

@ -98,7 +98,7 @@
<div class="btn-group full-width">
<div class="selectdiv">
<select class="form-control fs13 styled-select" name="category">
<select class="form-control fs13 styled-select" name="category" @change="focusInput($event)">
<option value="">
{{ __('velocity::app.header.all-categories') }}
</option>
@ -660,6 +660,12 @@
this.searchedQuery = updatedSearchedCollection;
},
methods: {
'focusInput': function (event) {
$(event.target.parentElement.parentElement).find('input').focus();
}
}
})
Vue.component('content-header', {

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -95,7 +95,7 @@
</wishlist-component>
<span class="align-vertical-top">
{{ __('shop::app.layouts.wishlist') }}
{{ __('shop::app.checkout.cart.move-to-wishlist') }}
</span>
</a>
@else
@ -119,7 +119,7 @@
<a
class="unset
@auth('customer')
ml30
ml10
@endauth
"
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"

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

@ -196,23 +196,41 @@
},
validateForm: function(scope) {
this.$validator.validateAll(scope)
.then(result => {
if (result) {
document.body.style.cursor = 'wait';
var isManualValidationFail = false;
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();
}
if (scope == 'address-form') {
let form = $(document).find('form[data-vv-scope=address-form]');
if (form) {
form.find(':input').each((index, element) => {
let value = $(element).val();
if (value == "") {
isManualValidationFail = true;
}
});
}
});
}
if (!isManualValidationFail) {
this.$validator.validateAll(scope)
.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();
}
}
});
}
},
isCustomerExist: function() {
@ -354,8 +372,6 @@
},
placeOrder: function() {
var this_this = this;
this.disable_button = true;
this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"})
@ -368,12 +384,12 @@
}
}
})
.catch(function (error) {
this_this.disable_button = true;
.catch(error => {
this.disable_button = true;
window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('shop::app.common.error') }}" }];
this_this.$root.addFlashMessages()
this.$root.addFlashMessages();
})
},

2
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php
View File

@ -17,7 +17,7 @@
<div slot="body">
<div class="address-container row full-width">
<div class="col address-holder" v-for='(addresses, index) in this.allAddress'>
<div class="col-lg-6 col-md-12 address-holder" v-for='(addresses, index) in this.allAddress'>
<div class="card">
<div class="card-body row">

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

@ -4,8 +4,8 @@
@if (isset($shipping) && $shipping)
<div :class="`col-12 form-field ${errors.has('address-form.shipping[first_name]') ? 'has-error' : ''}`">
<label for="shipping[first_name]" class="required">
{{ __('shop::app.checkout.onepage.first-name') }}*
<label for="shipping[first_name]" class="mandatory">
{{ __('shop::app.checkout.onepage.first-name') }}
</label>
<input
@ -23,8 +23,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[last_name]') ? 'has-error' : ''}`">
<label for="shipping[last_name]" class="required">
{{ __('shop::app.checkout.onepage.last-name') }}*
<label for="shipping[last_name]" class="mandatory">
{{ __('shop::app.checkout.onepage.last-name') }}
</label>
<input
@ -42,8 +42,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[email]') ? 'has-error' : ''}`">
<label for="shipping[email]" class="required">
{{ __('shop::app.checkout.onepage.email') }}*
<label for="shipping[email]" class="mandatory">
{{ __('shop::app.checkout.onepage.email') }}
</label>
<input
@ -61,8 +61,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[address1][]') ? 'has-error' : ''}`">
<label for="shipping_address_0" class="required">
{{ __('shop::app.checkout.onepage.address1') }}*
<label for="shipping_address_0" class="mandatory">
{{ __('shop::app.checkout.onepage.address1') }}
</label>
<input
@ -96,8 +96,8 @@
@endif
<div :class="`col-12 form-field ${errors.has('address-form.shipping[city]') ? 'has-error' : ''}`">
<label for="shipping[city]" class="required">
{{ __('shop::app.checkout.onepage.city') }}*
<label for="shipping[city]" class="mandatory">
{{ __('shop::app.checkout.onepage.city') }}
</label>
<input
@ -115,8 +115,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[country]') ? 'has-error' : ''}`">
<label for="shipping[country]" class="required">
{{ __('shop::app.checkout.onepage.country') }}*
<label for="shipping[country]" class="mandatory">
{{ __('shop::app.checkout.onepage.country') }}
</label>
<select
@ -143,8 +143,8 @@
<div :class="`col-12 form-field ${errors.has('address-form.shipping[state]') ? 'has-error' : ''}`">
<label for="shipping[state]" class="required">
{{ __('shop::app.checkout.onepage.state') }}*
<label for="shipping[state]" class="mandatory">
{{ __('shop::app.checkout.onepage.state') }}
</label>
@ -181,8 +181,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[postcode]') ? 'has-error' : ''}`">
<label for="shipping[postcode]" class="required">
{{ __('shop::app.checkout.onepage.postcode') }}*
<label for="shipping[postcode]" class="mandatory">
{{ __('shop::app.checkout.onepage.postcode') }}
</label>
<input
@ -200,8 +200,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.shipping[phone]') ? 'has-error' : ''}`">
<label for="shipping[phone]" class="required">
{{ __('shop::app.checkout.onepage.phone') }}*
<label for="shipping[phone]" class="mandatory">
{{ __('shop::app.checkout.onepage.phone') }}
</label>
<input
@ -237,8 +237,8 @@
@elseif (isset($billing) && $billing)
<div :class="`col-12 form-field ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
<label for="billing[email]" class="required">
{{ __('shop::app.checkout.onepage.email') }}*
<label for="billing[email]" class="mandatory">
{{ __('shop::app.checkout.onepage.email') }}
</label>
<input
@ -263,8 +263,8 @@
@endif
<div :class="`col-12 form-field ${errors.has('address-form.billing[first_name]') ? 'has-error' : ''}`">
<label for="billing[first_name]" class="required">
{{ __('shop::app.checkout.onepage.first-name') }}*
<label for="billing[first_name]" class="mandatory">
{{ __('shop::app.checkout.onepage.first-name') }}
</label>
<input
@ -282,8 +282,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[last_name]') ? 'has-error' : ''}`">
<label for="billing[last_name]" class="required">
{{ __('shop::app.checkout.onepage.last-name') }}*
<label for="billing[last_name]" class="mandatory">
{{ __('shop::app.checkout.onepage.last-name') }}
</label>
<input
@ -301,8 +301,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[address1][]') ? 'has-error' : ''}`">
<label for="billing_address_0" class="required">
{{ __('shop::app.checkout.onepage.address1') }}*
<label for="billing_address_0" class="mandatory">
{{ __('shop::app.checkout.onepage.address1') }}
</label>
<input
@ -336,8 +336,8 @@
@endif
<div :class="`col-12 form-field ${errors.has('address-form.billing[city]') ? 'has-error' : ''}`">
<label for="billing[city]" class="required">
{{ __('shop::app.checkout.onepage.city') }}*
<label for="billing[city]" class="mandatory">
{{ __('shop::app.checkout.onepage.city') }}
</label>
<input
@ -355,8 +355,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[country]') ? 'has-error' : ''}`">
<label for="billing[country]" class="required">
{{ __('shop::app.checkout.onepage.country') }}*
<label for="billing[country]" class="mandatory">
{{ __('shop::app.checkout.onepage.country') }}
</label>
<select
@ -383,8 +383,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[state]') ? 'has-error' : ''}`">
<label for="billing[state]" class="required">
{{ __('shop::app.checkout.onepage.state') }}*
<label for="billing[state]" class="mandatory">
{{ __('shop::app.checkout.onepage.state') }}
</label>
<input
@ -413,7 +413,9 @@
@{{ state.default_name }}
</option>
</select>
<i v-if="haveStates('billing')" class="select-icon rango-arrow-down"></i>
<div class="select-icon-container" v-if="haveStates('billing')">
<i class="select-icon rango-arrow-down"></i>
</div>
<span class="control-error" v-if="errors.has('address-form.billing[state]')">
@{{ errors.first('address-form.billing[state]') }}
@ -421,8 +423,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[postcode]') ? 'has-error' : ''}`">
<label for="billing[postcode]" class="required">
{{ __('shop::app.checkout.onepage.postcode') }}*
<label for="billing[postcode]" class="mandatory">
{{ __('shop::app.checkout.onepage.postcode') }}
</label>
<input
@ -440,8 +442,8 @@
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[phone]') ? 'has-error' : ''}`">
<label for="billing[phone]" class="required">
{{ __('shop::app.checkout.onepage.phone') }}*
<label for="billing[phone]" class="mandatory">
{{ __('shop::app.checkout.onepage.phone') }}
</label>
<input

23
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
View File

@ -131,7 +131,7 @@
{{ __('velocity::app.shop.general.enter-current-password') }}
</label>
<div class="col-12">
<div :class="`col-12 ${errors.has('oldpassword') ? 'has-error' : ''}`">
<input value="" name="oldpassword" type="password" />
</div>
</div>
@ -141,8 +141,16 @@
{{ __('velocity::app.shop.general.new-password') }}
</label>
<div class="col-12">
<input value="" name="password" type="password" />
<div :class="`col-12 ${errors.has('password') ? 'has-error' : ''}`">
<input
value=""
name="password"
type="password"
v-validate="'min:6|max:18'" />
<span class="control-error" v-if="errors.has('password')">
@{{ errors.first('password') }}
</span>
</div>
</div>
@ -151,8 +159,13 @@
{{ __('velocity::app.shop.general.confirm-new-password') }}
</label>
<div class="col-12">
<input value="" name="password_confirmation" type="password" />
<div :class="`col-12 ${errors.has('password_confirmation') ? 'has-error' : ''}`">
<input value="" name="password_confirmation" type="password"
v-validate="'min:6|confirmed:password'" data-vv-as="confirm password" />
<span class="control-error" v-if="errors.has('password_confirmation')">
@{{ errors.first('password_confirmation') }}
</span>
</div>
</div>

23
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
View File

@ -131,7 +131,7 @@
{{ __('velocity::app.shop.general.enter-current-password') }}
</label>
<div class="col-12">
<div :class="`col-12 ${errors.has('oldpassword') ? 'has-error' : ''}`">
<input value="" name="oldpassword" type="password" />
</div>
</div>
@ -141,8 +141,16 @@
{{ __('velocity::app.shop.general.new-password') }}
</label>
<div class="col-12">
<input value="" name="password" type="password" />
<div :class="`col-12 ${errors.has('password') ? 'has-error' : ''}`">
<input
value=""
name="password"
type="password"
v-validate="'min:6|max:18'" />
<span class="control-error" v-if="errors.has('password')">
@{{ errors.first('password') }}
</span>
</div>
</div>
@ -151,8 +159,13 @@
{{ __('velocity::app.shop.general.confirm-new-password') }}
</label>
<div class="col-12">
<input value="" name="password_confirmation" type="password" />
<div :class="`col-12 ${errors.has('password_confirmation') ? 'has-error' : ''}`">
<input value="" name="password_confirmation" type="password"
v-validate="'min:6|confirmed:password'" data-vv-as="confirm password" />
<span class="control-error" v-if="errors.has('password_confirmation')">
@{{ errors.first('password_confirmation') }}
</span>
</div>
</div>

8
packages/Webkul/Velocity/src/Resources/views/shop/customers/session/index.blade.php
View File

@ -44,8 +44,8 @@
{!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!}
<div class="form-group" :class="[errors.has('email') ? 'has-error' : '']">
<label for="email" class="required label-style">
{{ __('shop::app.customer.login-form.email') }}*
<label for="email" class="mandatory label-style">
{{ __('shop::app.customer.login-form.email') }}
</label>
<input
@ -62,8 +62,8 @@
</div>
<div class="form-group" :class="[errors.has('password') ? 'has-error' : '']">
<label for="password" class="required label-style">
{{ __('shop::app.customer.login-form.password') }}*
<label for="password" class="mandatory label-style">
{{ __('shop::app.customer.login-form.password') }}
</label>
<input

4
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/forgot-password.blade.php
View File

@ -41,14 +41,14 @@
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
<div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
<label for="email" class="required label-style">
<label for="email" class="mandatory label-style">
{{ __('shop::app.customer.forgot-password.email') }}
</label>
<input
type="email"
class="form-style"
name="email"
class="form-style"
v-validate="'required|email'" />
<span class="control-error" v-if="errors.has('email')">

4
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/reset-password.blade.php
View File

@ -28,6 +28,8 @@
{{ csrf_field() }}
<input type="hidden" name="token" value="{{ $token }}">
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
<div :class="`form-group ${errors.has('email') ? 'has-error' : ''}`">
@ -73,7 +75,7 @@
<input
type="password"
class="form-style"
name="confirm_password"
name="password_confirmation"
v-validate="'required|min:6|confirmed:password'" />
<span class="control-error" v-if="errors.has('confirm_password')">