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

#2274, #2275 resolved

This commit is contained in:
shivam kumar 2020-02-06 11:47:02 +05:30
parent 24fcdd006b
commit 8014305c75
18 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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=f6500424c8a08e971ec0",
"/css/velocity.css": "/css/velocity.css?id=20ca46e702d49266f2fd",
"/js/velocity.js": "/js/velocity.js?id=26b9c7e1abf32569c51e",
"/css/velocity.css": "/css/velocity.css?id=74590bad8a52cc46c068",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

1
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
View File

@ -1,5 +1,6 @@
<template>
<carousel
:id="id"
:navigationEnabled="true"
:paginationEnabled="true"
:perPage="parseInt(slidesPerPage)"

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

@ -50,7 +50,7 @@ $(document).ready(function () {
Vue.mixin({
data: function () {
return {
'baseUrl': document.querySelector("script[src$='velocity.js']").getAttribute('baseurl'),
'baseUrl': document.querySelector("script[src$='velocity.js']").getAttribute('baseUrl'),
'navContainer': false,
'responsiveSidebarTemplate': '',
'responsiveSidebarKey': Math.random(),

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

@ -310,6 +310,7 @@ body {
.no-padding {
padding: 0px !important;
cursor: default;
}
.btn-normal {
@ -410,6 +411,8 @@ header {
right: 8px;
z-index: 10;
font-size: 18px;
background-color: $white-color;
height: 20px;
}
}

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

@ -981,6 +981,10 @@
margin-left: 4px;
position: relative;
}
&:hover {
cursor: pointer;
}
}
}
}
@ -1867,14 +1871,12 @@
padding: 40px 15px !important;
.hero-image {
height: 100%;
max-width: 500px;
max-height: 400px;
display: inline-block;
img {
width: 100%;
height: 100%;
margin-bottom: 30px;
}
}
}
@ -1952,6 +1954,8 @@
}
.slides-container {
position: relative;
.VueCarousel-pagination {
bottom: 10px;
position: absolute;
@ -1976,6 +1980,16 @@
padding-top: 0;
}
.VueCarousel-slide {
position: relative;
.show-content {
top: 50%;
left: 50%;
position: absolute;
}
}
.VueCarousel-slide:not(:nth-of-type(1)) {
img {
display: none;

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -188,7 +188,7 @@
&.left {
left: 0px;
line-height: 10em;
line-height: 13em;
}
&.right {
@ -235,7 +235,7 @@
height: 100%;
position: relative;
.left {
> .left {
top: 60px;
padding: 0px;
position: sticky;

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

@ -789,6 +789,7 @@ button[disabled] {
right: 10px;
font-size: 16px;
position: absolute;
pointer-events: none;
}
}
}

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php
View File

@ -83,11 +83,11 @@
</div>
<div class="modal-footer">
<a class="col-6 text-left fs16 link-color remove-decoration" href="{{ route('shop.checkout.cart.index') }}">
<a class="col-4 text-left fs16 link-color remove-decoration" href="{{ route('shop.checkout.cart.index') }}">
{{ __('velocity::app.checkout.cart.view-cart') }}
</a>
<div class="col-6 text-right no-padding">
<div class="col-8 text-right no-padding">
<a href="{{ route('shop.checkout.onepage.index') }}">
<button
type="button"

6
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
View File

@ -203,9 +203,12 @@
if (scope == 'address-form') {
this.saveAddress();
document.body.style.cursor = 'default';
} else if (scope == 'shipping-form') {
document.body.style.cursor = 'wait';
this.saveShipping();
} else if (scope == 'payment-form') {
document.body.style.cursor = 'wait';
this.savePayment();
}
}
@ -225,6 +228,9 @@
this_this.$http.post("{{ route('customer.checkout.exist') }}", {email: this_this.address.billing.email})
.then(function(response) {
this_this.is_customer_exist = response.data ? 1 : 0;
if (response.data)
document.body.style.cursor = 'default';
})
.catch(function (error) {})

24
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-checkout.blade.php Normal file
View File

@ -0,0 +1,24 @@
<div class="col-12 form-field" id="password" v-if="is_customer_exist">
<label for="password">{{ __('shop::app.checkout.onepage.password') }}</label>
<input
id="password"
type="password"
class="control"
name="password"
v-model="address.billing.password" />
<div class="forgot-password-link">
<a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
<div class="mt-10">
@if (Cookie::has('enable-resend') && Cookie::get('enable-resend') == true)
<a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
@endif
</div>
</div>
<button type='button' id="" class="theme-btn" @click="loginCustomer">
{{ __('shop::app.customer.login-form.button_title') }}
</button>
</div>

2
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/forgot-password.blade.php
View File

@ -33,7 +33,7 @@
<form
method="post"
action="{{ route('customer.register.create') }}"
action="{{ route('customer.forgot-password.store') }}"
@submit.prevent="onSubmit">
{{ csrf_field() }}

5
packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
View File

@ -26,6 +26,11 @@
<img
class="col-12 no-padding banner-icon"
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}" />
<div class="show-content">
<div class="show-content" v-html="'{{ $slider['content'] }}'">
</div>
</div>
</a>
</slide>

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

@ -32,7 +32,7 @@
<script
type="text/javascript"
baseUrl='{{ url()->to('/') }}'
baseUrl="{{ url()->to('/') }}"
src="{{ asset('themes/velocity/assets/js/velocity.js') }}">
</script>
@ -131,8 +131,6 @@
<script type="text/javascript">
(() => {
var baseURL = '{{ url()->to('/') }}';
var showAlert = (messageType, messageLabel, message) => {
if (messageType && message !== '') {
let html = `<div class="alert ${messageType} alert-dismissible" id="alert">

14
packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
View File

@ -56,16 +56,16 @@
@endif
</div>
{{-- <div class="col-6">
<div class="hero-image mb-35">
<div class="col-12">
<div class="hero-image">
@if (!is_null($category->image))
<img class="logo" src="{{ $category->image_url }}" />
@endif
</div>
</div> --}}
</div>
</div>
<div class="filters-container" v-if="isMobile()">
<div class="filters-container">
@include ('shop::products.list.toolbar')
</div>
@ -75,12 +75,6 @@
style="width: 100%"
@endif>
<div class="hero-image mb-35">
@if (!is_null($category->image))
{{-- <img class="logo" src="{{ $category->image_url }}" /> --}}
@endif
</div>
@if ($isDisplayMode)
@if ($products->count())
@if ($toolbarHelper->getCurrentMode() == 'grid')

1
packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
View File

@ -59,7 +59,6 @@
class="bg-image"
style="background-image: url( {{ $thumb['small_image_url'] }} )">
</div>
</li>
</slide>
@endforeach

6
packages/Webkul/Velocity/webpack.mix.js vendored
View File

@ -1,10 +1,10 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = "../../../public/themes/velocity/assets";
if (mix.inProduction()) {
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/themes/velocity/assets";
publicPath = 'publishable/assets';
}
mix.setPublicPath(publicPath).mergeManifest();