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

Merge pull request #1600 from jitendra-webkul/jitendra 

Issue #1592 fixed
This commit is contained in:
Jitendra Singh 2019-10-11 12:13:23 +05:30 committed by GitHub
parent db7013be3f bd804ddb4a
commit f8f7df4125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,8 @@ class Cart {
$cartProducts = $product->getTypeInstance()->prepareForCart($data);
if (is_string($cartProducts)) {
$this->collectTotals();
throw new \Exception($cartProducts);
} else {
$parentCartItem = null;
@ -168,7 +170,7 @@ class Cart {
$this->collectTotals();
return $cart;
return $this->getCart();
}
/**

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=e218d2c5c1c6fcfc67fc",
"/css/shop.css": "/css/shop.css?id=c9962e07f761468e22a1"
"/css/shop.css": "/css/shop.css?id=ef5b860d29792023de5b"
}