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

Merge pull request #2442 from shubhwebkul/velocity-updated 

checkout page updates
This commit is contained in:
Jitendra Singh 2020-02-12 13:20:42 +05:30 committed by GitHub
parent fcfd4e1d64 3d3fa3408c
commit 8550c0424f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 88 additions and 32 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/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=50ea01bd19c367308b08",
"/css/velocity.css": "/css/velocity.css?id=083f463830ae7db04ed7",
"/css/velocity.css": "/css/velocity.css?id=aa8d76055810af176fc3",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

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

@ -263,6 +263,8 @@ body {
.locale-switcher {
padding-left: 5px;
position: relative;
padding-right: 15px;
}
.dropdown {
@ -270,7 +272,7 @@ body {
.select-icon-container {
.select-icon {
right: -8px;
right: 0;
}
}
}

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

@ -677,6 +677,10 @@
.card-current-price {
font-size: 18px;
}
> a {
line-height: 20px;
}
}
}
}

4
packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
View File

@ -102,7 +102,7 @@
<script type="text/x-template" id="content-type-template">
<div>
<div class="control-group" :class="[errors.has('custom_title') ? 'has-error' : '']">
{{-- <div class="control-group" :class="[errors.has('custom_title') ? 'has-error' : '']">
<label for="custom_title">
{{ __('velocity::app.admin.contents.content.custom-title') }}
</label>
@ -118,7 +118,7 @@
<input type="text" v-validate="'max:100'" class="control" id="custom_heading" name="custom_heading" value="" data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-heading') }}&quot;"/>
<span class="control-error" v-if="errors.has('custom_heading')">@{{ errors.first('custom_heading') }}</span>
</div>
</div> --}}
<div class="control-group" :class="[errors.has('content_type') ? 'has-error' : '']">
<label for="content_type" class="required">{{ __('velocity::app.admin.contents.content.content-type') }}</label>

4
packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
View File

@ -122,7 +122,7 @@
<script type="text/x-template" id="content-type-template">
<div>
<div :class="`control-group ${errors.has('{{$locale}}[custom_title]') ? 'has-error' : ''}`">
{{-- <div :class="`control-group ${errors.has('{{$locale}}[custom_title]') ? 'has-error' : ''}`">
<label for="custom_title">
{{ __('velocity::app.admin.contents.content.custom-title') }}
<span class="locale">[{{ $locale }}]</span>
@ -163,7 +163,7 @@
v-if="errors.has('{{$locale}}[custom_heading]')">
@{{ errors.first('{!!$locale!!}[custom_heading]') }}
</span>
</div>
</div> --}}
<div :class="`control-group ${errors.has('content_type') ? 'has-error' : ''}`">
<label

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

@ -203,15 +203,23 @@
if (scope == 'address-form') {
let form = $(document).find('form[data-vv-scope=address-form]');
// validate that if all the field contains some value
if (form) {
form.find(':input').each((index, element) => {
let value = $(element).val();
if (value == "") {
if (value == "" && element.id != 'billing[company_name]' && element.id != 'shipping[company_name]') {
isManualValidationFail = true;
}
});
}
// validate that if customer wants to use different shipping address
if (this.address.billing.use_for_shipping) {
if (this.address.shipping.address_id) {
isManualValidationFail = true;
}
}
}
if (!isManualValidationFail) {
@ -317,6 +325,7 @@
shippingMethods = response.data.shippingMethods;
this.validateForm('shipping-form');
this.getOrderSummary();
})
.catch(error => {
@ -347,6 +356,7 @@
this.savePayment();
}
this.validateForm('payment-form');
this.getOrderSummary();
})
.catch(error => {
@ -427,17 +437,21 @@
newBillingAddress: function() {
this.new_billing_address = true;
this.isPlaceOrderEnabled = false;
},
newShippingAddress: function() {
this.new_shipping_address = true;
this.isPlaceOrderEnabled = false;
},
backToSavedBillingAddress: function() {
this.isPlaceOrderEnabled = true;
this.new_billing_address = false;
},
backToSavedShippingAddress: function() {
this.isPlaceOrderEnabled = true;
this.new_shipping_address = false;
},
}

50
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php
View File

@ -1,6 +1,9 @@
<form data-vv-scope="address-form" class="custom-form">
<div class="form-container" v-if="!this.new_billing_address">
<accordian :title="'{{ __('shop::app.checkout.onepage.billing-address') }}'" :active="true">
<accordian
:active="true"
:title="'{{ __('shop::app.checkout.onepage.billing-address') }}'">
<div class="form-header mb-30" slot="header">
<h3 class="fw6 display-inbl">
{{ __('shop::app.checkout.onepage.billing-address') }}
@ -57,7 +60,7 @@
<i class="material-icons">
add_circle_outline
</i>
<span>Add new Address</span>
<span>{{ __('shop::app.checkout.onepage.new-address') }}</span>
</div>
</div>
</div>
@ -132,21 +135,20 @@
class="form-container"
v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
<accordian :title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'" :active="true">
<accordian
:active="true"
:title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'">
<div class="form-header mb-30" slot="header">
<h3 class="fw6 display-inbl">
<h3 class="fw6 display-inbl mb-0">
{{ __('shop::app.checkout.onepage.shipping-address') }}
</h3>
<a class="theme-btn light pull-right text-up-14" @click="newShippingAddress()">
{{ __('shop::app.checkout.onepage.new-address') }}
</a>
<i class="rango-arrow"></i>
</div>
<div class="address-container row" slot="body">
<div class="address-container row mb30" slot="body">
<div
class="col address-holder"
class="col-lg-6 address-holder"
v-for='(addresses, index) in this.allAddress'>
<div class="card">
@ -157,9 +159,9 @@
type="radio"
v-validate="'required'"
:value="addresses.id"
id="shipping[address_id]"
name="shipping[address_id]"
v-model="address.shipping.address_id"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;" />
<span class="checkmark"></span>
@ -184,6 +186,19 @@
</div>
</div>
<div class="col-lg-6 address-holder">
<div class="card">
<div class="card-body add-address-button">
<div class="cursor-pointer" @click="newShippingAddress()">
<i class="material-icons">
add_circle_outline
</i>
<span>{{ __('shop::app.checkout.onepage.new-address') }}</span>
</div>
</div>
</div>
</div>
<div id="message"></div>
<div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
@ -199,12 +214,18 @@
class="form-container"
v-if="!address.billing.use_for_shipping && this.new_shipping_address">
<accordian :title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'" :active="true">
<accordian
:active="true"
:title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'">
<div class="form-header" slot="header">
<h3 class="fw6 display-inbl">
<h3 class="fw6 display-inbl mb-0">
{{ __('shop::app.checkout.onepage.shipping-address') }}
</h3>
<i class="rango-arrow"></i>
</div>
<div class="col-12 no-padding" slot="body">
@auth('customer')
@if(count(auth('customer')->user()->addresses))
<a
@ -215,10 +236,7 @@
</a>
@endif
@endauth
<i class="rango-arrow"></i>
</div>
<div class="col-12 no-padding" slot="body">
@include('shop::checkout.onepage.customer-new-form', [
'shipping' => true
])

32
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
View File

@ -3,7 +3,7 @@
@endphp
@if (isset($shipping) && $shipping)
<div :class="`col-12 form-field ${errors.has('address-form.shipping[first_name]') ? 'has-error' : ''}`">
<div :class="`col-12 form-field mb30 ${errors.has('address-form.shipping[first_name]') ? 'has-error' : ''}`">
<label for="shipping[first_name]" class="mandatory">
{{ __('shop::app.checkout.onepage.first-name') }}
</label>
@ -15,6 +15,7 @@
id="shipping[first_name]"
name="shipping[first_name]"
v-model="address.shipping.first_name"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
@ -34,6 +35,7 @@
id="shipping[last_name]"
name="shipping[last_name]"
v-model="address.shipping.last_name"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
@ -53,6 +55,7 @@
name="shipping[email]"
v-validate="'required|email'"
v-model="address.shipping.email"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[email]')">
@ -72,6 +75,7 @@
id="shipping_address_0"
name="shipping[address1][]"
v-model="address.shipping.address1[0]"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
@ -107,6 +111,7 @@
name="shipping[city]"
v-validate="'required'"
v-model="address.shipping.city"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[city]')">
@ -126,6 +131,7 @@
name="shipping[country]"
class="control styled-select"
v-model="address.shipping.country"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
<option value=""></option>
@ -134,7 +140,10 @@
<option value="{{ $country->code }}">{{ $country->name }}</option>
@endforeach
</select>
<i class="select-icon rango-arrow-down"></i>
<div class="select-icon-container">
<i class="select-icon rango-arrow-down"></i>
</div>
<span class="control-error" v-if="errors.has('address-form.shipping[country]')">
@{{ errors.first('address-form.shipping[country]') }}
@ -156,6 +165,7 @@
v-validate="'required'"
v-if="!haveStates('shipping')"
v-model="address.shipping.state"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
<select
@ -192,6 +202,7 @@
v-validate="'required'"
name="shipping[postcode]"
v-model="address.shipping.postcode"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
@ -211,6 +222,7 @@
name="shipping[phone]"
v-validate="'required'"
v-model="address.shipping.phone"
@change="validateForm('address-form')"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;" />
<span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
@ -226,6 +238,7 @@
type="checkbox"
id="shipping[save_as_address]"
name="shipping[save_as_address]"
@change="validateForm('address-form')"
v-model="address.shipping.save_as_address"/>
<span class="ml-5">
@ -299,7 +312,7 @@
@{{ errors.first('address-form.billing[last_name]') }}
</span>
</div>
<div :class="`col-12 form-field ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
<label for="billing[email]" class="mandatory">
{{ __('shop::app.checkout.onepage.email') }}
@ -398,7 +411,10 @@
<option value="{{ $country->code }}">{{ $country->name }}</option>
@endforeach
</select>
<i class="select-icon rango-arrow-down"></i>
<div class="select-icon-container">
<i class="select-icon rango-arrow-down"></i>
</div>
<span class="control-error" v-if="errors.has('address-form.billing[country]')">
@{{ errors.first('address-form.billing[country]') }}
@ -492,9 +508,9 @@
<input
class="ml0"
type="checkbox"
@change="validateForm('address-form')"
id="billing[use_for_shipping]"
name="billing[use_for_shipping]"
@change="validateForm('address-form')"
v-model="address.billing.use_for_shipping" />
<span class="ml-5">
@ -510,9 +526,11 @@
<input
class="ml0"
type="checkbox"
@change="validateForm('address-form')"
id="billing[save_as_address]"
name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
name="billing[save_as_address]"
@change="validateForm('address-form')"
v-model="address.billing.save_as_address"/>
<span class="ml-5">
{{ __('shop::app.checkout.onepage.save_as_address') }}
</span>