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

Merge pull request #2815 from shubhwebkul/patch-2 

misc. bug fixes
This commit is contained in:
Jitendra Singh 2020-04-01 18:39:13 +05:30 committed by GitHub
parent 256c6fd4b5 3f8741e671
commit f4249f25f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -289,6 +289,16 @@
this.disable_button = true;
let address = this.allAddress.forEach(address => {
if (address.id == this.address.billing.address_id) {
this.address.billing.address1 = [address.address1];
}
if (address.id == this.address.shipping.address_id) {
this.address.shipping.address1 = [address.address1];
}
});
this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
.then(function(response) {
this_this.disable_button = false;

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=d1e8a6d2c78f6d0657a7",
"/js/velocity.js": "/js/velocity.js?id=35c906902bbed040ee39",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=c93522195912f75d54dc"
"/css/velocity.css": "/css/velocity.css?id=65eba575daf9327bd20a"
}

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

@ -1274,18 +1274,15 @@
i {
color: $black-color;
}
i:hover::before {
// content: "\E93D";
}
}
.checkout-process {
padding: 40px 20px;
.col-7 {
> div {
width: 100%;
.col-lg-7 {
.coupon-container,
> div:not(:first-child) {
margin-top: 20px;
}
}

2
packages/Webkul/Velocity/src/Resources/lang/en/app.php
View File

@ -211,7 +211,7 @@ return [
'login' => 'Login',
'become-user' => 'Become User',
'user-registration' => 'User Registration',
'form-sginup-text' => 'If you are new to our store, we glab to have you as member.',
'form-sginup-text' => 'If you are new to our store, we glad to have you as member.',
],
'forget-password' => [
'login' => 'Login',

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

@ -337,6 +337,16 @@
saveAddress: function() {
this.disable_button = true;
let address = this.allAddress.forEach(address => {
if (address.id == this.address.billing.address_id) {
this.address.billing.address1 = [address.address1];
}
if (address.id == this.address.shipping.address_id) {
this.address.shipping.address1 = [address.address1];
}
});
this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
.then(response => {
this.disable_button = false;

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

@ -2,9 +2,11 @@
<div class="form-container">
<accordian :title="'{{ __('shop::app.checkout.payment-methods') }}'" :active="true">
<div class="form-header mb-30" slot="header">
<h3 class="fw6 display-inbl">
{{ __('shop::app.checkout.onepage.payment-methods') }}
</h3>
<i class="rango-arrow"></i>
</div>
@ -17,13 +19,13 @@
<div>
<label class="radio-container">
<input
v-validate="'required'"
type="radio"
id="{{ $payment['method'] }}"
name="payment[method]"
value="{{ $payment['method'] }}"
v-validate="'required'"
v-model="payment.method"
@change="methodSelected()"
id="{{ $payment['method'] }}"
value="{{ $payment['method'] }}"
data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;" />
<span class="checkmark"></span>