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

Merge pull request #6136 from jitendra-webkul/master 

Issue #4959 fixed
This commit is contained in:
Jitendra Singh 2022-03-25 19:02:32 +05:30 committed by GitHub
parent 8386b04def ef20fa1393
commit 225eedcd35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,17 +136,18 @@ class Cart
/**
* Get cart item by product.
*
* @param array $data
* @param array|null $data
* @param array $parentData
* @return \Webkul\Checkout\Contracts\CartItem|void
*/
public function getItemByProduct($data)
public function getItemByProduct($data, $parentData = null)
{
$items = $this->getCart()->all_items;
foreach ($items as $item) {
if ($item->product->getTypeInstance()->compareOptions($item->additional, $data['additional'])) {
if (isset($data['additional']['parent_id'])) {
if ($item->parent->product->getTypeInstance()->compareOptions($item->parent->additional, request()->all())) {
if ($item->parent->product->getTypeInstance()->compareOptions($item->parent->additional, $parentData ?: request()->all())) {
return $item;
}
} else {
@ -194,7 +195,7 @@ class Cart
$parentCartItem = null;
foreach ($cartProducts as $cartProduct) {
$cartItem = $this->getItemByProduct($cartProduct);
$cartItem = $this->getItemByProduct($cartProduct, $data);
if (isset($cartProduct['parent_id'])) {
$cartProduct['parent_id'] = $parentCartItem->id;