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

Merge pull request #425 from jitendra-webkul/jitendra 

Jitendra
This commit is contained in:
JItendra Singh 2019-01-02 20:08:57 +05:30 committed by GitHub
parent 9eabca881f 98e2d0e52c
commit c9f2fd218b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Webkul/Checkout/src/Cart.php
View File

@ -551,13 +551,13 @@ class Cart {
$cart = $this->cart->find(session()->get('cart')->id);
}
if($cart != null) {
if($cart->items->count() == 0) {
$this->cart->delete($cart->id);
// if($cart != null) {
// if($cart->items->count() == 0) {
// $this->cart->delete($cart->id);
return false;
}
}
// return false;
// }
// }
return $cart && $cart->is_active ? $cart : null;
}

10
packages/Webkul/Ui/src/Resources/assets/images/Icon-star.svg Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 51.1 (57501) - http://www.bohemiancoding.com/sketch -->
<title>Icon-star</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<polygon id="Star" fill="#0031F0" points="11.0839804 15.75 6.08780574 18.3766445 7.04199019 12.8133222 3 8.87335555 8.58589307 8.06167777 11.0839804 3 13.5820677 8.06167777 19.1679608 8.87335555 15.1259706 12.8133222 16.080155 18.3766445"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 711 B

7
packages/Webkul/Ui/src/Resources/assets/sass/icons.scss vendored
View File

@ -298,3 +298,10 @@
width: 32px;
height: 32px;
}
.star-blue-icon {
width: 17px;
height: 17px;
background-image: url("../images/Icon-star.svg");
}