Merge pull request #10 from azngeek/main

Additional Check, if Line-Item is set
Shape-and-Shift · Feb 10, 2023 · 63e5d5d · 63e5d5d
2 parents e34f74f + d7b2acb
commit 63e5d5d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,7 @@
+# 1.1.1 - Bugfix
+
+- [Issue #9](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/9)] Positionen ohne valide Line-Items werden übersprungen
+
 # 1.1.0 - Erweiterung
 - [Issue #1](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/1) Zeige auch Varianten, die nicht auf Lager sind
 - [Issue #2](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/2) Ausblenden von geteilten Varianten

diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md
@@ -1,3 +1,7 @@
+# 1.1.1 - Bugfix
+
+- [Issue #9](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/9)] Carts-items without valid line items will be skipped
+
 # 1.1.0 - Enhancement
 - [Issue #1](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/1) Show also variants which are out of stock
 - [Issue #2](https://github.com/Shape-and-Shift/shopware-variant-switch/issues/2) Hide split variants

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description":"Show a variant switch within the listing and cart",
     "type":"shopware-platform-plugin",
     "license":"MIT",
-    "version":"1.1.0",
+    "version":"1.1.1",
     "keywords":[
         "variant",
         "shopware"

diff --git a/src/Subscriber/CartPageLoadedSubscriber.php b/src/Subscriber/CartPageLoadedSubscriber.php
@@ -121,9 +121,11 @@ private function addLineItemPropertyGroups(LineItemCollection $lineItems, SalesC
             if ($product->getExtension('groups') !== null) {
                 $lineItem = $lineItems->get($product->getId());
 
-                $lineItem->addExtension('groups', $product->getExtension('groups'));
-                $lineItem->setPayloadValue('parentId', $product->getParentId());
-                $lineItem->setPayloadValue('optionIds', $product->getOptionIds());
+                if (null !== $lineItem) {
+                    $lineItem->addExtension('groups', $product->getExtension('groups'));
+                    $lineItem->setPayloadValue('parentId', $product->getParentId());
+                    $lineItem->setPayloadValue('optionIds', $product->getOptionIds());
+                }
             }
         }
     }