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

Merge pull request #4427 from devansh-webkul/issue-4425 

Fixed saved billing address details which are not showing on onepage checkout #4425
This commit is contained in:
Jitendra Singh 2021-01-05 11:19:28 +05:30 committed by GitHub
parent 050ea2ceee 9312bf4809
commit 5020736bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/repository.php
View File

@ -169,7 +169,8 @@ return [
*/
'acceptedConditions' => [
'=',
'like'
'like',
'in'
],
/*
|--------------------------------------------------------------------------

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/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=d5391a65146f1d0f4ca1",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=69e21a90a84bca6263e5"
"/css/velocity.css": "/css/velocity.css?id=3e302547ab5f13f8c85a"
}

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

@ -1448,8 +1448,6 @@
}
.address-container {
display: none;
.address-holder {
margin-top: 15px;
@ -1512,6 +1510,11 @@
border: 1px solid $border-common;
}
input[type=checkbox] {
position: relative;
top: 3px;
}
input:active,
input:focus,
select:focus,

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

@ -36,7 +36,7 @@
<div class="col-10">
<h5 class="card-title fw6">
@{{ allAddress.first_name }} @{{ allAddress.last_name }},
@{{ addresses.first_name }} @{{ addresses.last_name }},
</h5>
<ul type="none">
@ -81,14 +81,13 @@
<div class="mt10 mb10" v-if="address.billing.address_id">
<span class="checkbox fs16 display-inbl">
<input
class="ml0"
type="checkbox"
id="billing[use_for_shipping]"
name="billing[use_for_shipping]"
@change="validateFormAfterAction"
v-model="address.billing.use_for_shipping" />
<span class="ml-5">
<span>
{{ __('shop::app.checkout.onepage.use_for_shipping') }}
</span>
</span>
@ -166,7 +165,7 @@
<div class="col-10">
<h5 class="card-title fw6">
@{{ allAddress.first_name }} @{{ allAddress.last_name }},
@{{ addresses.first_name }} @{{ addresses.last_name }},
</h5>
<ul type="none">

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

@ -238,14 +238,13 @@
<div class="mb10">
<span class="checkbox fs16 display-inbl no-margin">
<input
class="ml0"
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">
<span>
{{ __('shop::app.checkout.onepage.save_as_address') }}
</span>
</span>
@ -510,14 +509,13 @@
<div class="mb10">
<span class="checkbox fs16 display-inbl no-margin">
<input
class="ml0"
type="checkbox"
id="billing[use_for_shipping]"
name="billing[use_for_shipping]"
v-model="address.billing.use_for_shipping"
@change="setTimeout(() => validateForm('address-form'), 0)" />
<span class="ml-5">
<span>
{{ __('shop::app.checkout.onepage.use_for_shipping') }}
</span>
</span>
@ -528,14 +526,13 @@
<div class="mb10">
<span class="checkbox fs16 display-inbl no-margin">
<input
class="ml0"
type="checkbox"
id="billing[save_as_address]"
name="billing[save_as_address]"
@change="validateForm('address-form')"
v-model="address.billing.save_as_address"/>
<span class="ml-5">
<span>
{{ __('shop::app.checkout.onepage.save_as_address') }}
</span>
</span>