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

Resolved conflict

This commit is contained in:
jitendra 2019-06-29 17:57:10 +05:30
parent 3ef416b22e 842a0f77d4
commit f08a8036e6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

1
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -357,7 +357,6 @@ body {
.card-info {
width: 100%;
height: 100%;
display: inline-block;
&.center {

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

@ -1177,9 +1177,13 @@ class Cart {
$data['quantity'] = 1;
$data['product'] = $product->id;
\Event::fire('checkout.cart.add.after', $product->id);
$result = $this->add($product->id, $data);
if ($result) {
\Event::fire('checkout.cart.add.after', $result);
return 1;
} else {
return 0;