Merge pull request #6885 from magento-l3/MC-42420

MC-42420: Magento Admin can not add a Simple Product to the Order by SKU after deleting a Customizable Option (SKU with blank spaces)

Author: dhorytskyi

app/code/Magento/Catalog/Model/Product.php

@@ -883,8 +883,8 @@ public function beforeSave()
 
         $this->getTypeInstance()->beforeSave($this);
 
-        $hasOptions = $this->getData('has_options') === "1";
-        $hasRequiredOptions = $this->getData('required_options') === "1";
+        $hasOptions = $this->getData('has_options') === "1" && $this->isProductHasOptions();
+        $hasRequiredOptions = $this->getData('required_options') === "1" && $this->isProductHasOptions();
 
         /**
          * $this->_canAffectOptions - set by type instance only
@@ -934,6 +934,21 @@ public function beforeSave()
         parent::beforeSave();
     }
 
+    /**
+     * Check based on options data
+     *
+     * @return bool
+     */
+    private function isProductHasOptions() : bool
+    {
+        if ($this->getData('options') === null) {
+            $result = true;
+        } else {
+            $result = is_array($this->getData('options')) && count($this->getData('options')) > 0;
+        }
+        return $result;
+    }
+
     /**
      * Check/set if options can be affected when saving product
      *

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1113,6 +1113,21 @@ public function testSaveWithProvidedRequiredOptions()
         $this->assertTrue($this->model->getRequiredOptions());
     }
 
+    /**
+     * Test for save method with provided options settled via magic method
+     */
+    public function testSaveWithProvidedRequiredOptionsValue()
+    {
+        $this->model->setHasOptions("1");
+        $this->model->setRequiredOptions("1");
+        $this->model->setData("options", null);
+        $this->configureSaveTest();
+        $this->model->beforeSave();
+        $this->model->afterSave();
+        $this->assertTrue($this->model->getHasOptions());
+        $this->assertTrue($this->model->getRequiredOptions());
+    }
+
     public function testGetIsSalableSimple()
     {
         $typeInstanceMock =