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

resolved issue #2274, #2275

This commit is contained in:
shivam kumar 2020-02-06 12:42:15 +05:30
parent 7ed5967875
commit caa60cab60
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss
View File

@ -89,7 +89,7 @@ body {
}
}
.navbar-left {
.navbar-left {
position: fixed;
left: 0;
top: 60px;
@ -98,10 +98,10 @@ body {
border-right: 1px solid rgba(162, 162, 162, 0.2);
height: auto;
bottom: 0;
z-index: 2;
z-index: 2;
background-color: $white;
ul.menubar {
ul.menubar {
// padding-bottom: 60px;
li.menu-item {
padding: 10px 5px;
@ -309,4 +309,9 @@ body {
margin-top: 10px;
margin-bottom: 5px;
}
}
.container-shadow {
background-color: #fff;
box-shadow: 0 3px 6px 0 #bbb;
}

2
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -31,7 +31,7 @@
</div>
<div class="dropdown-list bottom-right">
<div class="dropdown-container">
<div class="dropdown-container container-shadow">
<label>Account</label>
<ul>
<li>

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) {})