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

Merge branch 'master' of https://github.com/bagisto/bagisto into newissue

This commit is contained in:
mohd asif 2020-07-09 10:00:39 +05:30
parent f81e56ce2f e2b941ff71
commit f5b892e47c
10 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php
View File

@ -1,4 +1,4 @@
<input type="text" v-validate="'{{$validations}}'" class="control" id="{{ $attribute->code }}" name="{{ $attribute->code }}" value="{{ old($attribute->code) ?: $product[$attribute->code] }}" {{ in_array($attribute->code, ['sku', 'url_key']) ? 'v-slugify' : '' }} data-vv-as="&quot;{{ $attribute->admin_name }}&quot;" {{ $attribute->code == 'name' ? 'v-slugify-target=\'url_key\'' : '' }} />
<input type="text" v-validate="'{{$validations}}'" class="control" id="{{ $attribute->code }}" name="{{ $attribute->code }}" value="{{ old($attribute->code) ?: $product[$attribute->code] }}" {{ in_array($attribute->code, ['sku', 'url_key']) ? 'v-slugify' : '' }} data-vv-as="&quot;{{ $attribute->admin_name }}&quot;" {{ $attribute->code == 'name' && ! $product[$attribute->code] ? 'v-slugify-target=\'url_key\'' : '' }} />

4
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -138,14 +138,14 @@
{!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!}
@if (! is_null($order->customer))
@if (! is_null($order->customer) && ! is_null($order->customer->group))
<div class="row">
<span class="title">
{{ __('admin::app.customers.customers.customer_group') }}
</span>
<span class="value">
{{ $order->customer->group['name'] }}
{{ $order->customer->group->name }}
</span>
</div>
@endif

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

@ -191,7 +191,7 @@ return [
'edit-profile' => [
'title' => 'Edit Profile',
'page-title' => 'Edit Profile Form'
'page-title' => 'Edit Profile'
]
],
@ -213,7 +213,7 @@ return [
],
'create' => [
'page-title' => 'Add Address Form',
'page-title' => 'Add Address',
'company_name' => 'Company name',
'first_name' => 'First name',
'last_name' => 'Last name',

2
packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
View File

@ -87,7 +87,7 @@
<div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
<label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
<input type="password" id="password" class="control" name="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'" ref="password">
<input type="password" id="password" class="control" name="password" ref="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'">
<span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
</div>

2
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=226121407d7f6a559c67",
"/js/velocity.js": "/js/velocity.js?id=ed145773873729794808",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=c8200b428c2a06a6d752"
"/css/velocity.css": "/css/velocity.css?id=6c43acad8e2d191dd992"
}

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

@ -31,6 +31,7 @@
> div {
&.row {
padding-bottom: 30px;
display: inline-block;
}
}
}

18
packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss vendored
View File

@ -40,6 +40,20 @@ body {
float: right;
}
}
.mini-cart-container {
#mini-cart {
.badge {
top: -6px;
left: 90%;
}
.cart-text {
left: 24px;
vertical-align: top;
}
}
}
}
.main-content-wrapper {
@ -168,6 +182,10 @@ body {
left: unset;
right: -10px;
}
.card-total-price {
float: left;
}
}
}

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

@ -155,6 +155,7 @@
<input
value=""
name="password"
ref="password"
type="password"
v-validate="'min:6|max:18'" />