Merge pull request #11 from DanielRiezebos/bugfix/NoProductFix

Returns result if no product is found
avstudnitz · Jan 25, 2019 · 7f89f79 · 7f89f79
2 parents 4782b65 + 4ab34a0
commit 7f89f79
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Plugin/ProductEavDataProviderPlugin.php b/Plugin/ProductEavDataProviderPlugin.php
@@ -58,6 +58,10 @@ public function afterSetupAttributeMeta(Eav $subject, $result)
         $storeViews = $this->getStores();
         $product = $this->registry->registry('current_product');
 
+        if ($product->getId() === null) {
+            return $result;
+        }
+
         foreach ($storeViews as $storeView) {
             $productByStoreCode = $this->getProductInStoreView($product->getId(), $storeView->getId());
             $currentScopeValueForCode = $value = $productByStoreCode->getData($attributeCode);