fixed duplicate option assignment

FATCHIP-GmbH · Mar 1, 2019 · a01cbb8 · a01cbb8
1 parent c3955b6
commit a01cbb8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Services/Helper/AbstractHelper.php b/Services/Helper/AbstractHelper.php
@@ -257,6 +257,11 @@ public function createMediaImage($url, $albumName)
 
         $path_info = pathinfo($url);
         $filename = $this->filterNotAllowedCharactersFromURL($path_info['filename']);
+
+        if(!array_key_exists('extension', $path_info)) {
+            return null;
+        }
+
         $path = 'media/image/' . $filename . '.' . $path_info['extension'];
 
         if ( ! $contents = $this->grab_image($url)) {

diff --git a/Services/Helper/ShopwareArticleHelper.php b/Services/Helper/ShopwareArticleHelper.php
@@ -293,7 +293,17 @@ public function assignVariants(Article &$article, Detail $detail, array $variant
                 $this->addSetOptions($set, $options);
             }
 
-            $detail->setConfiguratorOptions($options);
+            //TODO: check if already added
+            $definedOptions = $detail->getConfiguratorOptions();
+
+            foreach ($options as $addOption) {
+                if(!$definedOptions->contains($addOption)) {
+                    $definedOptions->add($addOption);
+                }
+            }
+
+
+            //$detail->setConfiguratorOptions($options);
         }
     }
 
@@ -310,9 +320,11 @@ public function getAssignableConfiguratorOptions(Article &$article, array $varia
 
         $options = [];
 
+        $this->configuratorOptions = array_change_key_case($this->configuratorOptions, CASE_LOWER);
+
         foreach($variants as $variant) {
-            if(array_key_exists($variant["value"], $this->configuratorOptions)) {
-                $option = $this->configuratorOptions[$variant["value"]];
+            if(array_key_exists(strtolower($variant["value"]), $this->configuratorOptions)) {
+                $option = $this->configuratorOptions[strtolower($variant["value"])];
             }
             else {
                 $option = new Option();
@@ -327,6 +339,7 @@ public function getAssignableConfiguratorOptions(Article &$article, array $varia
                 $this->entityManager->flush($option);
 
                 $this->getConfiguratorOptions();
+                $this->configuratorOptions = array_change_key_case($this->configuratorOptions, CASE_LOWER);
             }
 
             array_push($options, $option);

diff --git a/Services/ReadData/External/ReadProductsService.php b/Services/ReadData/External/ReadProductsService.php
@@ -82,7 +82,8 @@ public function transform(array $products)
 
             $variants = [];
 
-            if (!array_key_exists('Attributes', $product) && array_key_exists('BaseProducts', $product) && $product["BaseProductFlag"] != "1") {
+            if (!array_key_exists('Attributes', $product) && array_key_exists('BaseProducts', $product) && $product["BaseProductFlag"] != "1"
+            && array_key_exists('BaseProductID', $product['BaseProducts']['BaseProduct'])) {
                 $valueArticle->setMainArticleId($product['BaseProducts']['BaseProduct']['BaseProductID']);
 
                 $variants[] = array(