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

Merge branch 'prateek-latest1' into velocity-1

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-07 12:35:50 +05:30
parent ae295909f5 88aa23ed97
commit 09ac27a062
4 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2776,14 +2776,14 @@ header #search-form > *:focus {
}
.quick-view-btn-container {
display: none;
position: relative;
margin: 48px 1px 0px -18px;
}
.quick-view-btn-container span {
left: 32%;
top: -26px;
z-index: 1000;
z-index: 1;
font-size: 16px;
color: #FFFFFF;
position: absolute;
@ -2797,6 +2797,7 @@ header #search-form > *:focus {
font-size: 16px;
padding: 5px 10px 7px 24px;
position: absolute;
opacity: 0.8;
background-color: #0D2438;
}
@ -2868,6 +2869,10 @@ body::after {
padding: 0px !important;
}
.demo {
border: 1px solid red;
}
.footer {
width: 100%;
background-color: #ffffff;

8
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -615,13 +615,13 @@ header #search-form > *:focus {
}
.quick-view-btn-container {
display: none;
position: relative;
margin: 48px 1px 0px -18px;
span {
left: 32%;
top: -26px;
z-index: 1000;
z-index: 1;
font-size: 16px;
color: #FFFFFF;
position: absolute;
@ -635,6 +635,7 @@ header #search-form > *:focus {
font-size: 16px;
padding: 5px 10px 7px 24px;
position: absolute;
opacity: 0.8;
background-color: #0D2438;
}
}
@ -715,3 +716,6 @@ body::after {
padding: 0px !important;
}
.demo {
border: 1px solid red;
}

56
packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
View File

@ -1,26 +1,34 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@php
$productBaseImage = $productImageHelper->getProductBaseImage($product);
$productPrice = $product->getTypeInstance()->getProductPrices();
$totalReviews = $product->reviews;
$avgRatings = ceil($reviewHelper->getAverageRating($product));
@endphp
<?php
foreach ($totalReviews as $review) {
$productReview = $review;
}
?>
<script type="text/x-template" id="quick-view-btn-template">
<div
class="quick-view-btn-container"
id="quick-view-btn-container"
:name="details"
@click="openQuickView({details: details, event: $event})">
{{-- <product-quick-view
<product-quick-view
v-if="quickViewDetails"
:quick-view-details="quickViewDetails"
></product-quick-view>
<span class="rango-zoom-plus"></span>
<button type="button">Quick View</button> --}}
<button type="button">Quick View</button>
</div>
</script>
@ -42,28 +50,36 @@
</ul>
</div>
<div class="col-lg-6 cd-item-info fs14">
<h2 class="text-nowrap fw6" v-text="quickViewDetails['name']"></h2>
<div class="col-lg-6 cd-item-info fs16">
<h2 class="text-nowrap fw6">{{ $product->name }}</h2>
<h2 class="text-nowrap fw6">{{ $productPrice['final_price']['formated_price'] }}</h2>
<div class="product-price fs14">
<h2 class="text-nowrap fw6">{{ $product->price }}</h2>
</div>
<star-ratings :ratings="quickViewDetails['star-rating']" push-class="display-inbl"></star-ratings>
<span class="align-vertical-top"> 25 ratings</span>
@if ($totalReviews)
<div class="">
{{ $productReview['rating'] }} Ratings
</div>
@else
<div class="">
<a href="">{{ __('velocity::app.products.be-first-review') }}</a>
</div>
@endif
<p class="pt20">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
{!! $product->description !!}
</p>
<div class="close-btn rango-close fs18 cursor-pointer" @click="closeQuickView"></div>
<div class="action-buttons">
<add-to-cart-btn></add-to-cart-btn>
<span class="rango-exchange fs24"></span>
<span class="rango-heart fs24"></span>
<div style="display: inline-block;" class="rango-exchange fs24"></div>
<div style="display: inline-block;" class="rango-heart fs24"></div>
</div>
</div>
<div class="close-btn rango-close fs18 cursor-pointer" @click="closeQuickView"></div>
</div>
</script>
@ -101,7 +117,7 @@
// 'left': '200px',
// }, 3000, 'ease');
this.quickViewDetails = details;
this.quickViewDetails = true;
}
}
})
@ -114,8 +130,6 @@
// backgroud blur
let body = $('body');
// body.addClass('body-blur');
return {
body: body,
currentlyActiveImage: 0,
@ -124,13 +138,13 @@
},
mounted: function () {
// console.log(this.quickViewDetails, this.quickView);
},
methods: {
closeQuickView: function () {
// this.body.removeClass('body-blur');
this.quickView = false;
this.$parent.quickViewDetails = false;
this.quickViewDetails = false;
},
changeImage: function (imageIndex) {

4
packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php
View File

@ -1,6 +1,7 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
@include('shop::UI.product-quick-view')
@php
if (isset($checkmode) && $checkmode && $toolbarHelper->getCurrentMode() == "list") {
@ -68,6 +69,8 @@
alt="{{ $product->name }}">
</a>
<quick-view-btn details="{{ $product }}"></quick-view-btn>
<div class="card-body">
<div class="product-name">
<a
@ -101,5 +104,4 @@
</div>
@endif
{!! view_render_event('bagisto.shop.products.list.card.after', ['product' => $product]) !!}