conflict resolved

This commit is contained in:
prateek srivastava 2020-01-16 19:26:36 +05:30
commit b01526d9ea
31 changed files with 487 additions and 155 deletions

View File

@ -28,7 +28,7 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.locale.edit.before') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.before', ['locale' => $locale]) !!}
<input name="_method" type="hidden" value="PUT">
@ -60,7 +60,7 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.locale.edit.after') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.after', ['locale' => $locale]) !!}
</div>
</div>
</form>

View File

@ -10,7 +10,7 @@
@push('scripts')
@include('shop::checkout.cart.coupon')
<script type="text/x-template" id="checkout-template">
<div id="checkout" class="checkout-process">
<div class="col-main">

View File

@ -811,6 +811,42 @@
top: 8px;
}
.nav-container {
position: absolute;
height: 100vh;
background-color: white;
display: inline-block;
border: 1px solid red;
margin-left: -16px;
z-index: 2;
}
.nav-container .wrapper {
width: 250px !important;
margin-left: 13px;
}
.nav-container .wrapper .offers {
color: rgba(0, 0, 0, 0.83);
line-height: 20px;
font-weight: 530;
border-top: 1px solid rgba(0, 0, 0, 0.24);
}
.nav-container .wrapper .offers li {
font-size: 16px;
margin: 13px 13px 0px 13px;
}
.nav-container .wrapper .layered-category {
border-top: 1px solid rgba(0, 0, 0, 0.24);
}
.nav-container .wrapper .layered-category li {
font-size: 14px;
margin: 13px 13px 0px 13px;
}
.review-page-container {
padding: 20px;
}
@ -864,6 +900,7 @@
.customer-rating .rating-bar {
top: 12px;
padding: 0px;
height: 5px;
position: relative;
background-color: #F7F7F9;
@ -875,15 +912,8 @@
background-color: #111111;
}
.customer-rating .btn-write-review {
.customer-rating .theme-btn.light, .customer-rating .cart-details .light.continue-shopping-btn, .cart-details .customer-rating .light.continue-shopping-btn, .customer-rating .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination .customer-rating .page-item {
margin-top: 10px;
color: #26A37C;
font-weight: 600;
padding: 8px 11px;
background-color: white;
-webkit-box-shadow: 0 1px 0 0 #CFCFCF;
box-shadow: 0 1px 0 0 #CFCFCF;
border: 1px solid rgba(0, 0, 0, 0.12);
}
.review-form {
@ -1114,9 +1144,9 @@
padding: 0 10px !important;
font-size: 24px !important;
font-weight: 600 !important;
border: 1px solid #CCCCCC !important;
color: #000000 !important;
background-color: #FFFFFF;
border: 1px solid #CCCCCC !important;
}
.quantity button:nth-of-type(1) {
@ -1124,7 +1154,7 @@
}
.quantity input {
width: 50px;
max-width: 28px;
cursor: default;
font-size: 16px !important;
border-left: 0px !important;
@ -1132,6 +1162,10 @@
text-align: center;
}
.quantity button:hover {
background-color: #f5f5f5 !important;
}
.quantity button:nth-last-of-type(1) {
border-radius: 0px;
border-left: 0px !important;
@ -1718,6 +1752,28 @@
position: absolute;
}
.checkout-process .coupon-container input {
max-width: 200px;
}
.checkout-process .coupon-container button {
margin: 20px 0;
}
.checkout-process .coupon-container .applied-coupon-details {
font-size: 16px;
margin-bottom: 10px;
}
.checkout-process .coupon-container .applied-coupon-details label:nth-of-type(1) {
color: #26A37C;
}
.checkout-process .coupon-container .rango-close {
cursor: pointer;
margin-left: 5px;
}
.address-container .address-holder {
margin-top: 15px;
}
@ -1731,6 +1787,10 @@
height: 100%;
}
.address-container .address-holder .card h5 {
font-size: 14px;
}
.address-container .address-holder .card ul li {
display: inline-block;
}
@ -1927,6 +1987,20 @@
#app {
min-height: 65vh;
position: relative;
}
.main-container-wrapper .sticky-header {
top: 0px;
z-index: 1100;
position: -webkit-sticky;
position: sticky;
background: white;
}
.main-container-wrapper .sticky-header.header-shadow {
-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);
}
.search-container {
@ -2624,8 +2698,19 @@ header #search-form > *:focus {
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
}
.product-policy-container .card .col-sm-10 {
line-height: 3.5rem;
.product-policy-container .card .policy {
display: table;
padding: 0 10px;
}
.product-policy-container .card .policy .left {
margin-right: 10px;
display: inline-block;
}
.product-policy-container .card .policy .right {
display: table-cell;
vertical-align: middle;
}
/* product policy section */
@ -2835,7 +2920,11 @@ header #search-form > *:focus {
}
.reviews-container .card .review-info > div:not(:last-child) {
margin-bottom: 15px;
margin-bottom: 10px;
}
.reviews-container .card .review-info .star-ratings {
margin-bottom: 5px !important;
}
.reviews-container .product-info {
@ -4009,6 +4098,10 @@ button[disabled] {
color: #141516;
}
.normal-white-text {
color: rgba(255, 255, 255, 0.83);
}
.display-table {
display: table;
}
@ -4200,6 +4293,30 @@ button[disabled] {
vertical-align: middle;
}
.product-detail .layouter,
.product-detail #product-form {
height: 100%;
}
.product-detail #product-form .form-container {
height: 100%;
position: relative;
}
.product-detail #product-form .form-container .left {
top: 60px;
position: -webkit-sticky;
position: sticky;
}
.product-detail .accordian.active .accordian-header {
padding-bottom: 0px;
}
.product-detail .full-description {
font-size: 14px;
}
.store-meta-images {
margin-top: 20px;
}

View File

@ -36532,7 +36532,7 @@ var render = function() {
_c(
"h2",
{
staticClass: "fs14 fw6 cursor-pointer tab",
staticClass: "fs16 fw6 cursor-pointer tab",
class: index == 0 ? "active" : ""
},
[_vm._v(_vm._s(tab))]
@ -36582,7 +36582,7 @@ var render = function() {
_vm._v(" "),
!(_vm.viewAll == "false" || _vm.viewAll == "") && _vm.viewAll
? [
_c("div", { staticClass: "mr15" }, [
_c("div", [
_c(
"a",
{
@ -36593,7 +36593,7 @@ var render = function() {
}
},
[
_c("h2", { staticClass: "fs14 fw6 cursor-pointer tab" }, [
_c("h2", { staticClass: "fs16 fw6 cursor-pointer tab" }, [
_vm._v("View All")
])
]

View File

@ -12,19 +12,23 @@ class VelocityMetaDataSeeder extends Seeder
DB::table('velocity_meta_data')->delete();
DB::table('velocity_meta_data')->insert([
'id' => 1,
'id' => 1,
'home_page_content' => "<p>@include('shop::home.advertisements.advertisement-one')@include('shop::home.featured-products') @include('shop::home.advertisements.advertisement-two') @include('shop::home.new-products') @include('shop::home.advertisements.advertisement-three')</p>",
'home_page_content' => "<p>@include('shop::home.advertisements.advertisement-one')@include('shop::home.featured-products') @include('shop::home.advertisements.advertisement-two') @include('shop::home.new-products') @include('shop::home.advertisements.advertisement-three')</p>",
'footer_left_content' => trans('velocity::app.admin.meta-data.footer-left-raw-content'),
'footer_left_content' => trans('velocity::app.admin.meta-data.footer-left-raw-content'),
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/">About Us</a></li><li><a href="https://webkul.com/about-us/company-profile/">Customer Service</a></li><li><a href="https://webkul.com/about-us/company-profile/">What&rsquo;s New</a></li><li><a href="https://webkul.com/about-us/company-profile/">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/"> Order and Returns </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Payment Policy </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Shipping Policy</a></li><li><a href="https://webkul.com/about-us/company-profile/"> Privacy and Cookies Policy </a></li></ul></div>',
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/">About Us</a></li><li><a href="https://webkul.com/about-us/company-profile/">Customer Service</a></li><li><a href="https://webkul.com/about-us/company-profile/">What&rsquo;s New</a></li><li><a href="https://webkul.com/about-us/company-profile/">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/"> Order and Returns </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Payment Policy </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Shipping Policy</a></li><li><a href="https://webkul.com/about-us/company-profile/"> Privacy and Cookies Policy </a></li></ul></div>',
'slider' => 1,
'slider' => 1,
'subscription_bar_content' => '<div class="social-icons col-lg-6"><i class="fs24 within-circle rango-facebook" title="facebook"></i> <i class="fs24 within-circle rango-twitter" title="twitter"></i> <i class="fs24 within-circle rango-linked-in" title="linkedin"></i> <i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> <i class="fs24 within-circle rango-youtube" title="Youtube"></i> <i class="fs24 within-circle rango-instagram" title="instagram"></i></div>',
'subscription_bar_content' => '<div class="social-icons col-lg-6"><i class="fs24 within-circle rango-facebook" title="facebook"></i> <i class="fs24 within-circle rango-twitter" title="twitter"></i> <i class="fs24 within-circle rango-linked-in" title="linkedin"></i> <i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> <i class="fs24 within-circle rango-youtube" title="Youtube"></i> <i class="fs24 within-circle rango-instagram" title="instagram"></i></div>',
'product_policy' => '<div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="row"><div class="col-sm-2"><i class="rango-van-ship fs40"></i></div><div class="col-sm-10"><span class="font-setting fs20">Free Shippingon Order $20 or More</span></div></div></div></div><div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="row"><div class="col-sm-2"><i class="rango-exchnage fs40"></i></div><div class="col-sm-10"><span class="font-setting fs20">ProductReplace &amp; Return Available </span></div></div></div></div><div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="row"><div class="col-sm-2"><i class="rango-exchnage fs40"></i></div><div class="col-sm-10"><span class="font-setting fs20">ProductExchange and EMI Available </span></div></div></div></div>',
]);
'product_policy' => '<div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shippingon Order $20 or More</span></div></div></div></div> <div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">ProductReplace &amp; Return Available </span></div></div></div></div> <div class="col-sm-4 col-xs-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">ProductExchange and EMI Available </span></div></div></div></div>',
]);
DB::table('locales')->where('code', 'en')->update([
'locale_image' => '/themes/velocity/assets/images/flags/en.png'
]);
}
}

View File

@ -22,8 +22,12 @@ class AdminHelper
public function saveLocaleImg($locale)
{
$locale->locale_image = $this->uploadImage('locale_image');
$locale->save();
$uploadedImagePath = $this->uploadImage('locale_image.image_0');
if ($uploadedImagePath) {
$locale->locale_image = $uploadedImagePath;
$locale->save();
}
return $locale;
}
@ -32,8 +36,12 @@ class AdminHelper
{
$category = $this->categoryRepository->findOrFail($categoryId);
$category->category_icon_path = $this->uploadImage('category_icon_path');
$category->save();
$uploadedImagePath = $this->uploadImage('category_icon_path.image_0');
if ($uploadedImagePath) {
$category->category_icon_path = $uploadedImagePath;
$category->save();
}
return $category;
}
@ -50,9 +58,11 @@ class AdminHelper
Storage::delete($dir . $file);
$image = $request->file($file)->store($dir);
return $image;
}
return $image;
return false;
}
public function storeSliderDetails($slider)

View File

@ -54,8 +54,8 @@ class VelocityServiceProvider extends ServiceProvider
);
Event::listen([
'bagisto.admin.catalog.category.edit_form_accordian.general.after',
'bagisto.admin.catalog.category.create_form_accordian.general.after',
'bagisto.admin.catalog.category.edit_form_accordian.description_images.controls.after',
'bagisto.admin.catalog.category.create_form_accordian.description_images.controls.after',
], function($viewRenderEventManager) {
$viewRenderEventManager->addTemplate(
'velocity::admin.catelog.categories.category-icon'

View File

@ -16,7 +16,7 @@
class="col-lg-2 no-padding"
v-for="(tab, index) in tabs.slice(0, 3)">
<h2 class="fs14 fw6 cursor-pointer tab" :class="index == 0 ? 'active' : ''">{{ tab }}</h2>
<h2 class="fs16 fw6 cursor-pointer tab" :class="index == 0 ? 'active' : ''">{{ tab }}</h2>
</div>
</template>
@ -40,9 +40,9 @@
</template>
<template v-if="(! (viewAll == 'false' || viewAll == '')) && viewAll">
<div class="mr15">
<div>
<a :href="viewAll" :title="`View all ${headerHeading} products`" class="remove-decoration link-color">
<h2 class="fs14 fw6 cursor-pointer tab">View All</h2>
<h2 class="fs16 fw6 cursor-pointer tab">View All</h2>
</a>
</div>
</template>

View File

@ -3,6 +3,7 @@
$white-color: #FFFFFF;
$black-color: #111111;
$font-color: rgba(0,0,0,0.83);
$font-color-light: rgba(255, 255, 255, 0.83);
$button-primary-bg: #21A179;
$border-primary: #269c77;
$button-danger: #F05153;

View File

@ -56,6 +56,7 @@
.rating-bar {
top: 12px;
padding: 0px;
height: 5px;
position: relative;
background-color: $light-background;
@ -67,14 +68,10 @@
}
}
.btn-write-review {
margin-top: 10px;
color: #26A37C;
font-weight: 600;
padding: 8px 11px;
background-color: white;
box-shadow: 0 1px 0 0 #CFCFCF;
border: 1px solid rgba(0,0,0,0.12);
.theme-btn {
&.light {
margin-top: 10px;
}
}
}
@ -326,9 +323,9 @@
padding: 0 10px !important;
font-size: 24px !important;
font-weight: 600 !important;
border: 1px solid $border-common !important;
color: $dark-color !important;
background-color: $white-color;
border: 1px solid $border-common !important;
}
button:nth-of-type(1) {
@ -336,7 +333,7 @@
}
input {
width: 50px;
max-width: 28px;
cursor: default;
font-size: 16px !important;
border-left: 0px !important;
@ -344,6 +341,10 @@
text-align: center;
}
button:hover {
background-color: #f5f5f5 !important;
}
button:nth-last-of-type(1) {
border-radius: 0px;
border-left: 0px !important;
@ -1004,6 +1005,30 @@
position: absolute;
}
}
.coupon-container {
input {
max-width: 200px;
}
button {
margin: 20px 0;
}
.applied-coupon-details {
font-size: 16px;
margin-bottom: 10px;
}
.applied-coupon-details label:nth-of-type(1) {
color: $theme-color;
}
.rango-close {
cursor: pointer;
margin-left: 5px;
}
}
}
.address-container {
@ -1018,6 +1043,10 @@
.card {
height: 100%;
h5 {
font-size: 14px;
}
ul {
li {
display: inline-block;
@ -1219,7 +1248,21 @@
#app {
min-height: 65vh;
position: relative;
}
.main-container-wrapper {
.sticky-header {
top: 0px;
z-index: 1100;
position: sticky;
background: white;
&.header-shadow {
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
}
}
}
.search-container {
padding: 30px 20px;
@ -1682,7 +1725,7 @@
}
}
.filter-attributes-item {
.filter-attributes-item {
margin-bottom: 10px;
border-bottom: 1px solid #CCCCCC;
&.active {
@ -1701,13 +1744,6 @@
background-color: white;
}
}
.checkbox {
label {
padding-left: 0px !important;
}
input[type=checkbox]{
display: none;
}
input[type=checkbox] + label{
display: inline-block;
@ -1715,7 +1751,6 @@
height: 20px;
cursor: pointer;
border-radius: 2px;
// background-color: white;
border: 1px solid rgba(0,0,0,0.53);
margin: 4px 5px -6px -3px;
}
@ -1725,7 +1760,7 @@
display: none ;
margin-left: 7px;
}
}
.layered-filter-wrapper {
@extend .scrollable;

View File

@ -201,8 +201,19 @@ header #search-form > *:focus {
background: $white-color;
box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
.col-sm-10 {
line-height: 3.5rem;
.policy {
display: table;
padding: 0 10px;
.left {
margin-right: 10px;
display: inline-block;
}
.right {
display: table-cell;
vertical-align: middle;
}
}
}
}
@ -430,7 +441,11 @@ header #search-form > *:focus {
box-shadow: 0 4px 17px 0 rgba(0,0,0,0.11);
> div:not(:last-child) {
margin-bottom: 15px;
margin-bottom: 10px;
}
.star-ratings {
margin-bottom: 5px !important;
}
}
}

View File

@ -218,6 +218,34 @@
}
}
.layouter,
#product-form {
height: 100%;
}
#product-form {
.form-container {
height: 100%;
position: relative;
.left {
top: 60px;
position: sticky;
}
}
}
.accordian {
&.active {
.accordian-header {
padding-bottom: 0px;
}
}
}
.full-description {
font-size: 14px;
}
}
.store-meta-images {

View File

@ -751,6 +751,9 @@ button[disabled] {
.normal-text {
color: $light1-black;
}
.normal-white-text {
color: $font-color-light;
}
.display-table {
display: table;

View File

@ -106,6 +106,7 @@ return [
'footer' => 'Footer',
'product-policy' => 'Product Policy',
'slider-path' => 'Slider Path',
'category-logo' => 'Category logo',
],
'category' => [
'title' => 'Category Menu List',

View File

@ -1,4 +1,18 @@
<input
type="file"
name="category_icon_path"
style="position: relative;top: -22px;left: 15px;" />
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.category-logo') }}</label>
@if (isset($category) && $category->category_icon_path)
<image-wrapper
:multiple="false"
input-name="category_icon_path"
:images='"{{ url()->to('/') . '/storage/' . $category->category_icon_path }}"'
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'">
</image-wrapper>
@else
<image-wrapper
:multiple="false"
input-name="category_icon_path"
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'">
</image-wrapper>
@endif
</div>

View File

@ -1 +1,16 @@
<input type="file" name="locale_image" />
<div class="control-group">
@if (isset($locale) && $locale->locale_image)
<image-wrapper
:multiple="false"
input-name="locale_image"
:images='"{{ url()->to('/') . '/storage/' . $locale->locale_image }}"'
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'">
</image-wrapper>
@else
<image-wrapper
:multiple="false"
input-name="locale_image"
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'">
</image-wrapper>
@endif
</div>

View File

@ -0,0 +1,121 @@
@if ($cart)
<script type="text/x-template" id="coupon-component-template">
<div class="coupon-container">
<div class="discount-control">
<form class="custom-form" method="post" @submit.prevent="applyCoupon">
<div class="control-group" :class="[error_message ? 'has-error' : '']">
<input
type="text"
name="code"
class="control"
v-model="coupon_code"
placeholder="{{ __('shop::app.checkout.onepage.enter-coupon-code') }}" />
<div class="control-error">@{{ error_message }}</div>
</div>
<button class="theme-btn light" :disabled="disable_button">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
</form>
</div>
<div class="applied-coupon-details" v-if="applied_coupon">
<label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
<label class="right" style="display: inline-flex; align-items: center;">
<b>@{{ applied_coupon }}</b>
<i class="rango-close fs18" title="{{ __('shop::app.checkout.total.remove-coupon') }}" v-on:click="removeCoupon"></i>
</label>
</div>
</div>
</script>
<script>
Vue.component('coupon-component', {
template: '#coupon-component-template',
inject: ['$validator'],
data: function() {
return {
coupon_code: '',
error_message: '',
applied_coupon: "{{ $cart->coupon_code }}",
route_name: "{{ request()->route()->getName() }}",
disable_button: ("{{ $cart->coupon_code }}" == "" ? false : true),
}
},
methods: {
applyCoupon: function() {
var self = this;
if (! self.coupon_code.length)
return;
self.error_message = null;
self.disable_button = true;
axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code})
.then(function(response) {
if (response.data.success) {
self.$emit('onApplyCoupon');
self.applied_coupon = self.coupon_code;
self.coupon_code = '';
window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
self.$root.addFlashMessages();
self.redirectIfCartPage();
} else {
self.error_message = response.data.message;
}
self.disable_button = false;
})
.catch(function(error) {
self.error_message = error.response.data.message;
self.disable_button = false;
});
},
removeCoupon: function () {
var self = this;
axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}')
.then(function(response) {
self.$emit('onRemoveCoupon')
self.applied_coupon = '';
self.disable_button = false;
window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
self.$root.addFlashMessages();
self.redirectIfCartPage();
})
.catch(function(error) {
window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}];
self.$root.addFlashMessages();
});
},
redirectIfCartPage: function() {
if (this.route_name != 'shop.checkout.cart.index')
return;
setTimeout(function() {
window.location.reload();
}, 700);
}
}
});
</script>
@endif

View File

@ -128,6 +128,8 @@
@if ($cart)
<div class="col-4 offset-1 row order-summary-container">
@include('shop::checkout.total.summary', ['cart' => $cart])
<coupon-component></coupon-component>
</div>
@else
<div class="fs16 row col-12">
@ -151,6 +153,8 @@
@endsection
@push('scripts')
@include('shop::checkout.cart.coupon')
<script type="text/javascript">
function removeLink(message) {
if (!confirm(message))

View File

@ -9,6 +9,8 @@
@endsection
@push('scripts')
@include('shop::checkout.cart.coupon')
<script type="text/x-template" id="checkout-template">
<div class="container">
<div id="checkout" class="checkout-process offset-1 row col-11">
@ -36,6 +38,11 @@
<payment-section @onPaymentMethodSelected="paymentMethodSelected($event)">
</payment-section>
<coupon-component
@onApplyCoupon="getOrderSummary"
@onRemoveCoupon="getOrderSummary">
</coupon-component>
</div>
<div

View File

@ -19,14 +19,14 @@
<div class="categories-collection">
<div class="category-text-content">
<h2 class="text-uppercase">
<a href="{{ $category[0]->slug }}" class="unset">
<a href="{{ $category[0]->slug }}" class="remove-decoration normal-white-text">
{{ $category[0]->name }}
</a>
</h2>
<ul type="none" class="fs14">
@foreach ($category[0]->children as $subCategory)
<li>
<a href="{{ $category[0]->slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $category[0]->slug . '/' . $subCategory->slug }}" class="remove-decoration normal-white-text">
{{ $subCategory->name }}
</a>
</li>
@ -48,14 +48,14 @@
<div class="categories-collection">
<div class="category-text-content">
<h2 class="text-uppercase">
<a href="{{ $category[1]->slug }}" class="unset">
<a href="{{ $category[1]->slug }}" class="remove-decoration normal-white-text">
{{ $category[1]->name }}
</a>
</h2>
<ul type="none" class="fs14">
@foreach ($category[1]->children as $subCategory)
<li>
<a href="{{ $category[1]->slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $category[1]->slug . '/' . $subCategory->slug }}" class="remove-decoration normal-white-text">
{{ $subCategory->name }}
</a>
</li>
@ -75,14 +75,14 @@
<div class="categories-collection">
<div class="category-text-content">
<h2 class="text-uppercase">
<a href="{{ $category[2]->slug }}" class="unset">
<a href="{{ $category[2]->slug }}" class="remove-decoration normal-white-text">
{{ $category[2]->name }}
</a>
</h2>
<ul type="none" class="fs14">
@foreach ($category[2]->children as $subCategory)
<li>
<a href="{{ $category[2]->slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $category[2]->slug . '/' . $subCategory->slug }}" class="remove-decoration normal-white-text">
{{ $subCategory->name }}
</a>
</li>
@ -103,14 +103,14 @@
<div class="categories-collection">
<div class="category-text-content">
<h2 class="text-uppercase">
<a href="{{ $category[3]->slug }}" class="unset">
<a href="{{ $category[3]->slug }}" class="remove-decoration normal-white-text">
{{ $category[3]->name }}
</a>
</h2>
<ul type="none" class="fs14">
@foreach ($category[3]->children as $subCategory)
<li>
<a href="{{ $category[3]->slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $category[3]->slug . '/' . $subCategory->slug }}" class="remove-decoration normal-white-text">
{{ $subCategory->name }}
</a>
</li>
@ -142,14 +142,14 @@
<div class="categories-collection">
<div class="category-text-content">
<h2 class="text-uppercase">
<a href="{{ $categoryItem->slug }}" class="unset">
<a href="{{ $categoryItem->slug }}" class="remove-decoration normal-white-text">
{{ $categoryItem->name }}
</a>
</h2>
<ul type="none" class="fs14">
@foreach ($categoryItem->children as $subCategory)
<li>
<a href="{{ $categoryItem->slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $categoryItem->slug . '/' . $subCategory->slug }}" class="remove-decoration normal-white-text">
{{ $subCategory->name }}
</a>
</li>

View File

@ -22,12 +22,12 @@
</div>
<div>
<label class="fs20 no-margin display-block">
<h4 class="fs20 fw6 no-margin display-block">
{{ $review['name'] }}
</label>
</h4>
<div class="product-info fs16">
<span>Reviewed- <a class="remove-decoration link-color" href="{{ route('shop.productOrCategory.index', ['slug' => $review->product->url_key]) }}">{{$review['title']}}</a></span>
<span>Reviewed- <a class="remove-decoration link-color" href="{{ route('shop.productOrCategory.index', ['slug' => $review->product->url_key]) }}">{{$review->product->name}}</a></span>
</div>
</div>
</div>

View File

@ -26,7 +26,7 @@
<ul type="none">
@foreach ($categoryDetails->children as $subCategory)
<li>
<a href="{{ $slug . '/' . $subCategory->slug }}" class="unset">
<a href="{{ $slug . '/' . $subCategory->slug }}" class="remove-decoration normal-text">
{{ $subCategory->name }}
</a>
</li>

View File

@ -4,7 +4,7 @@
$newProducts = app('Webkul\Velocity\Repositories\Product\ProductRepository')->getNewProducts($count);
@endphp
@if (! empty($newProducts))
@if (! empty($newProducts) && $newProducts->total())
<div class="container-fluid">
<card-list-header heading="{{ __('shop::app.home.new-products') }}">
</card-list-header>

View File

@ -21,7 +21,7 @@
<ul class="font-clr pl30">
@foreach ($categoryDetails->children as $subCategory)
<li>
<a href="{{ $subCategory->slug }}" class="unset">
<a href="{{ $subCategory->slug }}" class="remove-decoration normal-text">
{{ $subCategory->name }}
</a>
</li>

View File

@ -1,9 +1,9 @@
<div class="footer-copy-right">
<span class="fs16">
@if (core()->getConfigData('general.content.footer.footer_content'))
{{ core()->getConfigData('general.content.footer.footer_content') }}
{!! core()->getConfigData('general.content.footer.footer_content') !!}
@else
{{ trans('admin::app.footer.copy-right') }}
{!! trans('admin::app.footer.copy-right') !!}
@endif
</span>
</div>

View File

@ -1,62 +1,22 @@
<header>
<header class="sticky-header">
<div class="row col-12 remove-padding-margin velocity-divide-page">
<logo-component></logo-component>
<searchbar-component></searchbar-component>
{{-- <div class="row no-margin right">
<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> --}}
</div>
</header>
@push('scripts')
<script type="text/javascript">
(() => {
document.addEventListener('scroll', e => {
scrollPosition = Math.round(window.scrollY);
if (scrollPosition > 50){
document.querySelector('header').classList.add('header-shadow');
} else {
document.querySelector('header').classList.remove('header-shadow');
}
});
})()
</script>
@endpush

View File

@ -15,7 +15,7 @@
@endforeach
<div class="locale-icon">
<img src="{{ asset('/storage/' . $localeImage) }}" />
<img src="{{ asset('/storage/' . $localeImage) }}" onerror="this.src = '{{ asset($localeImage) }}'" />
</div>
<select

View File

@ -93,8 +93,6 @@
v-bind:value="option.id"
v-model="appliedFilters"
@change="addFilter($event)" />
<label for="checkbox"></label>
<span>@{{ option.label ? option.label : option.admin_name }}</span>
</div>
</li>

View File

@ -33,7 +33,6 @@
margin-bottom: 0px;
}
</style>
@endpush
@section('full-content-wrapper')

View File

@ -41,7 +41,7 @@
@if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
<a href="{{ route('shop.reviews.create', ['slug' => $product->url_key ]) }}">
<button type="button" class="btn-write-review">{{ __('velocity::app.products.write-your-review') }}</button>
<button type="button" class="theme-btn light">{{ __('velocity::app.products.write-your-review') }}</button>
</a>
@endif
</div>
@ -51,13 +51,13 @@
@for ($i = 5; $i >= 1; $i--)
<div class="row">
<span class="col-lg-3 no-padding fs16 fw6">{{ $i }} Star</span>
<span class="col-3 no-padding fs16 fw6">{{ $i }} Star</span>
<div class="col-lg-7 rating-bar" title="{{ $percentageRatings[$i] }}%">
<div class="col-7 rating-bar" title="{{ $percentageRatings[$i] }}%">
<div style="width: {{ $percentageRatings[$i] }}%"></div>
</div>
<span class="col-lg-2 fs16">{{ $countRatings[$i] }}</span>
<span class="col-2 fs16">{{ $countRatings[$i] }}</span>
</div>
@endfor
@ -80,7 +80,7 @@
@if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
<a href="{{ route('shop.reviews.create', ['slug' => $product->url_key ]) }}">
<button type="button" class="btn-write-review">{{ __('velocity::app.products.write-your-review') }}</button>
<button type="button" class="theme-btn light">{{ __('velocity::app.products.write-your-review') }}</button>
</a>
@endif
</div>
@ -119,7 +119,7 @@
<div class="customer-reviews" slot="body">
@foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
<div class="row">
<h4 class="col-lg-12">{{ $review->title }}</h4>
<h4 class="col-lg-12 fs18">{{ $review->title }}</h4>
<star-ratings
:ratings="{{ $review->rating }}"
@ -130,7 +130,7 @@
<span>{{ $review->comment }}</span>
</div>
<div class="col-lg-12 review-date-time">
<div class="col-lg-12 mt5">
<span>{{ __('velocity::app.products.review-by') }} -</span>
<label>
@ -145,7 +145,7 @@
<a
href="{{ route('shop.reviews.index', ['slug' => $product->url_key ]) }}"
class="mb20"
class="mb20 link-color"
>{{ __('velocity::app.products.view-all-reviews') }}</a>
</div>
</accordian>
@ -157,7 +157,7 @@
<div class="customer-reviews">
@foreach ($reviewHelper->getReviews($product)->paginate(10) as $review)
<div class="row">
<h4 class="col-lg-12">{{ $review->title }}</h4>
<h4 class="col-lg-12 fs18">{{ $review->title }}</h4>
<star-ratings
:ratings="{{ $review->rating }}"
@ -168,7 +168,7 @@
<span>{{ $review->comment }}</span>
</div>
<div class="col-lg-12 review-date-time">
<div class="col-lg-12 mt5">
@if ("{{ $review->name }}")
<span>{{ __('velocity::app.products.review-by') }} -</span>
@ -189,7 +189,7 @@
@if (core()->getConfigData('catalog.products.review.guest_review') || auth()->guard('customer')->check())
<div class="customer-rating" style="border: none">
<a href="{{ route('shop.reviews.create', ['slug' => $product->url_key ]) }}">
<button type="button" class="btn-write-review">{{ __('velocity::app.products.write-your-review') }}</button>
<button type="button" class="theme-btn light">{{ __('velocity::app.products.write-your-review') }}</button>
</a>
</div>
@endif