Merge branch 'master' into issue-4192
This commit is contained in:
devansh bawari
commit
3fe1b76354
|
|
@ -2,12 +2,13 @@
|
|||
|
||||
namespace Webkul\Admin\DataGrids;
|
||||
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Webkul\Core\Models\Channel;
|
||||
use Webkul\Ui\DataGrid\DataGrid;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class SliderDataGrid extends DataGrid
|
||||
{
|
||||
protected $index = 'slider_id';
|
||||
protected $index = 'id';
|
||||
|
||||
protected $sortOrder = 'desc';
|
||||
|
||||
|
|
@ -15,7 +16,11 @@ class SliderDataGrid extends DataGrid
|
|||
|
||||
protected $channel = 'all';
|
||||
|
||||
/** @var string[] contains the keys for which extra filters to render */
|
||||
/**
|
||||
* Contains the keys for which extra filters to render.
|
||||
*
|
||||
* @var string[]
|
||||
**/
|
||||
protected $extraFilters = [
|
||||
'channels',
|
||||
'locales',
|
||||
|
|
@ -26,25 +31,32 @@ class SliderDataGrid extends DataGrid
|
|||
parent::__construct();
|
||||
|
||||
$this->locale = request()->get('locale') ?? 'all';
|
||||
$this->channel = request()->get('channel') ?? 'all';
|
||||
$this->channel = request()->get('channel')
|
||||
? Channel::find(request()->get('channel'))->code
|
||||
: 'all';
|
||||
}
|
||||
|
||||
public function prepareQueryBuilder()
|
||||
{
|
||||
$queryBuilder = DB::table('sliders as sl')
|
||||
->addSelect('sl.id as slider_id', 'sl.title', 'sl.locale', 'ch.name', 'ch.code')
|
||||
->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id');
|
||||
->select('sl.id', 'sl.title', 'sl.locale', 'ct.channel_id', 'ct.name', 'ch.code')
|
||||
->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id')
|
||||
->leftJoin('channel_translations as ct', 'ch.id', '=', 'ct.channel_id')
|
||||
->where('ct.locale', app()->getLocale());
|
||||
|
||||
if ($this->locale !== 'all') {
|
||||
$queryBuilder->where('locale', $this->locale);
|
||||
$queryBuilder->where('sl.locale', $this->locale);
|
||||
}
|
||||
|
||||
if ($this->channel !== 'all') {
|
||||
$queryBuilder->where('ch.code', $this->channel);
|
||||
}
|
||||
|
||||
$this->addFilter('slider_id', 'sl.id');
|
||||
$this->addFilter('channel_name', 'ch.name');
|
||||
$this->addFilter('id', 'sl.id');
|
||||
$this->addFilter('title', 'sl.title');
|
||||
$this->addFilter('locale', 'sl.locale');
|
||||
$this->addFilter('channel_name', 'ct.name');
|
||||
$this->addFilter('code', 'ch.code');
|
||||
|
||||
$this->setQueryBuilder($queryBuilder);
|
||||
}
|
||||
|
|
@ -52,7 +64,7 @@ class SliderDataGrid extends DataGrid
|
|||
public function addColumns()
|
||||
{
|
||||
$this->addColumn([
|
||||
'index' => 'slider_id',
|
||||
'index' => 'id',
|
||||
'label' => trans('admin::app.datagrid.id'),
|
||||
'type' => 'number',
|
||||
'searchable' => false,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"/js/velocity.js": "/js/velocity.js?id=af074ac94f7551acf57a",
|
||||
"/js/velocity.js": "/js/velocity.js?id=d5391a65146f1d0f4ca1",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
|
||||
"/css/velocity.css": "/css/velocity.css?id=4677934b59588001cd97"
|
||||
"/css/velocity.css": "/css/velocity.css?id=69e21a90a84bca6263e5"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<h2 class="col-6 text-left fw6">
|
||||
<h5 class="col-6 text-left fw6">
|
||||
{{ subtotalText }}
|
||||
</h2>
|
||||
</h5>
|
||||
|
||||
<h2 class="col-6 text-right fw6 no-padding">{{ cartInformation.base_sub_total }}</h2>
|
||||
<h5 class="col-6 text-right fw6 no-padding">{{ cartInformation.base_sub_total }}</h5>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
|
|
@ -64,6 +64,12 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.hide {
|
||||
display: none !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: [
|
||||
|
|
|
|||
|
|
@ -2,50 +2,52 @@
|
|||
<div class="modal-parent scrollable">
|
||||
<div class="cd-quick-view">
|
||||
<template v-if="showProductDetails || true">
|
||||
<div class="col-lg-6 product-gallery">
|
||||
<ul class="cd-slider" type="none">
|
||||
<carousel-component
|
||||
slides-per-page="1"
|
||||
navigation-enabled="hide"
|
||||
:slides-count="product.galleryImages.length">
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<ul class="cd-slider" type="none">
|
||||
<carousel-component
|
||||
slides-per-page="1"
|
||||
navigation-enabled="hide"
|
||||
:slides-count="product.galleryImages.length">
|
||||
|
||||
<slide
|
||||
:key="index"
|
||||
:slot="`slide-${index}`"
|
||||
title=" "
|
||||
v-for="(image, index) in product.galleryImages">
|
||||
<slide
|
||||
:key="index"
|
||||
:slot="`slide-${index}`"
|
||||
title=" "
|
||||
v-for="(image, index) in product.galleryImages">
|
||||
|
||||
<li class="selected" @click="showProductDetails = false">
|
||||
<img :src="image.medium_image_url" :alt="product.name" />
|
||||
</li>
|
||||
</slide>
|
||||
</carousel-component>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-6 fs16">
|
||||
<h2 class="fw6 quick-view-name">{{ product.name }}</h2>
|
||||
|
||||
<div class="product-price" v-html="product.priceHTML"></div>
|
||||
|
||||
<div
|
||||
class="product-rating"
|
||||
v-if="product.totalReviews && product.totalReviews > 0">
|
||||
|
||||
<star-ratings :ratings="product.avgRating"></star-ratings>
|
||||
<a class="pl10 unset active-hover" :href="`${$root.baseUrl}/reviews/${product.slug}`">
|
||||
{{ __('products.reviews-count', {'totalReviews': product.totalReviews}) }}
|
||||
</a>
|
||||
<li class="selected" @click="showProductDetails = false">
|
||||
<img :src="image.medium_image_url" :alt="product.name" />
|
||||
</li>
|
||||
</slide>
|
||||
</carousel-component>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="product-rating" v-else>
|
||||
<span class="fs14" v-text="product.firstReviewText"></span>
|
||||
</div>
|
||||
<div class="col-lg-6 fs16">
|
||||
<h2 class="fw6 quick-view-name">{{ product.name }}</h2>
|
||||
|
||||
<p class="pt14 fs14 description-text" v-html="product.shortDescription"></p>
|
||||
<div class="product-price" v-html="product.priceHTML"></div>
|
||||
|
||||
<div class="product-actions">
|
||||
<vnode-injector :nodes="getDynamicHTML(product.addToCartHtml)"></vnode-injector>
|
||||
<div
|
||||
class="product-rating"
|
||||
v-if="product.totalReviews && product.totalReviews > 0">
|
||||
|
||||
<star-ratings :ratings="product.avgRating"></star-ratings>
|
||||
<a class="pl10 unset active-hover" :href="`${$root.baseUrl}/reviews/${product.slug}`">
|
||||
{{ __('products.reviews-count', {'totalReviews': product.totalReviews}) }}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="product-rating" v-else>
|
||||
<span class="fs14" v-text="product.firstReviewText"></span>
|
||||
</div>
|
||||
|
||||
<p class="pt14 fs14 description-text" v-html="product.shortDescription"></p>
|
||||
|
||||
<div class="product-actions">
|
||||
<vnode-injector :nodes="getDynamicHTML(product.addToCartHtml)"></vnode-injector>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<span class="category-title">{{ category['name'] }}</span>
|
||||
|
||||
<i
|
||||
class="rango-arrow-right pr15 pull-right"
|
||||
class="rango-arrow-right pr15 float-right"
|
||||
@mouseout="toggleSidebar(id, $event, 'mouseout')"
|
||||
@mouseover="toggleSidebar(id, $event, 'mouseover')"
|
||||
v-if="category.children.length && category.children.length > 0">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
type="number"
|
||||
:value="showFilled"
|
||||
name="rating"
|
||||
class="hidden" />
|
||||
class="d-none" />
|
||||
|
||||
<i
|
||||
:class="`material-icons ${editable ? 'cursor-pointer' : ''}`"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap');
|
||||
|
||||
//velocity variables
|
||||
/* velocity variables */
|
||||
$white-color: #FFFFFF;
|
||||
$black-color: #111111;
|
||||
$font-color: rgba(0,0,0,0.83);
|
||||
|
|
@ -30,9 +30,10 @@ $light-link-color: #28557B;
|
|||
$grey-clr: rgba(0,0,0,0.53);
|
||||
$light-grey-clr: rgb(158, 158, 158);
|
||||
$light-background: #F7F7F9;
|
||||
|
||||
/* other stuffs */
|
||||
$sidebar-width: 230px;
|
||||
$box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
|
||||
$material-icons-font-path: "../material-icons/iconfont/" !default;
|
||||
$material-icons-font-path: '../material-icons/iconfont/' !default;
|
||||
$border-normal: 1px solid $border-dark;
|
||||
|
||||
$font-family-pro: 'Source Sans Pro', sans-serif;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
@import "components/rtl";
|
||||
|
||||
@import "static/material-icons";
|
||||
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
|
||||
|
||||
* {
|
||||
margin: 0;
|
||||
|
|
@ -196,6 +195,7 @@ body {
|
|||
display: table;
|
||||
min-width: 150px;
|
||||
cursor: pointer;
|
||||
float: right;
|
||||
text-align: right;
|
||||
padding-top: 5px;
|
||||
|
||||
|
|
@ -207,8 +207,6 @@ body {
|
|||
}
|
||||
|
||||
+ .account-modal {
|
||||
@extend .modal-dialog;
|
||||
|
||||
top: 40px;
|
||||
right: 10px;
|
||||
z-index: 101;
|
||||
|
|
@ -414,7 +412,7 @@ header {
|
|||
width: 210px;
|
||||
|
||||
.select-icon {
|
||||
top: 9px;
|
||||
top: -30px;
|
||||
right: 8px;
|
||||
z-index: 10;
|
||||
font-size: 18px;
|
||||
|
|
@ -485,6 +483,7 @@ header {
|
|||
.mini-cart-container {
|
||||
height: 50px;
|
||||
padding: 5px 17px;
|
||||
display: inline-block;
|
||||
|
||||
#mini-cart {
|
||||
.mini-cart-content {
|
||||
|
|
@ -514,15 +513,14 @@ header {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// transform: scale(1) rotateZ(-180deg);
|
||||
// transition: transform .15s,opacity .15s;
|
||||
}
|
||||
}
|
||||
|
||||
~ .compare-btn,
|
||||
~ .wishlist-btn {
|
||||
.left-wrapper {
|
||||
float: right;
|
||||
|
||||
.compare-btn, .wishlist-btn {
|
||||
height: 50px;
|
||||
float: right;
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
padding: 10px 16px 6px 16px;
|
||||
|
|
@ -544,6 +542,7 @@ header {
|
|||
padding: 4px;
|
||||
min-width: 20px;
|
||||
position: absolute;
|
||||
color: $font-color-light;
|
||||
background: $button-primary-bg;
|
||||
}
|
||||
}
|
||||
|
|
@ -888,7 +887,7 @@ header {
|
|||
text-align: center;
|
||||
vertical-align: middle;
|
||||
border-radius: 50%;
|
||||
background: #21a179;
|
||||
background: $button-primary-bg;
|
||||
color: #fff;
|
||||
padding: 16px;
|
||||
font: 18px "josefin sans", arial;
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@
|
|||
}
|
||||
|
||||
.product-card-new {
|
||||
width: 19rem;
|
||||
width: 12rem;
|
||||
height: 385px;
|
||||
border: none !important;
|
||||
margin: 0 5px 10px 10px;
|
||||
|
|
@ -555,7 +555,8 @@
|
|||
min-width: 20px;
|
||||
border-radius: 50%;
|
||||
position: relative;
|
||||
background: #21A179;
|
||||
color: $white-color;
|
||||
background: $button-primary-bg;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -574,6 +575,7 @@
|
|||
padding: 4px;
|
||||
min-width: 20px;
|
||||
position: absolute;
|
||||
color: $white-color;
|
||||
background: $button-primary-bg;
|
||||
}
|
||||
}
|
||||
|
|
@ -641,7 +643,7 @@
|
|||
.rango-close {
|
||||
top: -10px;
|
||||
left: -10px;
|
||||
padding: 3px 4px 3px 3px;
|
||||
padding: 0px 4px 3px 3px;
|
||||
font-size: 10px;
|
||||
max-height: 17px;
|
||||
line-height: 1.3rem;
|
||||
|
|
@ -835,6 +837,7 @@
|
|||
}
|
||||
|
||||
a {
|
||||
display: block;
|
||||
padding: 10px 15px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1046,7 +1049,7 @@
|
|||
}
|
||||
|
||||
.filter-left {
|
||||
@extend .pull-left;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.filter-right {
|
||||
|
|
@ -2051,7 +2054,7 @@
|
|||
.category-container,
|
||||
.search-container {
|
||||
.grid-card {
|
||||
width: 22rem;
|
||||
width: 15rem;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
body {
|
||||
display: none;
|
||||
overflow-x: hidden;
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ body {
|
|||
}
|
||||
|
||||
.select-icon {
|
||||
top: 12px;
|
||||
left: 8px;
|
||||
}
|
||||
}
|
||||
|
|
@ -57,10 +58,18 @@ body {
|
|||
}
|
||||
|
||||
.mini-cart-container {
|
||||
~ .compare-btn,
|
||||
~ .wishlist-btn {
|
||||
float: left;
|
||||
#mini-cart {
|
||||
.badge {
|
||||
top: -8px;
|
||||
left: 73%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.left-wrapper {
|
||||
float: left;
|
||||
|
||||
.compare-btn, .wishlist-btn {
|
||||
.badge-container {
|
||||
.badge {
|
||||
top: -28px;
|
||||
|
|
@ -68,21 +77,6 @@ body {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
~ .wishlist-btn , ~ .compare-btn {
|
||||
.badge-container {
|
||||
.badge {
|
||||
left: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#mini-cart {
|
||||
.badge {
|
||||
top: -8px;
|
||||
left: 73%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -109,8 +103,8 @@ body {
|
|||
}
|
||||
}
|
||||
|
||||
.main-content-wrapper .vc-header
|
||||
|
||||
.main-content-wrapper
|
||||
.vc-header
|
||||
.mini-cart-container {
|
||||
#mini-cart {
|
||||
.badge {
|
||||
|
|
@ -123,30 +117,6 @@ body {
|
|||
vertical-align: top;
|
||||
}
|
||||
}
|
||||
|
||||
~ .compare-btn,
|
||||
~ .wishlist-btn {
|
||||
.badge-container {
|
||||
top: -6px;
|
||||
left: 20px;
|
||||
vertical-align: top;
|
||||
|
||||
.badge {
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
~ .compare-btn {
|
||||
left: 15%;
|
||||
float: left;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
~ .wishlist-btn {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
.form-container {
|
||||
|
|
@ -190,15 +160,20 @@ body {
|
|||
#top {
|
||||
#account {
|
||||
.welcome-content {
|
||||
float: left;
|
||||
|
||||
i {
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
+ .account-modal {
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin-left: 0;
|
||||
width: 100% !important;
|
||||
right: unset;
|
||||
|
||||
.modal-content {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -207,14 +182,6 @@ body {
|
|||
right: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
#account {
|
||||
+ .account-modal {
|
||||
.modal-content {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#cart-modal-content {
|
||||
|
|
|
|||
|
|
@ -233,7 +233,6 @@
|
|||
|
||||
.full-width {
|
||||
width: 100%;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.full-image {
|
||||
|
|
@ -598,7 +597,7 @@
|
|||
padding: 10px 0 !important;
|
||||
|
||||
.product-name {
|
||||
width: 17rem;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<i
|
||||
@click="closeDrawer()"
|
||||
class="material-icons pull-right text-dark">
|
||||
class="material-icons float-right text-dark">
|
||||
cancel
|
||||
</i>
|
||||
</span>
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
|
||||
<h4 class="display-inbl">@{{ subCategory.name }}</h4>
|
||||
|
||||
<i class="material-icons pull-right text-dark" @click="closeDrawer()">
|
||||
<i class="material-icons float-right text-dark" @click="closeDrawer()">
|
||||
cancel
|
||||
</i>
|
||||
</div>
|
||||
|
|
@ -248,7 +248,7 @@
|
|||
<div class="drawer-section">
|
||||
<i class="rango-arrow-left fs24 text-down-4" @click="toggleMetaInfo('languages')"></i>
|
||||
<h4 class="display-inbl">{{ __('velocity::app.responsive.header.languages') }}</h4>
|
||||
<i class="material-icons pull-right text-dark" @click="closeDrawer()">cancel</i>
|
||||
<i class="material-icons float-right text-dark" @click="closeDrawer()">cancel</i>
|
||||
</div>
|
||||
|
||||
<ul type="none">
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
<div class="drawer-section">
|
||||
<i class="rango-arrow-left fs24 text-down-4" @click="toggleMetaInfo('currencies')"></i>
|
||||
<h4 class="display-inbl">{{ __('velocity::app.shop.general.currencies') }}</h4>
|
||||
<i class="material-icons pull-right text-dark" @click="closeDrawer()">cancel</i>
|
||||
<i class="material-icons float-right text-dark" @click="closeDrawer()">cancel</i>
|
||||
</div>
|
||||
|
||||
<ul type="none">
|
||||
|
|
|
|||
|
|
@ -125,50 +125,51 @@
|
|||
</div>
|
||||
|
||||
<div class="col-lg-7 col-md-12 vc-full-screen">
|
||||
{!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!}
|
||||
@include('shop::checkout.cart.mini-cart')
|
||||
{!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
|
||||
<div class="left-wrapper">
|
||||
@php
|
||||
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
|
||||
|
||||
@php
|
||||
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
|
||||
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
|
||||
@endphp
|
||||
|
||||
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
|
||||
{!! view_render_event('bagisto.shop.layout.header.wishlist.before') !!}
|
||||
@if($showWishlist)
|
||||
<a class="wishlist-btn unset" :href="`{{ route('customer.wishlist.index') }}`">
|
||||
<i class="material-icons">favorite_border</i>
|
||||
<div class="badge-container" v-if="wishlistCount > 0">
|
||||
<span class="badge" v-text="wishlistCount"></span>
|
||||
</div>
|
||||
<span>{{ __('shop::app.layouts.wishlist') }}</span>
|
||||
</a>
|
||||
@endif
|
||||
{!! view_render_event('bagisto.shop.layout.header.wishlist.after') !!}
|
||||
|
||||
@endphp
|
||||
{!! view_render_event('bagisto.shop.layout.header.compare.before') !!}
|
||||
@if ($showCompare)
|
||||
<a
|
||||
class="compare-btn unset"
|
||||
@auth('customer')
|
||||
href="{{ route('velocity.customer.product.compare') }}"
|
||||
@endauth
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.header.compare.before') !!}
|
||||
@if ($showCompare)
|
||||
<a
|
||||
class="compare-btn unset"
|
||||
@auth('customer')
|
||||
href="{{ route('velocity.customer.product.compare') }}"
|
||||
@endauth
|
||||
@guest('customer')
|
||||
href="{{ route('velocity.product.compare') }}"
|
||||
@endguest
|
||||
>
|
||||
|
||||
@guest('customer')
|
||||
href="{{ route('velocity.product.compare') }}"
|
||||
@endguest
|
||||
>
|
||||
<i class="material-icons">compare_arrows</i>
|
||||
<div class="badge-container" v-if="compareCount > 0">
|
||||
<span class="badge" v-text="compareCount"></span>
|
||||
</div>
|
||||
<span>{{ __('velocity::app.customer.compare.text') }}</span>
|
||||
</a>
|
||||
@endif
|
||||
{!! view_render_event('bagisto.shop.layout.header.compare.after') !!}
|
||||
|
||||
<i class="material-icons">compare_arrows</i>
|
||||
<div class="badge-container" v-if="compareCount > 0">
|
||||
<span class="badge" v-text="compareCount"></span>
|
||||
</div>
|
||||
<span>{{ __('velocity::app.customer.compare.text') }}</span>
|
||||
</a>
|
||||
@endif
|
||||
{!! view_render_event('bagisto.shop.layout.header.compare.after') !!}
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.header.wishlist.before') !!}
|
||||
@if($showWishlist)
|
||||
<a class="wishlist-btn unset" :href="`{{ route('customer.wishlist.index') }}`">
|
||||
<i class="material-icons">favorite_border</i>
|
||||
<div class="badge-container" v-if="wishlistCount > 0">
|
||||
<span class="badge" v-text="wishlistCount"></span>
|
||||
</div>
|
||||
<span>{{ __('shop::app.layouts.wishlist') }}</span>
|
||||
</a>
|
||||
@endif
|
||||
{!! view_render_event('bagisto.shop.layout.header.wishlist.after') !!}
|
||||
{!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!}
|
||||
@include('shop::checkout.cart.mini-cart')
|
||||
{!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -449,10 +450,10 @@
|
|||
this.__('shop.general.alert.error'),
|
||||
"{{ __('shop::app.common.error') }}"
|
||||
);
|
||||
});
|
||||
});
|
||||
} else {
|
||||
imageInput.value = '';
|
||||
|
||||
|
||||
window.showAlert(
|
||||
`alert-danger`,
|
||||
this.__('shop.general.alert.error'),
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<script type="text/x-template" id="cart-template">
|
||||
<div class="container">
|
||||
<section class="cart-details row no-margin col-12">
|
||||
<h1 class="fw6 col-12">{{ __('shop::app.checkout.cart.title') }}</h1>
|
||||
<h2 class="fw6 col-12">{{ __('shop::app.checkout.cart.title') }}</h2>
|
||||
|
||||
@if ($cart)
|
||||
<div class="cart-details-header col-lg-6 col-md-12">
|
||||
|
|
@ -143,18 +143,20 @@
|
|||
@endif
|
||||
@endauth
|
||||
|
||||
<a
|
||||
class="unset
|
||||
@auth('customer')
|
||||
ml10
|
||||
@endauth
|
||||
"
|
||||
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"
|
||||
@click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">
|
||||
<div class="d-inline-block">
|
||||
<a
|
||||
class="unset
|
||||
@auth('customer')
|
||||
ml10
|
||||
@endauth
|
||||
"
|
||||
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"
|
||||
@click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">
|
||||
|
||||
<span class="rango-delete fs24"></span>
|
||||
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
|
||||
</a>
|
||||
<span class="rango-delete fs24"></span>
|
||||
<span class="align-vertical-super">{{ __('shop::app.checkout.cart.remove') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -243,7 +245,7 @@
|
|||
|
||||
<button
|
||||
type="submit"
|
||||
class="theme-btn light mr15 pull-right unset">
|
||||
class="theme-btn light mr15 float-right unset">
|
||||
|
||||
{{ __('shop::app.checkout.cart.update-cart') }}
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="mini-cart-container pull-right">
|
||||
<div class="mini-cart-container">
|
||||
<mini-cart
|
||||
view-cart="{{ route('shop.checkout.cart.index') }}"
|
||||
cart-text="{{ __('shop::app.minicart.view-cart') }}"
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
@auth('customer')
|
||||
@if(count(auth('customer')->user()->addresses))
|
||||
<a
|
||||
class="theme-btn light pull-right text-up-14"
|
||||
class="theme-btn light float-right text-up-14"
|
||||
@click="backToSavedBillingAddress()">
|
||||
|
||||
{{ __('shop::app.checkout.onepage.back') }}
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
@auth('customer')
|
||||
@if(count(auth('customer')->user()->addresses))
|
||||
<a
|
||||
class="theme-btn light pull-right text-up-14"
|
||||
class="theme-btn light float-right text-up-14"
|
||||
@click="backToSavedShippingAddress()">
|
||||
|
||||
{{ __('shop::app.checkout.onepage.back') }}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
@if (! $addresses->isEmpty())
|
||||
<span class="account-action">
|
||||
<a href="{{ route('customer.address.create') }}" class="theme-btn light unset pull-right">
|
||||
<a href="{{ route('customer.address.create') }}" class="theme-btn light unset float-right">
|
||||
{{ __('shop::app.customer.account.address.index.add') }}
|
||||
</a>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
@if ($order->canCancel())
|
||||
<span class="account-action">
|
||||
<a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset pull-right" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
|
||||
<a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset float-right" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
|
||||
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
|
||||
</a>
|
||||
</span>
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
<td>{{ __('shop::app.customer.account.order.view.total-due') }}
|
||||
<span class="dash-icon">-</span>
|
||||
</td>
|
||||
|
||||
|
||||
@if($order->status !== 'canceled')
|
||||
<td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
|
||||
@else
|
||||
|
|
@ -231,7 +231,7 @@
|
|||
<div class="section-title">
|
||||
<span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</span>
|
||||
|
||||
<a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
|
||||
<a href="{{ route('customer.orders.print', $invoice->id) }}" class="float-right">
|
||||
{{ __('shop::app.customer.account.order.view.print') }}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<a class="unset fw6 full-width" href="{{ $subMenuItem['url'] }}">
|
||||
<i class="icon {{ $index }} text-down-3"></i>
|
||||
<span>{{ trans($subMenuItem['name']) }}<span>
|
||||
<i class="rango-arrow-right pull-right text-down-3"></i>
|
||||
<i class="rango-arrow-right float-right text-down-3"></i>
|
||||
</a>
|
||||
</li>
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</span>
|
||||
|
||||
<span class="account-action">
|
||||
<a href="{{ route('customer.profile.edit') }}" class="theme-btn light unset pull-right">
|
||||
<a href="{{ route('customer.profile.edit') }}" class="theme-btn light unset float-right">
|
||||
{{ __('shop::app.customer.account.profile.index.edit') }}
|
||||
</a>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
|
||||
|
||||
@if (count($reviews) > 1)
|
||||
<div class="account-action pull-right">
|
||||
<div class="account-action float-right">
|
||||
<a href="{{ route('customer.review.deleteall') }}" class="theme-btn light unset">
|
||||
{{ __('shop::app.customer.account.wishlist.deleteall') }}
|
||||
</a>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
<star-ratings ratings="{{ $review->rating }}"></star-ratings>
|
||||
|
||||
<h2 class="fw6">{{ $review->title }}</h2>
|
||||
<h5 class="fw6">{{ $review->title }}</h5>
|
||||
|
||||
<p>{{ $review->comment }}</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
|
||||
|
||||
@if (count($items))
|
||||
<div class="account-action pull-right">
|
||||
<div class="account-action float-right">
|
||||
<a
|
||||
class="remove-decoration theme-btn light"
|
||||
href="{{ route('customer.wishlist.removeall') }}">
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
@{{ errors.first('password') }}
|
||||
</span>
|
||||
|
||||
<a href="{{ route('customer.forgot-password.create') }}" class="pull-right">
|
||||
<a href="{{ route('customer.forgot-password.create') }}" class="float-right">
|
||||
{{ __('shop::app.customer.login-form.forgot_pass') }}
|
||||
</a>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
@push('scripts')
|
||||
<script type="text/x-template" id="compare-product-template">
|
||||
<section class="cart-details row no-margin col-12">
|
||||
<h1 class="fw6 col-6">
|
||||
<h2 class="fw6 col-6">
|
||||
{{ __('velocity::app.customer.compare.compare_similar_items') }}
|
||||
</h1>
|
||||
</h2>
|
||||
|
||||
<div class="col-6" v-if="products.length > 0">
|
||||
<button
|
||||
class="theme-btn light pull-right"
|
||||
class="theme-btn light float-right"
|
||||
@click="removeProductCompare('all')">
|
||||
{{ __('shop::app.customer.account.wishlist.deleteall') }}
|
||||
</button>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
@switch ($attribute['code'])
|
||||
@case('name')
|
||||
<a :href="`${$root.baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
|
||||
<h1 class="fw6 fs18" v-text="product['{{ $attribute['code'] }}']"></h1>
|
||||
<h2 class="fw6 fs18" v-text="product['{{ $attribute['code'] }}']"></h2>
|
||||
</a>
|
||||
@break
|
||||
|
||||
|
|
|
|||
|
|
@ -2,40 +2,35 @@
|
|||
<html lang="{{ app()->getLocale() }}">
|
||||
|
||||
<head>
|
||||
{{-- title --}}
|
||||
<title>@yield('page_title')</title>
|
||||
|
||||
{{-- meta data --}}
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
<meta http-equiv="content-language" content="{{ app()->getLocale() }}">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/velocity.css') }}" />
|
||||
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/bootstrap.min.css') }}" />
|
||||
{!! view_render_event('bagisto.shop.layout.head') !!}
|
||||
|
||||
@if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl')
|
||||
<link href="{{ asset('themes/velocity/assets/css/bootstrap-flipped.css') }}" rel="stylesheet">
|
||||
@endif
|
||||
{{-- for extra head data --}}
|
||||
@yield('head')
|
||||
|
||||
{{-- seo meta data --}}
|
||||
@section('seo')
|
||||
<meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
|
||||
@show
|
||||
|
||||
{{-- fav icon --}}
|
||||
@if ($favicon = core()->getCurrentChannel()->favicon_url)
|
||||
<link rel="icon" sizes="16x16" href="{{ $favicon }}" />
|
||||
@else
|
||||
<link rel="icon" sizes="16x16" href="{{ asset('/themes/velocity/assets/images/static/v-icon.png') }}" />
|
||||
@endif
|
||||
|
||||
@yield('head')
|
||||
|
||||
@section('seo')
|
||||
<meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
|
||||
@show
|
||||
|
||||
@stack('css')
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.head') !!}
|
||||
|
||||
<style>
|
||||
{!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
|
||||
</style>
|
||||
{{-- all styles --}}
|
||||
@include('shop::layouts.styles')
|
||||
</head>
|
||||
|
||||
<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif>
|
||||
|
|
@ -43,6 +38,7 @@
|
|||
|
||||
@include('shop::UI.particals')
|
||||
|
||||
{{-- main app --}}
|
||||
<div id="app">
|
||||
<product-quick-view v-if="$root.quickView"></product-quick-view>
|
||||
|
||||
|
|
@ -113,7 +109,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- below footer -->
|
||||
{{-- footer --}}
|
||||
@section('footer')
|
||||
{!! view_render_event('bagisto.shop.layout.footer.before') !!}
|
||||
|
||||
|
|
@ -126,77 +122,7 @@
|
|||
|
||||
<div id="alert-container"></div>
|
||||
|
||||
<script
|
||||
type="text/javascript"
|
||||
baseUrl="{{ url()->to('/') }}"
|
||||
src="{{ asset('themes/velocity/assets/js/velocity.js') }}">
|
||||
</script>
|
||||
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}">
|
||||
</script>
|
||||
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="{{ asset('themes/velocity/assets/js/jquery.ez-plus.js') }}">
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
(() => {
|
||||
window.showAlert = (messageType, messageLabel, message) => {
|
||||
if (messageType && message !== '') {
|
||||
let alertId = Math.floor(Math.random() * 1000);
|
||||
|
||||
let html = `<div class="alert ${messageType} alert-dismissible" id="${alertId}">
|
||||
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
|
||||
<strong>${messageLabel ? messageLabel + '!' : ''} </strong> ${message}.
|
||||
</div>`;
|
||||
|
||||
$('#alert-container').append(html).ready(() => {
|
||||
window.setTimeout(() => {
|
||||
$(`#alert-container #${alertId}`).remove();
|
||||
}, 5000);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
let messageType = '';
|
||||
let messageLabel = '';
|
||||
|
||||
@if ($message = session('success'))
|
||||
messageType = 'alert-success';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.success') }}";
|
||||
@elseif ($message = session('warning'))
|
||||
messageType = 'alert-warning';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.warning') }}";
|
||||
@elseif ($message = session('error'))
|
||||
messageType = 'alert-danger';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.error') }}";
|
||||
@elseif ($message = session('info'))
|
||||
messageType = 'alert-info';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.info') }}";
|
||||
@endif
|
||||
|
||||
if (messageType && '{{ $message }}' !== '') {
|
||||
window.showAlert(messageType, messageLabel, '{{ $message }}');
|
||||
}
|
||||
|
||||
window.serverErrors = [];
|
||||
@if (isset($errors))
|
||||
@if (count($errors))
|
||||
window.serverErrors = @json($errors->getMessages());
|
||||
@endif
|
||||
@endif
|
||||
|
||||
window._translations = @json(app('Webkul\Velocity\Helpers\Helper')->jsonTranslations());
|
||||
})();
|
||||
</script>
|
||||
|
||||
@stack('scripts')
|
||||
|
||||
<script>
|
||||
{!! core()->getConfigData('general.content.custom_scripts.custom_javascript') !!}
|
||||
</script>
|
||||
{{-- all scripts --}}
|
||||
@include('shop::layouts.scripts')
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
<script
|
||||
type="text/javascript"
|
||||
baseUrl="{{ url()->to('/') }}"
|
||||
src="{{ asset('themes/velocity/assets/js/velocity.js') }}">
|
||||
</script>
|
||||
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}">
|
||||
</script>
|
||||
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="{{ asset('themes/velocity/assets/js/jquery.ez-plus.js') }}">
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
(() => {
|
||||
window.showAlert = (messageType, messageLabel, message) => {
|
||||
if (messageType && message !== '') {
|
||||
let alertId = Math.floor(Math.random() * 1000);
|
||||
|
||||
let html = `<div class="alert ${messageType} alert-dismissible" id="${alertId}">
|
||||
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
|
||||
<strong>${messageLabel ? messageLabel + '!' : ''} </strong> ${message}.
|
||||
</div>`;
|
||||
|
||||
$('#alert-container').append(html).ready(() => {
|
||||
window.setTimeout(() => {
|
||||
$(`#alert-container #${alertId}`).remove();
|
||||
}, 5000);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
let messageType = '';
|
||||
let messageLabel = '';
|
||||
|
||||
@if ($message = session('success'))
|
||||
messageType = 'alert-success';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.success') }}";
|
||||
@elseif ($message = session('warning'))
|
||||
messageType = 'alert-warning';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.warning') }}";
|
||||
@elseif ($message = session('error'))
|
||||
messageType = 'alert-danger';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.error') }}";
|
||||
@elseif ($message = session('info'))
|
||||
messageType = 'alert-info';
|
||||
messageLabel = "{{ __('velocity::app.shop.general.alert.info') }}";
|
||||
@endif
|
||||
|
||||
if (messageType && '{{ $message }}' !== '') {
|
||||
window.showAlert(messageType, messageLabel, '{{ $message }}');
|
||||
}
|
||||
|
||||
window.serverErrors = [];
|
||||
@if (isset($errors))
|
||||
@if (count($errors))
|
||||
window.serverErrors = @json($errors->getMessages());
|
||||
@endif
|
||||
@endif
|
||||
|
||||
window._translations = @json(app('Webkul\Velocity\Helpers\Helper')->jsonTranslations());
|
||||
})();
|
||||
</script>
|
||||
|
||||
@stack('scripts')
|
||||
|
||||
<script>
|
||||
{!! core()->getConfigData('general.content.custom_scripts.custom_javascript') !!}
|
||||
</script>
|
||||
|
|
@ -1 +0,0 @@
|
|||
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/velocity.css') }}">
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/bootstrap.min.css') }}" />
|
||||
|
||||
@if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl')
|
||||
<link href="{{ asset('themes/velocity/assets/css/bootstrap-flipped.css') }}" rel="stylesheet">
|
||||
@endif
|
||||
|
||||
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/velocity.css') }}" />
|
||||
|
||||
@stack('css')
|
||||
|
||||
<style>
|
||||
{!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
|
||||
</style>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<nav id="top">
|
||||
<nav class="row" id="top">
|
||||
<div class="col-sm-6">
|
||||
@include('velocity::layouts.top-nav.locale-currency')
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
@endphp
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.header.locale.before') !!}
|
||||
<div class="pull-left">
|
||||
<div class="d-inline-block">
|
||||
<div class="dropdown">
|
||||
@php
|
||||
$localeImage = null;
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
{!! view_render_event('bagisto.shop.layout.header.currency-item.before') !!}
|
||||
|
||||
@if (core()->getCurrentChannel()->currencies->count() > 1)
|
||||
<div class="pull-left">
|
||||
<div class="d-inline-block">
|
||||
<div class="dropdown">
|
||||
<select
|
||||
class="btn btn-link dropdown-toggle control locale-switcher styled-select"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
<script type="text/x-template" id="login-header-template">
|
||||
<div class="dropdown">
|
||||
<div id="account">
|
||||
|
||||
<div class="welcome-content pull-right" @click="togglePopup">
|
||||
<div class="d-inline-block welcome-content" @click="togglePopup">
|
||||
<i class="material-icons align-vertical-top">perm_identity</i>
|
||||
<span class="text-center">
|
||||
@guest('customer')
|
||||
|
|
@ -23,91 +22,89 @@
|
|||
</div>
|
||||
|
||||
<div class="account-modal sensitive-modal hide mt5">
|
||||
<!--Content-->
|
||||
@guest('customer')
|
||||
<div class="modal-content">
|
||||
<!--Header-->
|
||||
<div class="modal-header no-border pb0">
|
||||
<label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
|
||||
@guest('customer')
|
||||
<div class="modal-content">
|
||||
<!-- header -->
|
||||
<div class="modal-header no-border pb0">
|
||||
<label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
|
||||
|
||||
<button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
|
||||
</button>
|
||||
<button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- body -->
|
||||
<div class="pl10 fs14">
|
||||
<p>{{ __('shop::app.header.dropdown-text') }}</p>
|
||||
</div>
|
||||
|
||||
<!-- footer -->
|
||||
<div class="modal-footer">
|
||||
<div>
|
||||
<a href="{{ route('customer.session.index') }}">
|
||||
<button
|
||||
type="button"
|
||||
class="theme-btn fs14 fw6">
|
||||
|
||||
{{ __('shop::app.header.sign-in') }}
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!--Body-->
|
||||
<div class="pl10 fs14">
|
||||
<p>{{ __('shop::app.header.dropdown-text') }}</p>
|
||||
</div>
|
||||
|
||||
<!--Footer-->
|
||||
<div class="modal-footer">
|
||||
<div>
|
||||
<a href="{{ route('customer.session.index') }}">
|
||||
<button
|
||||
type="button"
|
||||
class="theme-btn fs14 fw6">
|
||||
|
||||
{{ __('shop::app.header.sign-in') }}
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<a href="{{ route('customer.register.index') }}">
|
||||
<button
|
||||
type="button"
|
||||
class="theme-btn fs14 fw6">
|
||||
{{ __('shop::app.header.sign-up') }}
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{ route('customer.register.index') }}">
|
||||
<button
|
||||
type="button"
|
||||
class="theme-btn fs14 fw6">
|
||||
{{ __('shop::app.header.sign-up') }}
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
@endguest
|
||||
</div>
|
||||
@endguest
|
||||
|
||||
@auth('customer')
|
||||
<div class="modal-content customer-options">
|
||||
<div class="customer-session">
|
||||
<label class="">
|
||||
{{ auth()->guard('customer')->user()->first_name }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<ul type="none">
|
||||
<li>
|
||||
<a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="{{ route('customer.orders.index') }}" class="unset">{{ __('velocity::app.shop.general.orders') }}</a>
|
||||
</li>
|
||||
|
||||
@php
|
||||
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
|
||||
|
||||
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
|
||||
@endphp
|
||||
|
||||
@if ($showWishlist)
|
||||
<li>
|
||||
<a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($showCompare)
|
||||
<li>
|
||||
<a href="{{ route('velocity.customer.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
<li>
|
||||
<a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
@auth('customer')
|
||||
<div class="modal-content customer-options">
|
||||
<div class="customer-session">
|
||||
<label class="">
|
||||
{{ auth()->guard('customer')->user()->first_name }}
|
||||
</label>
|
||||
</div>
|
||||
@endauth
|
||||
<!--/.Content-->
|
||||
|
||||
<ul type="none">
|
||||
<li>
|
||||
<a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="{{ route('customer.orders.index') }}" class="unset">{{ __('velocity::app.shop.general.orders') }}</a>
|
||||
</li>
|
||||
|
||||
@php
|
||||
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
|
||||
|
||||
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
|
||||
@endphp
|
||||
|
||||
@if ($showWishlist)
|
||||
<li>
|
||||
<a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($showCompare)
|
||||
<li>
|
||||
<a href="{{ route('velocity.customer.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
<li>
|
||||
<a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endauth
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
<div class="category-container right">
|
||||
<div class="row remove-padding-margin">
|
||||
<div class="pl0 col-12">
|
||||
<h1 class="fw6 mb10">{{ $category->name }}</h1>
|
||||
<h2 class="fw6 mb10">{{ $category->name }}</h2>
|
||||
|
||||
@if ($isDescriptionDisplayMode)
|
||||
@if ($category->description)
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
<script type="text/x-template" id="layered-navigation-template">
|
||||
<div v-if="attributes.length > 0">
|
||||
|
||||
<h3 class="filter-title fw6 mb20">
|
||||
<h5 class="filter-title fw6 mb20">
|
||||
{{ __('shop::app.products.layered-nav-title') }}
|
||||
</h3>
|
||||
</h5>
|
||||
|
||||
<div class="filter-content">
|
||||
<div class="filter-attributes">
|
||||
|
|
@ -54,9 +54,9 @@
|
|||
<script type="text/x-template" id="filter-attribute-item-template">
|
||||
<div :class="`cursor-pointer filter-attributes-item ${active ? 'active' : ''}`">
|
||||
<div class="filter-attributes-title" @click="active = !active">
|
||||
<h4 class="fw6 display-inbl">@{{ attribute.name ? attribute.name : attribute.admin_name }}</h4>
|
||||
<h6 class="fw6 display-inbl">@{{ attribute.name ? attribute.name : attribute.admin_name }}</h6>
|
||||
|
||||
<div class="pull-right display-table">
|
||||
<div class="float-right display-table">
|
||||
<span class="link-color cursor-pointer" v-if="appliedFilters.length" @click.stop="clearFilters()">
|
||||
{{ __('shop::app.products.remove-filter-link-title') }}
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
<span class="fs24 fw6">
|
||||
{{ __('velocity::app.shop.general.filter') }}
|
||||
</span>
|
||||
<span class="pull-right link-color" @click="toggleLayeredNavigation">
|
||||
<span class="float-right link-color" @click="toggleLayeredNavigation">
|
||||
{{ __('velocity::app.responsive.header.done') }}
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@media only screen and (max-width: 992px) {
|
||||
.main-content-wrapper .vc-header {
|
||||
box-shadow: unset;
|
||||
|
|
@ -37,11 +37,11 @@
|
|||
}
|
||||
|
||||
.quick-view-btn-container,
|
||||
.rango-zoom-plus,
|
||||
.rango-zoom-plus,
|
||||
.quick-view-in-list {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
@endpush
|
||||
|
|
@ -93,16 +93,16 @@
|
|||
@endif
|
||||
|
||||
@if (! $results)
|
||||
<h1 class="fw6 col-12">{{ __('shop::app.search.no-results') }}</h1>
|
||||
<h2 class="fw6 col-12">{{ __('shop::app.search.no-results') }}</h2>
|
||||
@else
|
||||
@if ($results->isEmpty())
|
||||
<h1 class="fw6 col-12">{{ __('shop::app.products.whoops') }}</h1>
|
||||
<h2 class="fw6 col-12">{{ __('shop::app.products.whoops') }}</h2>
|
||||
<span class="col-12">{{ __('shop::app.search.no-results') }}</span>
|
||||
@else
|
||||
@if ($results->total() == 1)
|
||||
<h2 class="fw6 col-12 mb20">
|
||||
<h5 class="fw6 col-12 mb20">
|
||||
{{ $results->total() }} {{ __('shop::app.search.found-result') }}
|
||||
</h2>
|
||||
</h5>
|
||||
@else
|
||||
<h2 class="fw6 col-12 mb20">
|
||||
{{ $results->total() }} {{ __('shop::app.search.found-results') }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue