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

Merge pull request #2817 from shubhwebkul/master 

misc. updates
This commit is contained in:
Jitendra Singh 2020-04-02 20:27:59 +05:30 committed by GitHub
parent e8cc97f856 ff20147e23
commit 258e0b3fbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,15 +289,17 @@
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 (this.allAddress.length > 0) {
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];
}
});
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) {

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

37
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/modal.vue
View File

@ -1,16 +1,18 @@
<template>
<div class="modal-container" v-if="isModalOpen">
<div class="modal-header">
<slot name="header">
Default header
</slot>
<i class="icon remove-icon" @click="closeModal"></i>
</div>
<div class="modal-parent scrollable" v-if="isModalOpen">
<div class="modal-container">
<div class="modal-header">
<slot name="header">
Default header
</slot>
<i class="icon remove-icon" @click="closeModal"></i>
</div>
<div class="modal-body">
<slot name="body">
Default body
</slot>
<div class="modal-body">
<slot name="body">
Default body
</slot>
</div>
</div>
</div>
</template>
@ -23,12 +25,8 @@
return {}
},
created () {
this.closeModal();
},
computed: {
isModalOpen () {
isModalOpen: function () {
this.addClassToBody();
return this.isOpen;
@ -36,12 +34,13 @@
},
methods: {
closeModal () {
this.$root.$set(this.$root.modalIds, this.id, true);
closeModal: function () {
this.$root.$set(this.$root.modalIds, this.id, false);
},
addClassToBody () {
addClassToBody: function () {
var body = document.querySelector("body");
if(this.isOpen) {
body.classList.add("modal-open");
} else {

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

@ -249,9 +249,12 @@ body {
> div:last-child {
height: 32px;
}
* {
// height: 100%;
> div {
.default {
padding: 5px;
font-size: 14px;
}
}
@ -281,7 +284,6 @@ body {
}
}
.dropdown-menu {
border-top: 3px solid $border-primary;
border-radius: 0px;

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

@ -174,23 +174,25 @@
}
.modal-container {
background: #ffffff;
left: 50%;
top: 100px;
z-index: 11;
width: 600px;
max-width: 80%;
left: 50%;
margin-left: -300px;
max-height: 80%;
position: fixed;
z-index: 11;
font-size: 14px;
overflow-y: auto;
margin-left: -300px;
background: #ffffff;
animation: jelly 0.5s ease-in-out;
animation: fade-in-white 0.3s ease-in-out;
@include border-radius(5px);
@include box-shadow(
0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2)
);
animation: fade-in-white 0.3s ease-in-out;
animation: jelly 0.5s ease-in-out;
@include border-radius(5px);
overflow-y: auto;
max-height: 80%;
.modal-header {
padding: 20px;
@ -205,6 +207,15 @@
.icon {
float: right;
cursor: pointer;
&.remove-icon {
width: 24px;
right: 20px;
height: 24px;
margin-right: 0;
position: absolute;
background-image: url(/themes/velocity/assets/images/Icon-remove.svg);
}
}
}

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

@ -337,15 +337,17 @@
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 (this.allAddress.length > 0) {
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];
}
});
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 => {

17
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
View File

@ -5,25 +5,10 @@
@endsection
@push('css')
<style type="text/css">
<style>
.account-head {
height: 50px;
}
.remove-icon {
right: 15px;
font-size: 22px;
height: 24px;
text-align: center;
position: absolute;
border-radius: 50%;
color: #333;
width: 24px;
padding: 0px;
top: 10px;
}
.remove-icon:before {
content: "x";
}
</style>
@endpush