minor bugs
This commit is contained in:
shubhammehrotra.symfony@webkul.com
parent
7cfd51173f
commit
0cbf2ee670
|
|
@ -780,6 +780,41 @@
|
|||
display: inline-block;
|
||||
}
|
||||
|
||||
.grid-container {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.filter-row-one {
|
||||
display: -webkit-inline-box;
|
||||
display: -ms-inline-flexbox;
|
||||
display: inline-flex;
|
||||
width: 100%;
|
||||
-webkit-box-pack: justify;
|
||||
-ms-flex-pack: justify;
|
||||
justify-content: space-between;
|
||||
-webkit-box-align: center;
|
||||
-ms-flex-align: center;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.filter-row-one .dropdown-filters {
|
||||
position: absolute;
|
||||
right: 25px;
|
||||
}
|
||||
|
||||
.filter-row-one .per-page {
|
||||
right: 250px;
|
||||
}
|
||||
|
||||
.filter-row-one .per-page .per-page-label {
|
||||
position: absolute;
|
||||
right: 120px;
|
||||
width: 100%;
|
||||
top: 8px;
|
||||
}
|
||||
|
||||
.review-page-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
|
@ -1440,6 +1475,7 @@
|
|||
|
||||
.account-content .account-layout .account-items-list.wishlist-container .col-3 #product-card-new {
|
||||
margin: 0;
|
||||
width: 22rem;
|
||||
}
|
||||
|
||||
.account-content .account-layout .max-sm-img-dimention {
|
||||
|
|
@ -1501,6 +1537,13 @@
|
|||
content: "\E907";
|
||||
}
|
||||
|
||||
.account-content .select-icon {
|
||||
left: 95%;
|
||||
top: -28px;
|
||||
font-size: 22px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.alert {
|
||||
right: 15px !important;
|
||||
top: 50px !important;
|
||||
|
|
@ -1952,8 +1995,7 @@
|
|||
}
|
||||
|
||||
.downloadable-container .sample-list {
|
||||
padding: 15px 0;
|
||||
border-top: solid 1px rgba(162, 162, 162, 0.2);
|
||||
padding: 5px 0;
|
||||
}
|
||||
|
||||
.downloadable-container .sample-list h3 {
|
||||
|
|
@ -1970,8 +2012,7 @@
|
|||
}
|
||||
|
||||
.downloadable-container .link-list {
|
||||
padding: 15px 0;
|
||||
border-top: solid 1px rgba(162, 162, 162, 0.2);
|
||||
padding: 5px 0;
|
||||
}
|
||||
|
||||
.downloadable-container .link-list h3 {
|
||||
|
|
@ -3311,6 +3352,7 @@ body::after {
|
|||
|
||||
.lg-card-container.list-card {
|
||||
margin-left: 0px;
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
.lg-card-container.list-card .background-image-group {
|
||||
|
|
@ -3354,6 +3396,16 @@ body::after {
|
|||
display: block;
|
||||
}
|
||||
|
||||
.lg-card-container.list-card .wishlist-icon {
|
||||
height: 34px;
|
||||
display: table;
|
||||
}
|
||||
|
||||
.lg-card-container.list-card .wishlist-icon i {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.lg-card-container.grid-card {
|
||||
padding: 15px;
|
||||
}
|
||||
|
|
@ -3784,6 +3836,16 @@ button[disabled] {
|
|||
background-position-y: center;
|
||||
}
|
||||
|
||||
.product-detail .wishlist-icon {
|
||||
height: 46px;
|
||||
display: table;
|
||||
}
|
||||
|
||||
.product-detail .wishlist-icon i {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/*!
|
||||
* Bootstrap v3.4.1 (https://getbootstrap.com/)
|
||||
* Copyright 2011-2019 Twitter, Inc.
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ class VelocityServiceProvider extends ServiceProvider
|
|||
$velocityHelper = app('Webkul\Velocity\Helpers\Helper');
|
||||
$velocityMetaData = $velocityHelper->getVelocityMetaData();
|
||||
|
||||
view()->share('showRecentlyViewed', false);
|
||||
view()->share('velocityMetaData', $velocityMetaData);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -707,6 +707,7 @@
|
|||
|
||||
#product-card-new {
|
||||
margin: 0;
|
||||
width: 22rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -789,6 +790,13 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.select-icon {
|
||||
left: 95%;
|
||||
top: -28px;
|
||||
font-size: 22px;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.alert {
|
||||
|
|
@ -1271,8 +1279,7 @@
|
|||
|
||||
.downloadable-container {
|
||||
.sample-list {
|
||||
padding: 15px 0;
|
||||
border-top: solid 1px rgba(162, 162, 162, 0.2);
|
||||
padding: 5px 0;
|
||||
|
||||
h3 {
|
||||
font-size: 16px;
|
||||
|
|
@ -1291,8 +1298,7 @@
|
|||
}
|
||||
|
||||
.link-list {
|
||||
padding: 15px 0;
|
||||
border-top: solid 1px rgba(162, 162, 162, 0.2);
|
||||
padding: 5px 0;
|
||||
|
||||
h3 {
|
||||
font-size: 16px;
|
||||
|
|
@ -1411,7 +1417,7 @@
|
|||
}
|
||||
|
||||
button:focus,
|
||||
button:active, {
|
||||
button:active {
|
||||
outline: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -343,4 +343,14 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wishlist-icon {
|
||||
height: 46px;
|
||||
display: table;
|
||||
|
||||
i {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -381,6 +381,7 @@
|
|||
|
||||
&.list-card {
|
||||
margin-left: 0px;
|
||||
padding-left: 0px;
|
||||
|
||||
.background-image-group {
|
||||
height: 100%;
|
||||
|
|
@ -426,6 +427,16 @@
|
|||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.wishlist-icon {
|
||||
height: 34px;
|
||||
display: table;
|
||||
|
||||
i {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.grid-card {
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@
|
|||
|
||||
<form
|
||||
method="POST"
|
||||
@submit.prevent="onSubmit"
|
||||
class="account-table-content"
|
||||
action="{{ route('customer.profile.edit') }}"
|
||||
@submit.prevent="onSubmit">
|
||||
action="{{ route('customer.profile.edit') }}">
|
||||
|
||||
@csrf
|
||||
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="row mb-0">
|
||||
<label class="col-12">
|
||||
{{ __('shop::app.customer.account.profile.gender') }}
|
||||
</label>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<div class="col-12">
|
||||
<select
|
||||
name="gender"
|
||||
class="control"
|
||||
class="control styled-select"
|
||||
v-validate="'required'"
|
||||
data-vv-as=""{{ __('shop::app.customer.account.profile.gender') }}"">
|
||||
|
||||
|
|
@ -86,7 +86,10 @@
|
|||
{{ __('velocity::app.shop.gender.female') }}
|
||||
</option>
|
||||
</select>
|
||||
|
||||
<span class="select-icon rango-arrow-down"></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
|
@ -95,7 +98,11 @@
|
|||
</label>
|
||||
|
||||
<div class="col-12">
|
||||
<input value="{{ $customer->date_of_birth }}" name="date_of_birth" type="text" placeholder="dd/mm/yyyy" />
|
||||
<input
|
||||
type="date"
|
||||
name="date_of_birth"
|
||||
placeholder="dd/mm/yyyy"
|
||||
value="{{ $customer->date_of_birth }}" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,9 @@
|
|||
@endif
|
||||
@include ('shop::products.list.card', [
|
||||
'checkmode' => true,
|
||||
'product' => $item->product
|
||||
'itemId' => $item->id,
|
||||
'removeWishlist' => true,
|
||||
'product' => $item->product,
|
||||
])
|
||||
@if ($currentMode == "grid")
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
$newProducts = app('Webkul\Product\Repositories\ProductRepository')->getNewProducts(6)->items();
|
||||
|
||||
$products = array_merge(array_merge($newProducts, $newProducts), $newProducts);
|
||||
|
||||
$showRecentlyViewed = true;
|
||||
@endphp
|
||||
|
||||
<div class="container-fluid accessories">
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
$featuredProducts = app('Webkul\Velocity\Repositories\Product\ProductRepository')->getFeaturedProducts($count);
|
||||
|
||||
$featuredProductsCount = $featuredProducts->count();
|
||||
|
||||
$showRecentlyViewed = true;
|
||||
@endphp
|
||||
|
||||
@if ($featuredProductsCount)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
@php
|
||||
$newProducts = app('Webkul\Product\Repositories\ProductRepository')->getNewProducts(6)->items();
|
||||
|
||||
$showRecentlyViewed = false;
|
||||
@endphp
|
||||
|
||||
@if (! empty($newProducts))
|
||||
|
|
|
|||
|
|
@ -67,11 +67,11 @@
|
|||
<h4 class="fw6 display-inbl">@{{ attribute.name ? attribute.name : attribute.admin_name }}</h4>
|
||||
|
||||
<div class="pull-right">
|
||||
<span class="remove-filter-link" v-if="appliedFilters.length" @click.stop="clearFilters()">
|
||||
<span class="link-color cursor-pointer" v-if="appliedFilters.length" @click.stop="clearFilters()">
|
||||
{{ __('shop::app.products.remove-filter-link-title') }}
|
||||
</span>
|
||||
|
||||
<i class="icon" :class="[active ? 'arrow-up-icon' : 'arrow-down-icon']"></i>
|
||||
<i :class="`icon fs16 ${active ? 'rango-arrow-up' : 'rango-arrow-down'}`"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -91,8 +91,6 @@
|
|||
<div class="price-range-wrapper" v-if="attribute.type == 'price'">
|
||||
<vue-slider
|
||||
ref="slider"
|
||||
:lazy="true"
|
||||
:max="sliderConfig.max"
|
||||
v-model="sliderConfig.value"
|
||||
:process-style="sliderConfig.processStyle"
|
||||
:tooltip-style="sliderConfig.tooltipStyle"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
@include ('shop::products.list.recently-viewed')
|
||||
@if ($showRecentlyViewed)
|
||||
@include ('shop::products.list.recently-viewed')
|
||||
@endif
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
$avgRatings = $reviewHelper->getAverageRating($product);
|
||||
$avgStarRating = ceil($avgRatings);
|
||||
|
||||
$showRecentlyViewed = false;
|
||||
@endphp
|
||||
|
||||
@section('page_title')
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<label>{{ __('shop::app.products.total-amount') }}</label>
|
||||
|
||||
<div class="bundle-price">
|
||||
@{{ formated_total_price | currency(currency_options) }}
|
||||
@{{ formated_total_price }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
<script type="text/x-template" id="bundle-option-item-template">
|
||||
<div class="bundle-option-item">
|
||||
<div class="control-group" :class="[errors.has('bundle_options[' + option.id + '][]') ? 'has-error' : '']">
|
||||
<div :class="`control-group ${errors.has('bundle_options[' + option.id + '][]') ? 'has-error' : ''}`">
|
||||
<label :class="[option.is_required ? 'required' : '']">@{{ option.label }}</label>
|
||||
|
||||
<div v-if="option.type == 'select'">
|
||||
|
|
@ -65,14 +65,25 @@
|
|||
|
||||
<div v-if="option.type == 'radio'">
|
||||
<span class="radio" v-if="! option.is_required">
|
||||
<input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" value="0" :id="'bundle_options[' + option.id + '][]'">
|
||||
<input
|
||||
type="radio"
|
||||
:name="'bundle_options[' + option.id + '][]'"
|
||||
v-model="selected_product"
|
||||
value="0" />
|
||||
|
||||
<label class="radio-view" :for="'bundle_options[' + option.id + '][]'"></label>
|
||||
|
||||
{{ __('shop::app.products.none') }}
|
||||
</span>
|
||||
|
||||
<span class="radio col-12 ml5" v-for="(product, index2) in option.products">
|
||||
<input type="radio" :name="'bundle_options[' + option.id + '][]'" v-model="selected_product" v-validate="option.is_required ? 'required' : ''" :data-vv-as="'"' + option.label + '"'" :value="product.id" :id="'bundle_options[' + option.id + '][]'">
|
||||
<input
|
||||
type="radio"
|
||||
:name="'bundle_options[' + option.id + '][]'"
|
||||
v-model="selected_product"
|
||||
v-validate="option.is_required ? 'required' : ''"
|
||||
:data-vv-as="'"' + option.label + '"'"
|
||||
:value="product.id" />
|
||||
|
||||
@{{ product.name }}
|
||||
|
||||
|
|
@ -118,7 +129,7 @@
|
|||
</div>
|
||||
</script>
|
||||
|
||||
<script>
|
||||
<script type="text/javascript">
|
||||
Vue.component('bundle-option-list', {
|
||||
|
||||
template: '#bundle-option-list-template',
|
||||
|
|
@ -127,11 +138,9 @@
|
|||
|
||||
data: function() {
|
||||
return {
|
||||
config: @json(app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product)),
|
||||
|
||||
options: [],
|
||||
|
||||
currency_options: @json(core()->getAccountJsSymbols())
|
||||
currency_options: @json(core()->getAccountJsSymbols()),
|
||||
config: @json(app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product)),
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
@push('scripts')
|
||||
|
||||
<script type="text/x-template" id="product-options-template">
|
||||
<div class="attributes">
|
||||
<div class="attributes" v-if="childAttributes.length > 0">
|
||||
|
||||
<input type="hidden" id="selected_configurable_option" name="selected_configurable_option" :value="selectedProductId">
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
<div class="sample-list">
|
||||
<h3>{{ __('shop::app.products.samples') }}</h3>
|
||||
|
||||
<ul>
|
||||
<ul type="none">
|
||||
@foreach ($product->downloadable_samples as $sample)
|
||||
<li>
|
||||
<a href="{{ route('shop.downloadable.download_sample', ['type' => 'sample', 'id' => $sample->id]) }}" target="_blank">
|
||||
<a class="remove-decoration" href="{{ route('shop.downloadable.download_sample', ['type' => 'sample', 'id' => $sample->id]) }}" target="_blank">
|
||||
{{ $sample->title }}
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -26,15 +26,30 @@
|
|||
<ul type="none" class="mt15">
|
||||
@foreach ($product->downloadable_links as $link)
|
||||
<li>
|
||||
<span class="checkbox col-12 ml10">
|
||||
<input type="checkbox" name="links[]" v-validate="'required'" value="{{ $link->id }}" id="{{ $link->id }}" data-vv-as=""{{ __('shop::app.products.links') }}""/>
|
||||
{{ $link->title . ' + ' . core()->currency($link->price) }}
|
||||
</span>
|
||||
<div class="checkbox col-12 ml10">
|
||||
<input
|
||||
name="links[]"
|
||||
type="checkbox"
|
||||
id="{{ $link->id }}"
|
||||
v-validate="'required'"
|
||||
value="{{ $link->id }}"
|
||||
data-vv-as=""{{ __('shop::app.products.links') }}"" />
|
||||
|
||||
<span>{{ $link->title . ' + ' . core()->currency($link->price) }}</span>
|
||||
|
||||
@if ($link->sample_file || $link->sample_url)
|
||||
<a
|
||||
target="_blank"
|
||||
class="remove-decoration"
|
||||
href="{{ route('shop.downloadable.download_sample', [
|
||||
'type' => 'link',
|
||||
'id' => $link->id
|
||||
]) }}">
|
||||
|
||||
{{ __('shop::app.products.sample') }}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@if ($link->sample_file || $link->sample_url)
|
||||
<a href="{{ route('shop.downloadable.download_sample', ['type' => 'link', 'id' => $link->id]) }}" target="_blank">
|
||||
{{ __('shop::app.products.sample') }}
|
||||
</a>
|
||||
@endif
|
||||
</li>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -9,7 +9,12 @@
|
|||
|
||||
<a
|
||||
class="unset wishlist-icon col-4 offset-4 text-right"
|
||||
href="{{ route('customer.wishlist.' . ($isWished ? 'remove' : 'add'), $product->product_id) }}">
|
||||
@if (! $isWished)
|
||||
href="{{ route('customer.wishlist.add', $product->product_id) }}"
|
||||
@elseif (isset($itemId) && $itemId)
|
||||
href="{{ route('customer.wishlist.remove', $itemId) }}"
|
||||
@endif
|
||||
>
|
||||
|
||||
<i class="fs24 {{ $isWished ? 'rango-heart-fill' : 'rango-heart'}}"></i>
|
||||
</a>
|
||||
|
|
|
|||
Loading…
Reference in New Issue