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

resolved issues

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-02-04 19:59:38 +05:30
parent 600c11585f
commit 0c9a9302a2
9 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1186,6 +1186,10 @@
width: 200px !important; width: 200px !important;
} }
.customer-options .customer-session {
padding: 10px 20px 0 20px;
}
.customer-options .customer-session label { .customer-options .customer-session label {
font-size: 18px; font-size: 18px;
color: #9e9e9e; color: #9e9e9e;
@ -1663,6 +1667,13 @@
color: #4D7EA8; color: #4D7EA8;
} }
.account-content .account-layout .account-table-content .filter-row-two .filter-tag .cross-icon::before {
top: 1px;
content: "\E91F";
margin-left: 4px;
position: relative;
}
.account-content .account-layout .account-items-list.wishlist-container { .account-content .account-layout .account-items-list.wishlist-container {
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
@ -4383,7 +4394,7 @@ button[disabled] {
vertical-align: middle; vertical-align: middle;
} }
.rango-default, .account-content .sidebar .customer-sidebar .navigation li i.icon, .account-content .account-layout .account-table-content #datagrid-filters ~ table.table tbody tr .action .eye-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon, .rango-default, .account-content .sidebar .customer-sidebar .navigation li i.icon, .account-content .account-layout .account-table-content #datagrid-filters ~ table.table tbody tr .action .eye-icon, .account-content .account-layout .account-table-content .filter-row-two .filter-tag .cross-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon,
.account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-left-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-right-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-left-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-right-icon,
.account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-left-icon { .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-left-icon {
speak: none; speak: none;
@ -13641,6 +13652,22 @@ body {
justify-content: unset; justify-content: unset;
} }
#top #account + .account-modal .modal-content {
padding: 0;
}
#top #account + .account-modal .modal-content ul li:hover {
background-color: #ECECEC;
}
#top #account + .account-modal .modal-content ul li a {
padding: 10px 20px;
}
#top #account + .account-modal .modal-content ul li:last-child {
margin-bottom: 5px;
}
#top > div:last-child { #top > div:last-child {
height: 32px; height: 32px;
} }

2
packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
View File

@ -24,7 +24,7 @@ class VelocityMetaDataSeeder extends Seeder
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>', 'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shippingon Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">ProductReplace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">ProductExchange and EMI Available </span></div></div></div></div></div>', 'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shippingon Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
]); ]);
DB::table('locales')->where('code', 'en')->update([ DB::table('locales')->where('code', 'en')->update([

11
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

@ -68,14 +68,17 @@ class ConfigurationController extends Controller
} }
} }
foreach ($params['product_view_images'] as $index => $productViewImage) { if (isset($params['product_view_images'])) {
if ($productViewImage !== "") { foreach ($params['product_view_images'] as $index => $productViewImage) {
$params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index); if ($productViewImage !== "") {
$params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index);
}
} }
$params['product_view_images'] = json_encode($params['product_view_images']);
} }
$params['advertisement'] = json_encode($params['advertisement']); $params['advertisement'] = json_encode($params['advertisement']);
$params['product_view_images'] = json_encode($params['product_view_images']);
$params['home_page_content'] = str_replace('=&gt;', '=>', $params['home_page_content']); $params['home_page_content'] = str_replace('=&gt;', '=>', $params['home_page_content']);
unset($params['images']); unset($params['images']);

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

@ -220,6 +220,26 @@ body {
.modal-footer { .modal-footer {
justify-content: unset; justify-content: unset;
} }
.modal-content {
padding: 0;
ul {
li {
&:hover {
background-color: $border-light;
}
a {
padding: 10px 20px;
}
&:last-child {
margin-bottom: 5px;
}
}
}
}
} }
} }

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

@ -442,6 +442,8 @@
.customer-session { .customer-session {
padding: 10px 20px 0 20px;
label { label {
font-size: 18px; font-size: 18px;
color: $light-grey-clr; color: $light-grey-clr;
@ -967,6 +969,21 @@
} }
} }
} }
.filter-row-two {
.filter-tag {
.cross-icon {
@extend .rango-default;
&::before {
top: 1px;
content: "\e91f";
margin-left: 4px;
position: relative;
}
}
}
}
} }
.account-items-list { .account-items-list {

8
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -130,22 +130,22 @@
</image-wrapper> </image-wrapper>
</div> </div>
<div class="control-group"> {{-- <div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.advertisement-one') }}</label> <label>{{ __('velocity::app.admin.meta-data.advertisement-one') }}</label>
<image-wrapper <image-wrapper
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'" :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"
input-name="images[1]"> input-name="images[1]">
</image-wrapper> </image-wrapper>
</div> </div> --}}
<div class="control-group product-view-image"> {{-- <div class="control-group product-view-image">
<label>{{ __('velocity::app.admin.meta-data.product-view-image') }}</label> <label>{{ __('velocity::app.admin.meta-data.product-view-image') }}</label>
<image-wrapper <image-wrapper
input-name="product_view_images"> input-name="product_view_images">
</image-wrapper> </image-wrapper>
</div> </div> --}}
</div> </div>
</accordian> </accordian>

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

@ -130,7 +130,7 @@
name="term" name="term"
type="search" type="search"
class="form-control" class="form-control"
:value="searchedQuery.term" :value="searchedQuery.term ? searchedQuery.term.split('+').join(' ') : ''"
placeholder="{{ __('velocity::app.header.search-text') }}" /> placeholder="{{ __('velocity::app.header.search-text') }}" />
<button class="btn" type="submit" id="header-search-icon"> <button class="btn" type="submit" id="header-search-icon">

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

@ -117,7 +117,11 @@
@endauth @endauth
<a <a
class="unset ml30" class="unset
@auth('customer')
ml30
@endauth
"
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}" href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"
onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')"> onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">

2
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
View File

@ -61,9 +61,7 @@
{{ __('shop::app.customer.account.address.create.submit') }} {{ __('shop::app.customer.account.address.create.submit') }}
</button> </button>
</div> </div>
</div> </div>
</form> </form>
{!! view_render_event('bagisto.shop.customers.account.address.create.after') !!} {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}