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

Merge pull request #3355 from shubhwebkul/master 

misc. bug fixes
This commit is contained in:
Jitendra Singh 2020-06-25 12:33:01 +05:30 committed by GitHub
parent 549c0e38d3 c3c23d1e6d
commit fe3c95f463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 86 additions and 56 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=ac80a6434bb67471e57f",
"/js/velocity.js": "/js/velocity.js?id=226121407d7f6a559c67",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=9910b405e16e5582cf35"
"/css/velocity.css": "/css/velocity.css?id=a96303e9f5fc83af658f"
}

1
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -332,6 +332,7 @@ class Helper extends Review
'description' => $product->description,
'shortDescription' => $product->short_description,
'firstReviewText' => trans('velocity::app.products.be-first-review'),
'new' => $product->new ? __('shop::app.products.new') : false,
'priceHTML' => view('shop::products.price', ['product' => $product])->render(),
'defaultAddToCart' => view('shop::products.add-buttons', ['product' => $product])->render(),
'addToCartHtml' => view('shop::products.add-to-cart', [

8
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/product-card.vue
View File

@ -18,6 +18,10 @@
</a>
</div>
<div class="sticker new" v-if="product.new">
{{ product.new }}
</div>
<div class="product-price" v-html="product.priceHTML"></div>
<div class="product-rating" v-if="product.totalReviews && product.totalReviews > 0">
@ -59,6 +63,10 @@
</a>
</div>
<div class="sticker new" v-if="product.new">
{{ product.new }}
</div>
<div class="product-price fs16" v-html="product.priceHTML"></div>
<div

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

@ -281,10 +281,8 @@
}
}
.product-price {
.sticker {
display: block;
}
.sticker {
display: block;
}
.card-body {
@ -368,10 +366,8 @@
display: block;
}
.product-price {
.sticker {
display: none;
}
.sticker {
display: none;
}
}
@ -920,7 +916,10 @@
}
#datagrid-filters {
width: 100%;
margin-bottom: 20px;
display: inline-flex;
justify-content: space-between;
> * {
display: inline-block;
@ -958,6 +957,8 @@
}
.dropdown-filters {
font-size: 16px;
.grid-dropdown-header {
display: inline-block;
}
@ -1045,9 +1046,25 @@
}
}
}
.filter-left {
@extend .pull-left;
}
.filter-right {
top: -25px;
width: 70%;
float: right;
position: relative;
.per-page {
right: 0;
position: absolute;
}
}
}
.filter-row-two {
.filtered-tags {
.filter-tag {
.cross-icon {
@extend .rango-default;
@ -1626,23 +1643,6 @@
margin-right: 6px;
}
.sticker {
top: 8px;
left: 8px;
border: none;
color: white;
display: none;
font-size: 14px;
font-weight: 600;
padding: 2px 10px;
position: absolute;
border-radius: 12px;
&.sale {
background-color: $theme-color;
}
}
.regular-price {
font-weight: 500;
margin-right: 10px;
@ -1660,6 +1660,27 @@
}
}
.sticker {
top: 8px;
left: 8px;
border: none;
color: white;
display: none;
font-size: 14px;
font-weight: 600;
padding: 2px 10px;
position: absolute;
border-radius: 12px;
&.sale {
background-color: $color-danger;
}
&.new {
background-color: $theme-color;
}
}
#app {
min-height: 65vh;
position: relative;

48
packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
View File

@ -72,13 +72,11 @@
<h1 class="fw6 mb10">{{ $category->name }}</h1>
@if ($isDescriptionDisplayMode)
<template v-if="products.length > 0">
@if ($category->description)
<div class="category-description">
{!! $category->description !!}
</div>
@endif
</template>
@if ($category->description)
<div class="category-description">
{!! $category->description !!}
</div>
@endif
@endif
</div>
@ -90,18 +88,20 @@
</div>
</div>
</div>
<div class="filters-container">
@include ('shop::products.list.toolbar')
</div>
<div
class="category-block"
@if ($category->display_mode == 'description_only')
style="width: 100%"
@endif>
@if ($isProductsDisplayMode)
@if ($isProductsDisplayMode)
<div class="filters-container">
<template v-if="products.length > 0">
@include ('shop::products.list.toolbar')
</template>
</div>
<div
class="category-block"
@if ($category->display_mode == 'description_only')
style="width: 100%"
@endif>
<shimmer-component v-if="isLoading && !isMobile()" shimmer-count="4"></shimmer-component>
<template v-else-if="products.length > 0">
@ -123,22 +123,22 @@
</product-card>
</div>
@endif
{!! view_render_event('bagisto.shop.productOrCategory.index.pagination.before', ['category' => $category]) !!}
<div class="bottom-toolbar">
{{ $products->appends(request()->input())->links() }}
</div>
{!! view_render_event('bagisto.shop.productOrCategory.index.pagination.after', ['category' => $category]) !!}
</template>
<div class="product-list empty" v-else>
<h2>{{ __('shop::app.products.whoops') }}</h2>
<p>{{ __('shop::app.products.empty') }}</p>
</div>
@endif
</div>
</div>
@endif
</div>
{!! view_render_event('bagisto.shop.productOrCategory.index.after', ['category' => $category]) !!}

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

@ -13,7 +13,7 @@
}
.toolbar-wrapper .col-4:first-child {
display: none;
display: none !important;
}
.toolbar-wrapper .col-4:last-child {