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

resolved issues

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-20 20:20:51 +05:30
parent 7ae2fee6e2
commit 4bf3e43bd8
8 changed files with 210 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,18 +812,65 @@
}
.nav-container {
position: absolute;
position: fixed;
width: 300px !important;
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;
margin-top: 15px;
}
.nav-container .wrapper .category-title {
display: table;
width: 100%;
padding-left: 10px;
margin: 13px 0px 13px 0px;
display: none;
}
.nav-container .wrapper .category-title > i {
display: table-cell;
vertical-align: middle;
font-size: 26px;
}
.nav-container .wrapper .category-title span {
display: table-cell;
vertical-align: top;
font-size: 20px;
}
.nav-container .wrapper .category-title span i {
float: left !important;
margin: 2px 2px 0px 0px !important;
}
.nav-container .wrapper .greeting {
display: table;
width: 100%;
padding-left: 10px;
margin: 13px 0px 13px 0px;
}
.nav-container .wrapper .greeting > i {
display: table-cell;
vertical-align: middle;
font-size: 26px;
}
.nav-container .wrapper .greeting span {
display: table-cell;
vertical-align: top;
font-size: 20px;
}
.nav-container .wrapper .greeting span i {
float: right !important;
margin: 2px 20px 0px 0px !important;
}
.nav-container .wrapper .offers {
@ -831,20 +878,49 @@
line-height: 20px;
font-weight: 530;
border-top: 1px solid rgba(0, 0, 0, 0.24);
border-bottom: 1px solid rgba(0, 0, 0, 0.24);
}
.nav-container .wrapper .offers li {
font-size: 16px;
margin: 13px 13px 0px 13px;
margin: 16px 0px 16px 15px;
}
.nav-container .wrapper .layered-category {
border-top: 1px solid rgba(0, 0, 0, 0.24);
font-weight: 501;
letter-spacing: 0.2px;
margin: 16px 0px 0px 0px;
}
.nav-container .wrapper .layered-category .category-icon {
width: 36px;
height: 20px;
padding-left: 12px;
display: inline-block;
}
.nav-container .wrapper .layered-category .category-icon img {
width: 100%;
height: 100%;
vertical-align: text-top;
}
.nav-container .wrapper .layered-category li {
margin: 18px 0px 18px 5px;
font-size: 17px;
}
.nav-container .wrapper .layered-category li a span {
color: black;
font-size: 14px;
margin: 13px 13px 0px 13px;
margin: 16px 0px 16px 15px !important;
font-weight: 400px;
}
.nav-container .wrapper .layered-category li i {
float: right;
font-size: 16px;
margin: 3px 20px 0px 0px;
}
.review-page-container {
@ -1995,7 +2071,7 @@
.main-container-wrapper .sticky-header {
top: 0px;
z-index: 1100;
z-index: 100;
position: -webkit-sticky;
position: sticky;
background: white;
@ -2449,14 +2525,11 @@
background-color: white;
}
.filter-attributes-item .checkbox input[type=checkbox] {
width: 14px;
height: 14px;
-webkit-transform: scale(0.9);
transform: scale(0.9);
.filter-attributes-item input[type=checkbox] + span {
margin-left: 10px !important;
}
.filter-attributes-item .filter-attributes-content {
.filter-attributes-content {
display: none;
margin-left: 7px;
}
@ -4319,6 +4392,51 @@ button[disabled] {
position: sticky;
}
.product-detail #product-form .form-container .right .swatch-container {
margin-top: 10px;
display: inline-block;
}
.product-detail #product-form .form-container .right .swatch-container .swatch {
display: inline-block;
margin-right: 5px;
min-width: 40px;
height: 40px;
}
.product-detail #product-form .form-container .right .swatch-container .swatch span {
min-width: 38px;
height: 38px;
float: left;
border: 1px solid #C7C7C7;
border-radius: 3px;
line-height: 36px;
text-align: center;
cursor: pointer;
padding: 0 10px;
}
.product-detail #product-form .form-container .right .swatch-container .swatch img {
width: 38px;
height: 38px;
border: 1px solid #C7C7C7;
border-radius: 3px;
cursor: pointer;
background: #f2f2f2;
}
.product-detail #product-form .form-container .right .swatch-container .swatch input:checked + span, .product-detail #product-form .form-container .right .swatch-container .swatch input:checked + img {
border: 1px solid #242424;
}
.product-detail #product-form .form-container .right .swatch-container .swatch input {
display: none;
}
.product-detail #product-form .form-container .right .swatch-container .no-options {
color: #fb3949;
}
.product-detail .accordian.active .accordian-header {
padding-bottom: 0px;
}
@ -12595,6 +12713,12 @@ button.close {
font-family: "Source Sans Pro", sans-serif;
}
input[type=checkbox] {
width: 24px;
height: 15px;
margin-right: 10px;
}
.form-control:focus {
-webkit-box-shadow: 0px 0px 8px 1px rgba(105, 221, 157, 0.25);
box-shadow: 0px 0px 8px 1px rgba(105, 221, 157, 0.25);

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

@ -1209,7 +1209,7 @@ $(document).ready(function () {
}
});
var app = new __WEBPACK_IMPORTED_MODULE_0_vue___default.a({
new __WEBPACK_IMPORTED_MODULE_0_vue___default.a({
el: "#app",
VueToast: __WEBPACK_IMPORTED_MODULE_2_vue_toast_notification___default.a,

2
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -120,7 +120,7 @@ $(document).ready(function () {
}
});
const app = new Vue({
new Vue({
el: "#app",
VueToast,

36
packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss vendored
View File

@ -157,42 +157,6 @@
}
}
// can work with layered navigation class
// .sub-category {
// border: 1px solid blue;
// border-top: 1px solid rgba(0,0,0,0.24);
// border-bottom: 1px solid rgba(0,0,0,0.24);
// font-weight: 520;
// display: none;
// letter-spacing: 0.2px;
// .category-icon {
// width: 25px;
// height: 20px;
// padding-right: 5px;
// display: inline-block;
// img {
// width: 100%;
// height: 100%;
// vertical-align: text-top;
// }
// }
// li {
// font-size: 14px;
// margin : 16px 0px 16px 15px;
// font-weight: 400px;
// i {
// float: right;
// font-size: 16px;
// margin: 3px 20px 0px 0px;
// }
// }
// }
.greeting {
display: table;
width: 100%;

50
packages/Webkul/Velocity/src/Resources/views/checkout/cart/coupon.blade.php
View File

@ -48,40 +48,34 @@
methods: {
applyCoupon: function() {
var self = this;
if (! self.coupon_code.length)
if (! this.coupon_code.length)
return;
self.error_message = null;
this.error_message = null;
this.disable_button = true;
self.disable_button = true;
let code = this.coupon_code;
axios.post(
'{{ route('shop.checkout.cart.coupon.apply') }}', {code}
).then(response => {
if (response.data.success) {
this.$emit('onApplyCoupon');
this.applied_coupon = this.coupon_code;
this.coupon_code = '';
this.$root.addFlashMessages();
axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code})
.then(function(response) {
if (response.data.success) {
self.$emit('onApplyCoupon');
this.redirectIfCartPage();
} else {
this.error_message = response.data.message;
}
self.applied_coupon = self.coupon_code;
this.disable_button = false;
}).catch(error => {
debugger
this.error_message = error.response.data.message;
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;
});
this.disable_button = false;
});
},
removeCoupon: function () {

56
packages/Webkul/Velocity/src/Resources/views/checkout/total/summary.blade.php
View File

@ -42,62 +42,6 @@
</span>
</div>
<div @if (! request()->is('checkout/cart')) v-if="parseInt(discount)" @endif>
@if (! request()->is('checkout/cart'))
@if (! $cart->coupon_code)
<div class="discount">
<div class="discount-group">
<form
class="custom-form"
method="post"
@submit.prevent="onSubmit">
<div
class="control-group mt-20"
:class="[errors.has('code') ? 'has-error' : '']">
<input
type="text"
class="control"
v-model="coupon_code"
name="code"
placeholder="Enter Coupon Code"
v-validate="'required'"
@change="changeCoupon" />
</div>
<div
class="control-error mb-10"
v-if="error_message != null">
* @{{ error_message }}
</div>
<button
class="theme-btn show full-width mt15"
:disabled="couponChanged">
{{ __('shop::app.checkout.onepage.apply-coupon') }}
</button>
</form>
</div>
</div>
@else
<div class="row">
<span class="col-8">{{ __('shop::app.checkout.total.coupon-applied') }}</span>
<span class="col-4 text-right">
<b>{{ $cart->coupon_code }}</b>
<span
class="icon cross-icon"
title="{{ __('shop::app.checkout.total.remove-coupon') }}"
v-on:click="removeCoupon">
</span>
</span>
</div>
@endif
@endif
</div>
<div class="row">
<a
href="{{ route('shop.checkout.onepage.index') }}"

75
packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
View File

@ -130,44 +130,53 @@
{!! view_render_event('bagisto.shop.layout.body.after') !!}
<script type="text/javascript">
let messageType = 'alert-success';
let messageLabel = 'dsfghjkl';
(() => {
var showAlert = (messageType, messageLabel, message) => {
debugger
if (messageType && message !== '') {
let html = `<div class="alert ${messageType} alert-dismissible" id="alert">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>${messageLabel} !</strong> ${message}.
</div>`;
@if ($message = session('success'))
messageType = 'alert-success';
messageLabel = 'Success';
@elseif ($message = session('warning'))
messageType = 'alert-warning';
messageLabel = 'Warning';
@elseif ($message = session('error'))
messageType = 'alert-danger';
messageLabel = 'Error';
@elseif ($message = session('info'))
messageType = 'alert-info';
messageLabel = 'Info';
@endif
document.body.innerHTML += html;
if (messageType && '{{ $message }}' !== '') {
let html = `<div class="alert ${messageType} alert-dismissible" id="alert">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>${messageLabel} !</strong> {{ $message }}.
</div>`;
window.setTimeout(() => {
$(".alert").fadeTo(500, 0).slideUp(500, () => {
$(this).remove();
});
}, 5000);
}
}
document.body.innerHTML += html;
let messageType = 'alert-success';
let messageLabel = 'dsfghjkl';
window.setTimeout(() => {
$(".alert").fadeTo(500, 0).slideUp(500, () => {
$(this).remove();
});
}, 5000);
}
window.serverErrors = [];
@if(isset($errors))
@if (count($errors))
window.serverErrors = @json($errors->getMessages());
@if ($message = session('success'))
messageType = 'alert-success';
messageLabel = 'Success';
@elseif ($message = session('warning'))
messageType = 'alert-warning';
messageLabel = 'Warning';
@elseif ($message = session('error'))
messageType = 'alert-danger';
messageLabel = 'Error';
@elseif ($message = session('info'))
messageType = 'alert-info';
messageLabel = 'Info';
@endif
@endif
if (messageType && '{{ $message }}' !== '') {
showAlert(messageType, messageLabel, '{{ $message }}');
}
window.serverErrors = [];
@if(isset($errors))
@if (count($errors))
window.serverErrors = @json($errors->getMessages());
@endif
@endif
})()
</script>
<script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>

9
packages/Webkul/Velocity/src/Resources/views/products/view.blade.php
View File

@ -134,16 +134,17 @@
</section>
<div class="store-meta-images col-3">
@isset($velocityMetaData['product_view_images'])
@if(
isset($velocityMetaData['product_view_images'])
&& $velocityMetaData['product_view_images']
)
@foreach (json_decode($velocityMetaData['product_view_images'], true) as $image)
@if ($image && $image !== '')
<img src="{{ url()->to('/') }}/storage/{{ $image }}" />
@endif
@endforeach
@endisset
@endif
</div>
</div>
{!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}