This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-14 19:00:45 +05:30
parent 8176c63779
commit a26abf09b1
26 changed files with 563 additions and 572 deletions

View File

@ -1022,7 +1022,6 @@
}
.product-card-new .product-image-container {
height: 220px;
position: relative;
}
@ -1048,8 +1047,8 @@
font-size: 16px;
}
.product-card-new .card-body > div:not(:last-child) {
margin-bottom: 5px;
.product-card-new .card-body > div:last-child {
margin-top: 10px;
}
.product-card-new .product-price .sticker {
@ -1096,10 +1095,6 @@
background-color: #0D2438;
}
.product-card-new:hover #quick-view-btn-container {
display: block;
}
.quantity {
width: 100%;
padding-bottom: 10px;
@ -1897,7 +1892,9 @@
margin-left: 0px !important;
}
.product-price span:nth-child(1) {
.product-price span:nth-child(1),
.product-price .special-price {
font-size: 20px;
font-weight: 600;
}
@ -1906,8 +1903,8 @@
}
.product-price .sticker {
top: 0;
left: 0;
top: 8px;
left: 8px;
border: none;
color: white;
display: none;
@ -1928,10 +1925,6 @@
text-decoration: line-through;
}
.product-price .special-price {
font-weight: 600;
}
#app {
min-height: 65vh;
}
@ -1978,8 +1971,8 @@
}
.sidebar .category-content .category-icon {
width: 18px;
height: 18px;
width: 25px;
height: 20px;
padding-right: 5px;
display: inline-block;
}
@ -2424,6 +2417,21 @@
margin-top: 8px;
}
.vc-header {
z-index: 99;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.23);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.23);
}
.new-products-recent {
top: -44px;
position: relative;
}
.recetly-viewed-products-wrapper {
padding: 10px;
}
/* @author Shubham Mehrotra */
body {
overflow-x: hidden;
@ -2586,7 +2594,6 @@ header #search-form > *:focus {
.advertisement-two-container img {
width: 100%;
height: 500px;
}
.advertisement-three-container img {
@ -3002,11 +3009,6 @@ body::after {
border: 1px solid red;
}
.ul-shadow {
-webkit-box-shadow: 1px 2px 8px #888888;
box-shadow: 1px 2px 8px #888888;
}
.quick-addtocart-btn {
margin-top: 306px;
margin-left: -82px;
@ -3080,6 +3082,7 @@ body::after {
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
text-align: right;
padding: 25px 0 30px 0;
}
@ -3415,6 +3418,10 @@ body::after {
margin-left: 15px !important;
}
.ml30 {
margin-left: 30px !important;
}
.body-blur {
filter: blur(4px);
-webkit-filter: blur(4px);
@ -3517,6 +3524,22 @@ body::after {
border: 1px solid rgba(0, 0, 0, 0.12);
}
.theme-btn.light:hover, .cart-details .light.continue-shopping-btn:hover, .account-content .account-layout .bottom-toolbar .pagination .page-item:hover {
background-color: #f5f5f5 !important;
}
.theme-btn:hover, .cart-details .continue-shopping-btn:hover, .account-content .account-layout .bottom-toolbar .pagination .page-item:hover,
.btn-add-to-cart:hover {
border-color: #247959 !important;
background-color: #247959 !important;
}
.theme-btn:hover.light, .cart-details .continue-shopping-btn:hover.light, .account-content .account-layout .bottom-toolbar .pagination .page-item:hover,
.btn-add-to-cart:hover.light,
.account-content .account-layout .bottom-toolbar .pagination .btn-add-to-cart.page-item:hover {
border: 1px solid rgba(0, 0, 0, 0.12) !important;
}
.norm-btn {
border: 1px solid #CCCCCC;
font-size: 14px;
@ -3787,8 +3810,8 @@ body::after {
}
.small-card-container:hover {
-webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
}
.text-down-3 {
@ -4000,8 +4023,8 @@ button[disabled] {
font-size: 14px;
}
.max-height-350 {
max-height: 350px;
.max-height-300 {
max-height: 300px;
}
.border-normal {
@ -4196,7 +4219,7 @@ button[disabled] {
}
}
@media only screen and (max-width: 576px) and (max-width: 768px) and (max-width: 992px) {
@media only screen and (max-width: 992px) {
.main-content-wrapper .vc-header > div {
display: none;
}
@ -4221,11 +4244,10 @@ button[disabled] {
text-align: right;
height: 50px;
}
.main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header * {
top: 13px;
.main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header > a {
width: 24px;
position: relative;
padding-right: 10px;
margin-top: 13px;
margin-right: 10px;
}
#top {
display: none;
@ -4245,6 +4267,7 @@ button[disabled] {
.advertisement-three-container .top-container img,
.advertisement-three-container .bottom-container img {
padding: 0px;
height: unset;
}
.advertisement-three-container .second-panel {
padding-top: 10px;
@ -4264,12 +4287,27 @@ button[disabled] {
.category-with-custom-options.vc-small-screen .smart-category-container:not(:first-child) {
padding-top: 20px;
}
.footer .footer-content .newsletter-subscription {
padding: 10px 20px;
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field {
width: 200px;
}
.popular-category-wrapper {
.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
text-align: left;
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter .subscriber-form-div {
text-align: center;
}
.footer .footer-content .footer-statics {
padding: 30px 50px;
}
.popular-categories-container .popular-category-wrapper {
padding: 0px;
}
.popular-categories-container .popular-category-wrapper .card .category-image {
height: 100%;
}
.main-content-wrapper {
margin-bottom: 25px;
}
@ -4280,6 +4318,18 @@ button[disabled] {
.slides-container .VueCarousel .VueCarousel-pagination .VueCarousel-dot {
padding: 2px !important;
}
.account-content .sidebar {
display: none;
}
.account-content .account-layout.right {
padding-left: 20px !important;
}
.mini-cart-container {
display: none;
}
.vc-small-screen .searchbar {
padding-left: 100px !important;
}
}
/* fallback */

View File

@ -1115,7 +1115,6 @@ __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('child-sidebar', __webpack
__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('card-list-content', __webpack_require__(60));
__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('card-list-header', __webpack_require__(63));
__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('magnify-image', __webpack_require__(66));
__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('content-header', __webpack_require__(69));
window.eventBus = new __WEBPACK_IMPORTED_MODULE_0_vue___default.a();
@ -36510,7 +36509,7 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "row mb15 col-12", class: _vm.rowClass }, [
return _c("div", { class: "row mb15 col-12 " + _vm.rowClass }, [
_c("div", { staticClass: "col-4 no-padding" }, [
_c("h2", { staticClass: "fs20 fw6" }, [_vm._v(_vm._s(_vm.headerHeading))])
]),
@ -36588,7 +36587,7 @@ var render = function() {
_c(
"a",
{
staticClass: "remove-decoration normal-text",
staticClass: "remove-decoration link-color",
attrs: {
href: _vm.viewAll,
title: "View all " + _vm.headerHeading + " products"
@ -36762,233 +36761,9 @@ if (false) {
}
/***/ }),
/* 69 */
/***/ (function(module, exports, __webpack_require__) {
var disposed = false
var normalizeComponent = __webpack_require__(1)
/* script */
var __vue_script__ = __webpack_require__(70)
/* template */
var __vue_template__ = __webpack_require__(71)
/* template functional */
var __vue_template_functional__ = false
/* styles */
var __vue_styles__ = null
/* scopeId */
var __vue_scopeId__ = null
/* moduleIdentifier (server only) */
var __vue_module_identifier__ = null
var Component = normalizeComponent(
__vue_script__,
__vue_template__,
__vue_template_functional__,
__vue_styles__,
__vue_scopeId__,
__vue_module_identifier__
)
Component.options.__file = "src/Resources/assets/js/UI/components/content-header.vue"
/* hot reload */
if (false) {(function () {
var hotAPI = require("vue-hot-reload-api")
hotAPI.install(require("vue"), false)
if (!hotAPI.compatible) return
module.hot.accept()
if (!module.hot.data) {
hotAPI.createRecord("data-v-1dfc78dc", Component.options)
} else {
hotAPI.reload("data-v-1dfc78dc", Component.options)
}
module.hot.dispose(function (data) {
disposed = true
})
})()}
module.exports = Component.exports
/***/ }),
/* 70 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
props: ['heading', 'headerContent', 'isEnabled']
});
/***/ }),
/* 71 */
/***/ (function(module, exports, __webpack_require__) {
var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c(
"div",
{ staticClass: "row velocity-divide-page remove-padding-margin vc-header" },
[
_c("div", { staticClass: "vc-small-screen container" }, [
_c("div", { staticClass: "row" }, [
_c("div", { staticClass: "col-8" }, [
_c(
"div",
{ staticClass: "row col-12" },
[
_vm._m(0),
_vm._v(" "),
_c("logo-component", { attrs: { "add-class": "pl10" } })
],
1
)
]),
_vm._v(" "),
_vm._m(1)
])
]),
_vm._v(" "),
_c(
"div",
{
staticClass:
"main-category fs16 unselectable fw6 cursor-pointer left",
on: {
mouseout: function($event) {
return _vm.toggleSidebar("0", $event, "mouseout")
},
mouseover: function($event) {
return _vm.toggleSidebar("0", $event, "mouseover")
}
}
},
[
_c("i", {
staticClass: "rango-view-list text-down-4 align-vertical-top fs18"
}),
_vm._v(" "),
_c("span", {
staticClass: "pl5",
domProps: { textContent: _vm._s(_vm.heading) },
on: {
mouseover: function($event) {
return _vm.toggleSidebar("0", $event, "mouseover")
}
}
})
]
),
_vm._v(" "),
_c("div", { staticClass: "content-list right" }, [
_c(
"ul",
{ staticClass: "no-margin ul-shadow", attrs: { type: "none" } },
_vm._l(_vm.headerContent, function(content, index) {
return _c("li", { key: index }, [
content["content_type"] == "link"
? _c("a", {
attrs: {
href: content["page_link"],
target: content["link_target"] ? "_blank" : "_self"
},
domProps: { textContent: _vm._s(content.title) }
})
: _c("a", {
attrs: { href: "#" },
domProps: { textContent: _vm._s(content.title) }
})
])
}),
0
)
])
]
)
}
var staticRenderFns = [
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "hamburger-wrapper" }, [
_c("i", { staticClass: "rango-toggle hamburger" })
])
},
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "row col-4 right-vc-header" }, [
_c("i", { staticClass: "fs16 fw6 rango-search" }),
_vm._v(" "),
_c("i", { staticClass: "material-icons text-down-3" }, [
_vm._v("shopping_cart")
])
])
}
]
render._withStripped = true
module.exports = { render: render, staticRenderFns: staticRenderFns }
if (false) {
module.hot.accept()
if (module.hot.data) {
require("vue-hot-reload-api") .rerender("data-v-1dfc78dc", module.exports)
}
}
/***/ }),
/* 69 */,
/* 70 */,
/* 71 */,
/* 72 */
/***/ (function(module, exports) {

View File

@ -1,6 +1,6 @@
<template>
<div class="row mb15 col-12" :class="rowClass">
<div :class="`row mb15 col-12 ${rowClass}`">
<div class="col-4 no-padding">
<h2 class="fs20 fw6">{{ headerHeading }}</h2>
</div>
@ -41,7 +41,7 @@
<template v-if="(! (viewAll == 'false' || viewAll == '')) && viewAll">
<div class="mr15">
<a :href="viewAll" :title="`View all ${headerHeading} products`" class="remove-decoration normal-text">
<a :href="viewAll" :title="`View all ${headerHeading} products`" class="remove-decoration link-color">
<h2 class="fs14 fw6 cursor-pointer tab">View All</h2>
</a>
</div>

View File

@ -1,55 +0,0 @@
<template>
<div class="row velocity-divide-page remove-padding-margin vc-header">
<div class="vc-small-screen container">
<div class="row">
<div class="col-8">
<div class="row col-12">
<div class="hamburger-wrapper">
<i class="rango-toggle hamburger"></i>
</div>
<logo-component add-class="pl10"></logo-component>
</div>
</div>
<div class="row col-4 right-vc-header">
<i class="fs16 fw6 rango-search"></i>
<i class="material-icons text-down-3">shopping_cart</i>
</div>
</div>
</div>
<div
@mouseout="toggleSidebar('0', $event, 'mouseout')"
@mouseover="toggleSidebar('0', $event, 'mouseover')"
class="main-category fs16 unselectable fw6 cursor-pointer left">
<i class="rango-view-list text-down-4 align-vertical-top fs18">
</i>
<span
class="pl5"
v-text="heading"
@mouseover="toggleSidebar('0', $event, 'mouseover')">
</span>
</div>
<div class="content-list right">
<ul type="none" class="no-margin ul-shadow">
<li v-for="(content, index) in headerContent" :key="index">
<a
v-text="content.title"
:href="content['page_link']"
v-if="(content['content_type'] == 'link')"
:target="content['link_target'] ? '_blank' : '_self'">
</a>
<a href="#" v-else v-text="content.title"></a>
</li>
</ul>
</div>
</div>
</template>
<script type="text/javascript">
export default {
props: ['heading', 'headerContent', 'isEnabled'],
}
</script>

View File

@ -27,7 +27,6 @@ Vue.component('child-sidebar', require('./UI/components/child-sidebar'));
Vue.component('card-list-content', require('./UI/components/card-list'));
Vue.component('card-list-header', require('./UI/components/card-header'));
Vue.component('magnify-image', require('./UI/components/image-magnifier'));
Vue.component('content-header', require('./UI/components/content-header'));
window.eventBus = new Vue();

View File

@ -13,6 +13,7 @@ $border-dark: #DCDCDC;
$border-light: #ECECEC;
$border-general: #E5E5E5;
$theme-color: #26A37C;
$theme-dark-color: #247959;
$btn-text-color: #FFFFFF;
$light-color: #FFFFFF;
$dark-color: #000000;

View File

@ -214,7 +214,6 @@
margin: 0 5px 10px 10px;
.product-image-container {
height: 220px;
position: relative;
img {
@ -245,8 +244,8 @@
}
.card-body {
> div:not(:last-child) {
margin-bottom: 5px;
> div:last-child {
margin-top: 10px;
}
}
@ -301,7 +300,7 @@
.product-card-new:hover {
#quick-view-btn-container {
display: block;
// display: block;
}
}
@ -1184,7 +1183,9 @@
}
.product-price {
span:nth-child(1) {
span:nth-child(1),
.special-price {
font-size: 20px;
font-weight: 600;
}
@ -1193,8 +1194,8 @@
}
.sticker {
top: 0;
left: 0;
top: 8px;
left: 8px;
border: none;
color: white;
display: none;
@ -1214,10 +1215,6 @@
margin-right: 10px;
text-decoration: line-through;
}
.special-price {
font-weight: 600;
}
}
#app {
@ -1270,8 +1267,8 @@
}
.category-icon {
width: 18px;
height: 18px;
width: 25px;
height: 20px;
padding-right: 5px;
display: inline-block;
@ -1757,3 +1754,17 @@
margin-left: 75px;
margin-top: 8px;
}
.vc-header {
z-index: 99;
box-shadow: 0 1px 3px rgba(0,0,0,0.16), 0 1px 3px rgba(0,0,0,0.23);
}
.new-products-recent {
top: -44px;
position: relative;
}
.recetly-viewed-products-wrapper {
padding: 10px;
}

View File

@ -60,6 +60,7 @@
}
.subscribe-newsletter {
text-align: right;
padding: 25px 0 30px 0;
}
}

View File

@ -167,7 +167,6 @@ header #search-form > *:focus {
.advertisement-two-container {
img {
width: 100%;
height: 500px;
}
}
@ -618,10 +617,6 @@ body::after {
border: 1px solid red;
}
.ul-shadow {
box-shadow: 1px 2px 8px #888888;
}
.quick-addtocart-btn {
margin-top: 306px;
margin-left: -82px;

View File

@ -49,14 +49,7 @@
}
}
@media only screen
and (max-width: 576px)
and (max-width: 768px)
and (max-width: 992px) {
// body {
// display: block;
// }
@media only screen and (max-width: 992px) {
$header-height: 50px;
.main-content-wrapper {
@ -89,11 +82,10 @@
text-align: right;
height: $header-height;
* {
top: 13px;
> a {
width: 24px;
position: relative;
padding-right: 10px;
margin-top: 13px;
margin-right: 10px;
}
}
}
@ -135,6 +127,7 @@
.bottom-container {
img {
padding: 0px;
height: unset;
}
}
@ -170,17 +163,40 @@
.footer {
.footer-content {
.newsletter-subscription {
padding: 10px 20px;
.newsletter-wrapper {
input.subscribe-field {
width: 200px;
}
.subscribe-newsletter {
text-align: left;
.subscriber-form-div {
text-align: center;
}
}
}
}
.footer-statics {
padding: 30px 50px;
}
}
}
.popular-category-wrapper {
padding: 0px;
.popular-categories-container {
.popular-category-wrapper {
padding: 0px;
.card {
.category-image {
height: 100%;
}
}
}
}
.main-content-wrapper {
@ -201,4 +217,26 @@
}
}
}
.account-content {
.sidebar {
display: none;
}
.account-layout {
&.right {
padding-left: 20px !important;
}
}
}
.mini-cart-container {
display: none;
}
.vc-small-screen {
.searchbar {
padding-left: 100px !important;
}
}
}

View File

@ -167,6 +167,9 @@
.ml15 {
margin-left: 15px !important;
}
.ml30 {
margin-left: 30px !important;
}
.body-blur {
filter: blur(4px);
-webkit-filter: blur(4px);
@ -259,7 +262,22 @@
box-shadow: 0 1px 0 0 #CFCFCF;
border: 1px solid rgba(0,0,0,0.12);
}
&.light:hover {
background-color: #f5f5f5 !important;
}
}
.theme-btn:hover,
.btn-add-to-cart:hover {
border-color: $theme-dark-color !important;
background-color: $theme-dark-color !important;
&.light {
border: 1px solid rgba(0,0,0,0.12) !important;
}
}
.norm-btn {
border: 1px solid $border-common;
font-size: 14px;
@ -548,7 +566,8 @@
}
.small-card-container:hover {
box-shadow: 0 6px 14px 0 rgba(0,0,0,0.14);
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
}
.text-down-3 {
@ -765,8 +784,8 @@ button[disabled] {
font-size: 14px;
}
.max-height-350 {
max-height: 350px;
.max-height-300 {
max-height: 300px;
}
.border-normal {

View File

@ -79,6 +79,124 @@
</a>
</script>
<script type="text/x-template" id="searchbar-template">
<div class="row no-margin right searchbar">
<div class="col-8 no-padding input-group">
<form
method="GET"
role="search"
id="search-form"
action="{{ route('shop.search.index') }}">
<div
class="btn-toolbar full-width"
role="toolbar">
<div class="btn-group full-width">
<div class="selectdiv">
<select class="form-control fs13 border-right-0" name="category">
<option value="">
{{ __('velocity::app.header.all-categories') }}
</option>
@foreach ($categories as $category)
<option value="{{ $category->id }}">
{{ $category->name }}
</option>
@endforeach
<span class="select-icon rango-arrow-down"></span>
</select>
</div>
<div class="full-width">
<input
required
name="term"
type="search"
class="form-control"
placeholder="{{ __('velocity::app.header.search-text') }}" />
<button class="btn" type="submit" id="header-search-icon">
<i class="fs16 fw6 rango-search"></i>
</button>
</div>
</div>
</div>
</form>
</div>
<div class="col-4">
{!! 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>
</script>
<script type="text/x-template" id="content-header-template">
<header class="row velocity-divide-page remove-padding-margin vc-header">
<div class="vc-small-screen container">
<div class="row">
<div class="col-8">
<div class="row col-12">
<div class="hamburger-wrapper">
<i class="rango-toggle hamburger"></i>
</div>
<logo-component add-class="ml30"></logo-component>
</div>
</div>
<div class="row right-vc-header col-4">
<a :href="`${url}/customer/account/wishlist`" class="unset">
<i class="material-icons">favorite_border</i>
</a>
<a class="unset cursor-pointer" @click="openSearchBar">
<i class="material-icons">search</i>
</a>
<a href="" class="unset">
<i class="material-icons text-down-3">shopping_cart</i>
</a>
</div>
<searchbar-component v-if="isSearchbar"></searchbar-component>
</div>
</div>
<div
@mouseout="toggleSidebar('0', $event, 'mouseout')"
@mouseover="toggleSidebar('0', $event, 'mouseover')"
class="main-category fs16 unselectable fw6 cursor-pointer left">
<i class="rango-view-list text-down-4 align-vertical-top fs18">
</i>
<span
class="pl5"
v-text="heading"
@mouseover="toggleSidebar('0', $event, 'mouseover')">
</span>
</div>
<div class="content-list right">
<ul type="none" class="no-margin">
<li v-for="(content, index) in headerContent" :key="index">
<a
v-text="content.title"
:href="content['page_link']"
v-if="(content['content_type'] == 'link')"
:target="content['link_target'] ? '_blank' : '_self'">
</a>
<a href="#" v-else v-text="content.title"></a>
</li>
</ul>
</div>
</header>
</script>
<script type="text/javascript">
(() => {
Vue.component('star-ratings', {
@ -196,5 +314,42 @@
template: '#logo-template',
props: ['addClass'],
});
Vue.component('searchbar-component', {
template: '#searchbar-template'
})
Vue.component('content-header', {
template: '#content-header-template',
props: [
'url',
'heading',
'isEnabled',
'headerContent',
],
data: function () {
return {
'isSearchbar': false
}
},
methods: {
'openSearchBar': function () {
this.isSearchbar = !this.isSearchbar;
let footer = $('.footer');
let homeContent = $('#home-right-bar-container');
if (this.isSearchbar) {
footer[0].style.opacity = '.3';
homeContent[0].style.opacity = '.3';
} else {
footer[0].style.opacity = '1';
homeContent[0].style.opacity = '1';
}
}
}
})
})()
</script>

View File

@ -1 +1,4 @@
<input type="file" name="category_icon_path" />
<input
type="file"
name="category_icon_path"
style="position: relative;top: -22px;left: 15px;" />

View File

@ -8,145 +8,146 @@
@stop
@section('content-wrapper')
<section class="cart-details row offset-1">
<h1 class="fw6 row col-12">{{ __('shop::app.checkout.cart.title') }}</h1>
<div class="container">
<section class="cart-details row offset-1">
<h1 class="fw6 row col-12">{{ __('shop::app.checkout.cart.title') }}</h1>
<div class="cart-details-header row col-6">
{{-- TODO:- USE table insted of column --}}
@if ($cart)
<div class="row cart-header col-12 no-padding">
<span class="col-8 fw6 fs16 pr0">
{{ __('velocity::app.checkout.items') }}
</span>
<div class="cart-details-header row col-6">
{{-- TODO:- USE table insted of column --}}
@if ($cart)
<div class="row cart-header col-12 no-padding">
<span class="col-8 fw6 fs16 pr0">
{{ __('velocity::app.checkout.items') }}
</span>
<span class="col-2 fw6 fs16 no-padding text-center">
{{ __('velocity::app.checkout.qty') }}
</span>
<span class="col-2 fw6 fs16 no-padding text-center">
{{ __('velocity::app.checkout.qty') }}
</span>
<span class="col-2 fw6 fs16 text-right pr0">
{{ __('velocity::app.checkout.subtotal') }}
</span>
</div>
@endif
<span class="col-2 fw6 fs16 text-right pr0">
{{ __('velocity::app.checkout.subtotal') }}
</span>
</div>
@endif
@if ($cart)
<div class="cart-content col-12">
<form
action="{{ route('shop.checkout.cart.update') }}"
method="POST"
@submit.prevent="onSubmit">
@if ($cart)
<div class="cart-content col-12">
<form
action="{{ route('shop.checkout.cart.update') }}"
method="POST"
@submit.prevent="onSubmit">
<div class="cart-item-list">
@csrf
<div class="cart-item-list">
@csrf
@foreach ($cart->items as $key => $item)
@foreach ($cart->items as $key => $item)
@php
$productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
$product = $item->product;
@php
$productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
$product = $item->product;
$productPrice = $product->getTypeInstance()->getProductPrices();
$productPrice = $product->getTypeInstance()->getProductPrices();
@endphp
@endphp
<div class="row col-12">
<a
href="{{ route('shop.productOrCategory.index', ['slug' => $product->url_key]) }}"
title="{{ $product->name }}"
class="product-image-container col-2">
<div class="row col-12">
<a
href="{{ route('shop.productOrCategory.index', ['slug' => $product->url_key]) }}"
title="{{ $product->name }}"
class="product-image-container col-2">
<img
src="{{ $productBaseImage['medium_image_url'] }}"
class="card-img-top"
alt="{{ $product->name }}">
</a>
<img
src="{{ $productBaseImage['medium_image_url'] }}"
class="card-img-top"
alt="{{ $product->name }}">
</a>
<div class="product-details-content col-6">
<div class="row">
<a
href="{{ route('shop.productOrCategory.index', ['slug' => $product->url_key]) }}"
title="{{ $product->name }}"
class="unset col-12">
<div class="product-details-content col-6">
<div class="row">
<a
href="{{ route('shop.productOrCategory.index', ['slug' => $product->url_key]) }}"
title="{{ $product->name }}"
class="unset col-12">
<span class="fs20 fw6 link-color">{{ $product->name }}</span>
</a>
<span class="fs20 fw6 link-color">{{ $product->name }}</span>
</a>
</div>
<div class="row col-12">
@include ('shop::products.price', ['product' => $product])
</div>
<div class="row col-12 cursor-pointer">
<a href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}" class="unset">
<span class="rango-delete fs24"></span>
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
</a>
</div>
</div>
<div class="row col-12">
@include ('shop::products.price', ['product' => $product])
<div class="product-quantity col-3 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}">
</quantity-changer>
</div>
<div class="row col-12 cursor-pointer">
<a href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}" class="unset">
<span class="rango-delete fs24"></span>
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
</a>
<div class="product-price fs18 col-1">
<span class="card-current-price fw6 mr10">
{{ core()->currency( $item->base_total) }}
</span>
</div>
</div>
<div class="product-quantity col-3 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}">
</quantity-changer>
</div>
@endforeach
</div>
<div class="product-price fs18 col-1">
<span class="card-current-price fw6 mr10">
{{ core()->currency( $item->base_total) }}
</span>
</div>
</div>
{!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
<a
class="col-12 link-color remove-decoration fs16 no-padding"
href="{{ route('shop.home.index') }}">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</a>
@endforeach
</div>
<button
type="submit"
class="theme-btn light mr15 pull-right unset">
{!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
<a
class="col-12 link-color remove-decoration fs16 no-padding"
href="{{ route('shop.home.index') }}">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</a>
{{ __('shop::app.checkout.cart.update-cart') }}
</button>
{!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
</form>
</div>
<button
type="submit"
class="theme-btn light mr15 pull-right unset">
@include ('shop::products.view.cross-sells')
@endif
</div>
{{ __('shop::app.checkout.cart.update-cart') }}
</button>
{!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!}
</form>
</div>
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
@include ('shop::products.view.cross-sells')
@endif
</div>
@if ($cart)
<div class="col-4 offset-1 row order-summary-container">
@include('shop::checkout.total.summary', ['cart' => $cart])
</div>
@else
<div class="fs16 row col-12">
{{ __('shop::app.checkout.cart.empty') }}
</div>
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
<a
class="fs16 mt15 col-12 row remove-decoration"
href="{{ route('shop.home.index') }}">
@if ($cart)
<div class="col-4 offset-1 row order-summary-container">
@include('shop::checkout.total.summary', ['cart' => $cart])
</div>
@else
<div class="fs16 row col-12">
{{ __('shop::app.checkout.cart.empty') }}
</div>
<button type="button" class="theme-btn remove-decoration">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</button>
</a>
@endif
<a
class="fs16 mt15 col-12 row remove-decoration"
href="{{ route('shop.home.index') }}">
<button type="button" class="theme-btn remove-decoration">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</button>
</a>
@endif
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
</section>
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
</section>
</div>
@endsection
@push('scripts')
@ -172,14 +173,4 @@
event.preventDefault();
}
</script>
@endpush
{{-- <div class="cart-content">
<p>
{{ __('shop::app.checkout.cart.empty') }}
</p>
<p style="display: inline-block;">
<a style="display: inline-block;" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
</p>
</div> --}}
@endpush

View File

@ -10,66 +10,68 @@
@push('scripts')
<script type="text/x-template" id="checkout-template">
<div id="checkout" class="checkout-process offset-1 row col-11">
<h1 class="row col-12">{{ __('velocity::app.checkout.checkout') }}</h1>
<div class="container">
<div id="checkout" class="checkout-process offset-1 row col-11">
<h1 class="row col-12">{{ __('velocity::app.checkout.checkout') }}</h1>
<div class="row col-7">
<div class="row col-7">
<div class="step-content information" id="address-section">
@include('shop::checkout.onepage.customer-info')
</div>
<div class="step-content information" id="address-section">
@include('shop::checkout.onepage.customer-info')
</div>
<div
class="step-content shipping"
id="shipping-section"
v-if="showShippingSection">
<div
class="step-content shipping"
id="shipping-section"
v-if="showShippingSection">
<shipping-section @onShippingMethodSelected="shippingMethodSelected($event)">
</shipping-section>
</div>
<shipping-section @onShippingMethodSelected="shippingMethodSelected($event)">
</shipping-section>
</div>
<div
class="step-content payment"
v-if="showPaymentSection"
id="payment-section">
<div
class="step-content payment"
v-if="showPaymentSection"
id="payment-section">
<payment-section @onPaymentMethodSelected="paymentMethodSelected($event)">
</payment-section>
</div>
<payment-section @onPaymentMethodSelected="paymentMethodSelected($event)">
</payment-section>
</div>
<div
class="step-content review"
v-if="showSummarySection"
id="summary-section">
<div
class="step-content review"
v-if="showSummarySection"
id="summary-section">
<review-section :key="reviewComponentKey">
<div slot="summary-section">
<summary-section
discount="1"
:key="summeryComponentKey"
@onApplyCoupon="getOrderSummary"
@onRemoveCoupon="getOrderSummary"
></summary-section>
</div>
<div slot="place-order-btn">
<div class="mb20">
<button
type="button"
class="theme-btn"
@click="placeOrder()"
:disabled="disable_button"
id="checkout-place-order-button">
{{ __('shop::app.checkout.onepage.place-order') }}
</button>
<review-section :key="reviewComponentKey">
<div slot="summary-section">
<summary-section
discount="1"
:key="summeryComponentKey"
@onApplyCoupon="getOrderSummary"
@onRemoveCoupon="getOrderSummary"
></summary-section>
</div>
</div>
</review-section>
</div>
</div>
<div class="col-4 offset-1 row order-summary-container top pt0">
<summary-section :key="summeryComponentKey"></summary-section>
<div slot="place-order-btn">
<div class="mb20">
<button
type="button"
class="theme-btn"
@click="placeOrder()"
:disabled="disable_button"
id="checkout-place-order-button">
{{ __('shop::app.checkout.onepage.place-order') }}
</button>
</div>
</div>
</review-section>
</div>
</div>
<div class="col-4 offset-1 row order-summary-container top pt0">
<summary-section :key="summeryComponentKey"></summary-section>
</div>
</div>
</div>
</script>

View File

@ -5,27 +5,28 @@
@stop
@section('content-wrapper')
<div class="container">
<div class="order-success-content row col-12 offset-1">
<h1 class="row col-12">{{ __('shop::app.checkout.success.thanks') }}</h1>
<div class="order-success-content row col-12 offset-1">
<h1 class="row col-12">{{ __('shop::app.checkout.success.thanks') }}</h1>
<p class="row col-12">
{{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->increment_id]) }}
</p>
<p class="row col-12">
{{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->increment_id]) }}
</p>
<p class="row col-12">
{{ __('shop::app.checkout.success.info') }}
</p>
<p class="row col-12">
{{ __('shop::app.checkout.success.info') }}
</p>
{{ view_render_event('bagisto.shop.checkout.continue-shopping.before', ['order' => $order]) }}
{{ view_render_event('bagisto.shop.checkout.continue-shopping.before', ['order' => $order]) }}
<div class="mt15 row-col-12">
<a href="{{ route('shop.home.index') }}" class="theme-btn remove-decoration">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</a>
</div>
{{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}
<div class="mt15 row-col-12">
<a href="{{ route('shop.home.index') }}" class="theme-btn remove-decoration">
{{ __('shop::app.checkout.cart.continue-shopping') }}
</a>
</div>
{{ view_render_event('bagisto.shop.checkout.continue-shopping.after', ['order' => $order]) }}
</div>
@endsection

View File

@ -37,7 +37,7 @@
@endphp
<a
href="{{ url()->to('/').'/products/'.$review->product->url_key }}"
href="{{ url()->to('/').'/'.$review->product->url_key }}"
title="{{ $review->product->name }}"
class="col-2 max-sm-img-dimention no-padding">
<img class="media" src="{{ $image['small_image_url'] }}"/>
@ -47,7 +47,7 @@
<div class="product-name">
<a
class="remove-decoration"
href="{{ url()->to('/').'/products/'.$review->product->url_key }}"
href="{{ url()->to('/').'/'.$review->product->url_key }}"
title="{{ $review->product->name }}">
{{$review->product->name}}
</a>

View File

@ -13,7 +13,7 @@
<div class="card">
<div class="row velocity-divide-page">
<div class="left">
<img src="{{ asset('/storage/' . $categoryDetails->image) }}" />
<img src="{{ asset('/storage/' . $categoryDetails->category_icon_path) }}" />
</div>
<div class="right">

View File

@ -42,8 +42,8 @@
</div>
@include ('shop::products.list.recently-viewed', [
'addClass' => 'col-3',
'addClassWrapper' => 'scrollable max-height-350',
'addClass' => 'col-3 new-products-recent',
'addClassWrapper' => 'scrollable max-height-300',
])
@else
<carousel-component

View File

@ -9,7 +9,7 @@
@endif
@if (core()->getConfigData('customer.settings.newsletter.subscription'))
<div class="subscribe-newsletter col-lg-6 text-right">
<div class="subscribe-newsletter col-lg-6">
<div class="form-container">
<form action="{{ route('shop.subscribe') }}">
<div class="subscriber-form-div">

View File

@ -2,7 +2,9 @@
<div class="row col-12 remove-padding-margin velocity-divide-page">
<logo-component></logo-component>
<div class="row no-margin right">
<searchbar-component></searchbar-component>
{{-- <div class="row no-margin right">
<div class="col-8 no-padding input-group">
<form
method="GET"
@ -55,7 +57,6 @@
{!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
</div>
</div>
</div> --}}
</div>
</header>

View File

@ -61,15 +61,17 @@
@section('body-header')
@include('shop::layouts.top-nav.index')
@include('shop::layouts.header.index', ['categories' => $categories])
@include('shop::layouts.header.index', [
'categories' => $categories
])
<div class="main-content-wrapper col-12 no-padding">
@php
$velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents();
@endphp
<content-header
url="{{ url()->to('/') }}"
is-enabled="{{ sizeof($categories) }}"
:header-content="{{ json_encode($velocityContent) }}"
heading= "{{ __('velocity::app.menu-navbar.text-category') }}"

View File

@ -53,12 +53,24 @@
<input type="hidden" name="product_id" value="{{ $product->product_id }}">
{{-- product-gallery --}}
<div class="left col-lg-6">
<div class="left
@if ($showRecentlyViewed)
col-lg-6
@else
col-lg-5
@endif
">
@include ('shop::products.view.gallery')
</div>
{{-- right-section --}}
<div class="right col-lg-6 scrollable">
<div class="right
@if ($showRecentlyViewed)
col-lg-6
@else
col-lg-7
@endif
">
{{-- product-info-section --}}
<div class="row info">
<h2 class="col-lg-12">{{ $product->name }}</h2>

View File

@ -19,7 +19,10 @@
@foreach ($relatedProducts as $index => $relatedProduct)
<slide slot="slide-{{ $index }}">
@include ('shop::products.list.card', ['product' => $relatedProduct])
@include ('shop::products.list.card', [
'product' => $relatedProduct,
'addToCartBtnClass' => 'small-padding',
])
</slide>
@endforeach

View File

@ -16,19 +16,6 @@
{!! view_render_event('bagisto.shop.products.review.before', ['product' => $product]) !!}
@if ($total)
{{-- reviews count --}}
<div class="row reviews pb15">
<star-ratings
:size="24"
:ratings="{{ $avgStarRating }}"
></star-ratings>
<div class="reviews-text">
<span>{{ $avgRatings }} Ratings and {{ $total }} Reviews</span>
</div>
</div>
@if (isset($accordian) && $accordian)
<accordian :active="true">
{{-- customer ratings --}}
@ -43,14 +30,14 @@
<div class="row customer-rating" slot="body">
<div class="row full-width text-center mb30">
<div class="col-lg-12 col-xl-6">
<h4 class="col-lg-12">{{ $avgRatings }} Star</h4>
<h4 class="col-lg-12 fs16">{{ $avgRatings }} Star</h4>
<star-ratings
:size="24"
:ratings="{{ $avgStarRating }}"
></star-ratings>
<span>{{ $avgRatings }} Ratings and {{ $total }} Reviews</span>
<span class="fs16 fw6">{{ $avgRatings }} Ratings and {{ $total }} Reviews</span>
@if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
<a href="{{ route('shop.reviews.create', ['slug' => $product->url_key ]) }}">

View File

@ -8,7 +8,7 @@
@section('content-wrapper')
<section class="search-container cart-details row">
@if ($results->count())
@if ($results && $results->count())
<div class="filters-container col-12">
@include ('shop::products.list.toolbar')
</div>