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

Merge branch 'master' into issue-4180

This commit is contained in:
devansh bawari 2020-10-28 17:58:17 +05:30
parent 0bbec81ba6 26fecac6d7
commit 14ca75b15f
14 changed files with 166 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
View File

@ -8,7 +8,7 @@
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
<date @onChange="dateSelected($event)">
<date @onChange="dateSelected($event)" :minDate="'{{$bookingProduct->available_from}}'" :maxDate="'{{$bookingProduct->available_to}}'">
<input type="text" v-validate="'required'" name="booking[date]" class="form-style" data-vv-as="&quot;{{ __('bookingproduct::app.shop.products.date') }}&quot;"/>
</date>
@ -24,7 +24,7 @@
</div>
</div>
</div>
</script>
<script>
@ -54,6 +54,6 @@
}
}
});
</script>
@endpush
@endpush

8
packages/Webkul/Product/src/Helpers/Toolbar.php
View File

@ -131,7 +131,13 @@ class Toolbar extends AbstractProduct
{
$params = request()->input();
if (isset($params['mode']) && $key == $params['mode']) {
$defaultMode = core()->getConfigData('catalog.products.storefront.mode')
? core()->getConfigData('catalog.products.storefront.mode')
: 'grid';
if (request()->input() == null && $key == $defaultMode) {
return true;
} else if (isset($params['mode']) && $key == $params['mode']) {
return true;
}

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

22
packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt
View File

@ -1,18 +1,18 @@
/* flatpickr v4.6.3, @license MIT */
/* flatpickr v4.6.6, @license MIT */
/*! *****************************************************************************
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0
Copyright (c) Microsoft Corporation.
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
See the Apache Version 2.0 License for specific language governing permissions
and limitations under the License.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */
/**

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=706b63016a08ec91d32b",
"/js/ui.js": "/js/ui.js?id=2cf17b86ea451828fd09",
"/css/ui.css": "/css/ui.css?id=5673703005b2ac3d0889"
}

103
packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
View File

@ -1,54 +1,73 @@
<template>
<span>
<slot>
<input type="text" :name="name" class="control" :value="value" data-input>
</slot>
<span
class="icon cross-icon"
v-if="! hideRemoveButton"
@click.prevent="clear">
</span>
</span>
<span>
<slot>
<input
type="text"
:name="name"
class="control"
:value="value"
data-input
/>
</slot>
<span
class="icon cross-icon"
v-if="!hideRemoveButton"
@click.prevent="clear"
>
</span>
</span>
</template>
<script>
import Flatpickr from 'flatpickr';
import Flatpickr from "flatpickr";
export default {
props: {
name: String,
props: {
name: String,
value: String,
value: String,
hideRemoveButton: [Number, String]
},
minDate: String,
data () {
return {
datepicker: null
}
},
maxDate: String,
mounted () {
var this_this = this;
hideRemoveButton: [Number, String],
},
var element = this.$el.getElementsByTagName('input')[0];
this.datepicker = new Flatpickr(
element, {
allowInput: true,
altFormat: 'Y-m-d',
dateFormat: 'Y-m-d',
weekNumbers: true,
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit('onChange', dateStr)
},
});
},
methods: {
clear() {
this.datepicker.clear();
}
data() {
return {
datepicker: null,
};
},
mounted() {
var this_this = this;
var options = {
allowInput: true,
altFormat: "Y-m-d",
dateFormat: "Y-m-d",
weekNumbers: true,
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit("onChange", dateStr);
},
};
if (this.minDate) {
options.minDate = this.minDate;
}
};
</script>
if (this.maxDate) {
options.maxDate = this.maxDate;
}
var element = this.$el.getElementsByTagName("input")[0];
this.datepicker = new Flatpickr(element, options);
},
methods: {
clear() {
this.datepicker.clear();
},
},
};
</script>

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

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=abc1d4626d36d488825d",
"/js/velocity.js": "/js/velocity.js?id=ec2fcac08b9c220c4ec6",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=f0ed6de052865cfc164e"
"/css/velocity.css": "/css/velocity.css?id=18ac64958c830a5e52c5"
}

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue
View File

@ -1,6 +1,6 @@
<template>
<form method="POST" @submit.prevent="addToCart">
<!-- for move to cart from wishlist -->
<a
:href="wishlistMoveRoute"

6
packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss vendored
View File

@ -1,3 +1,9 @@
/*
Added back again because in chrome this is not using and light house also saying not used.
But in mozilla all fonts are gone which creating problem.
*/
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap');
//velocity variables
$white-color: #FFFFFF;
$black-color: #111111;

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2480,6 +2480,11 @@
.action {
position: relative;
.btn-add-to-cart {
width: 125px !important;
white-space: pre-wrap;
}
.close-btn {
right: 0;
top: 6px;

132
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -1,4 +1,3 @@
.vc-small-screen {
display: none !important;
}
@ -31,72 +30,6 @@
}
}
@media only screen and (max-width: 992px) {
}
@media only screen and (max-width: 768px) {
.modal-container {
left: 10%;
max-width: 80%;
margin-left: 0px;
}
.footer .footer-list-container {
padding-left: 0px !important;
}
.footer .currency {
display: block !important;
}
.table {
width: 90%;
margin-bottom: 1rem;
margin-top: 68px;
color: #212529;
overflow-x: auto;
}
.per-page {
position: absolute;
margin-top: 66px;
margin-right: -1px;
margin-left: 17px;
width: 151px;
}
.filter-left {
position: relative;
margin-right: -6px!important;
}
.dropdown-filters {
margin-left: 15px;
}
button.btn.btn-sm.btn-primary.apply-filter {
margin-top: 10px;
margin-left: -158px;
}
.lg-card-container.list-card .product-image {
max-height: 85px;
}
.quick-view-btn-container {
left: -26px;
width: 109px;
}
.quick-view-btn-container span {
left: 24%;
top: -24px;
font-size: 13px;
}
}
@media only screen and (max-width: 992px) {
$header-height: 50px;
@ -1025,3 +958,68 @@
display: inline-block;
}
}
@media only screen and (max-width: 768px) {
.modal-container {
left: 10%;
max-width: 80%;
margin-left: 0px;
}
.footer .footer-list-container {
padding-left: 0px !important;
}
.footer .currency {
display: block !important;
}
.table {
width: 90%;
margin-bottom: 1rem;
margin-top: 68px;
color: #212529;
overflow-x: auto;
}
.per-page {
position: absolute;
margin-top: 66px;
margin-right: -1px;
margin-left: 17px;
width: 151px;
}
.filter-left {
position: relative;
margin-right: -6px!important;
}
.dropdown-filters {
margin-left: 15px;
}
button.btn.btn-sm.btn-primary.apply-filter {
margin-top: 10px;
margin-left: -158px;
}
.lg-card-container.list-card .product-image {
max-height: 85px;
}
.quick-view-btn-container {
left: -26px;
width: 109px;
}
.quick-view-btn-container span {
left: 24%;
top: -24px;
font-size: 13px;
}
.quick-view-in-list {
display: none;
}
}

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -509,7 +509,6 @@
.add-to-cart-btn {
float: left;
max-width: 150px;
display: inline-block;
}
}