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

Merge remote-tracking branch 'upstream/master' into issue-4592

This commit is contained in:
devansh bawari 2021-02-10 18:22:03 +05:30
parent 82270012a6 044c7ba0cd
commit ff64b336fb
10 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{ {
"/js/shop.js": "/js/shop.js?id=83c93b077da401f7b709", "/js/shop.js": "/js/shop.js?id=83c93b077da401f7b709",
"/css/shop.css": "/css/shop.css?id=6f4a4f8fad1b25e05e33" "/css/shop.css": "/css/shop.css?id=5010731b9744e6f9a8d2"
} }

29
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -409,6 +409,7 @@ input {
} }
.product-card { .product-card {
height: 480px;
position: relative; position: relative;
padding: 15px; padding: 15px;
@ -448,6 +449,30 @@ input {
} }
.cart-wish-wrap { .cart-wish-wrap {
position: absolute;
display: inline-flex;
justify-content: flex-start;
align-items: center;
bottom: 5px;
height: 40px;
.addtocart {
margin-right: 10px;
text-transform: uppercase;
text-align: left;
box-shadow: 1px 1px 0px $shadow-color;
}
.add-to-wishlist {
margin-top: 5px;
background: transparent;
border: 0;
cursor: pointer;
padding: 0;
}
}
.default-wrap {
display: inline-flex; display: inline-flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
@ -4724,10 +4749,14 @@ td {
.cart-wish-wrap { .cart-wish-wrap {
display: flex; display: flex;
} }
.default-wrap {
display: flex;
}
.white-cross-sm-icon { .white-cross-sm-icon {
width: 24px; width: 24px;
height:24px; height:24px;
} }
.add-to-wishlist { .add-to-wishlist {
margin-top: auto;
margin-left: 15px; margin-left: 15px;
} }

4
packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php
View File

@ -1,10 +1,12 @@
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
@php @php
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false; $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false; $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
@endphp @endphp
<div class="cart-wish-wrap"> <div class="{{ $toolbarHelper->isModeActive('grid') ? 'cart-wish-wrap' : 'default-wrap' }}">
<form action="{{ route('cart.add', $product->product_id) }}" method="POST"> <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
@csrf @csrf
<input type="hidden" name="product_id" value="{{ $product->product_id }}"> <input type="hidden" name="product_id" value="{{ $product->product_id }}">

2
packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
View File

@ -50,7 +50,7 @@
<span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span> <span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span>
<img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" alt="" /> <img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" :title="option.label" alt="" />
<span v-if="attribute.swatch_type == 'text'"> <span v-if="attribute.swatch_type == 'text'">
@{{ option.label }} @{{ option.label }}

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/mix-manifest.json
View File

@ -1,5 +1,5 @@
{ {
"/js/velocity.js": "/js/velocity.js?id=a45dba1beb5c6f79193d", "/js/velocity.js": "/js/velocity.js?id=a45dba1beb5c6f79193d",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd", "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=95193c65a710e5472b42" "/css/velocity.css": "/css/velocity.css?id=a0d4320e35797371f8f0"
} }

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -801,6 +801,10 @@
content: "\e93e"; content: "\e93e";
} }
&.compare::before {
content: "\e93b";
}
&.orders::before { &.orders::before {
content: "\e931"; content: "\e931";
} }

9
packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php
View File

@ -113,6 +113,15 @@
</li> </li>
@endif @endif
@if (core()->getConfigData('general.content.shop.compare_option'))
<li>
<a href="{{ route('velocity.customer.product.compare') }}" class="unset">
<i class="icon compare text-down-3"></i>
<span>{{ __('shop::app.customer.compare.text') }}</span>
</a>
</li>
@endif
<li> <li>
<a href="{{ route('customer.orders.index') }}" class="unset"> <a href="{{ route('customer.orders.index') }}" class="unset">
<i class="icon orders text-down-3"></i> <i class="icon orders text-down-3"></i>

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
View File

@ -76,7 +76,7 @@
<span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span> <span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span>
<img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" alt="" /> <img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" :title="option.label" alt="" />
<span v-if="attribute.swatch_type == 'text'"> <span v-if="attribute.swatch_type == 'text'">
@{{ option.label }} @{{ option.label }}