MAGETWO-64547: Bundle Products - The options you selected are not available.

Static fixes

Author: valdislav

app/code/Magento/Bundle/Model/LinkManagement.php

@@ -168,6 +168,7 @@ public function saveChild(
      * @param string $linkedProductId
      * @param string $parentProductId
      * @return \Magento\Bundle\Model\Selection
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function mapProductLinkToSelectionModel(
         \Magento\Bundle\Model\Selection $selectionModel,
@@ -177,10 +178,10 @@ protected function mapProductLinkToSelectionModel(
     ) {
         $selectionModel->setProductId($linkedProductId);
         $selectionModel->setParentProductId($parentProductId);
-        if (($productLink->getSelectionId() !== null)) {
+        if ($productLink->getSelectionId() !== null) {
             $selectionModel->setSelectionId($productLink->getSelectionId());
         }
-        if (($productLink->getOptionId() !== null)) {
+        if ($productLink->getOptionId() !== null) {
             $selectionModel->setOptionId($productLink->getOptionId());
         }
         if ($productLink->getPosition() !== null) {

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -65,39 +65,32 @@ public function execute($entity, $arguments = [])
         }
 
         if (!$entity->getCopyFromView()) {
+            $updatedOptions = [];
             $oldOptions = $this->optionRepository->getList($entity->getSku());
 
             $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
             $productId = $entity->getData($metadata->getLinkField());
 
             foreach ($options as $option) {
-                if ($option->getOptionId()) {
-                    $updatedOptions[$option->getOptionId()][$productId] = true;
-                }
+                $updatedOptions[$option->getOptionId()][$productId] = (bool)$option->getOptionId();
             }
 
             foreach ($oldOptions as $option) {
                 if (!isset($updatedOptions[$option->getOptionId()][$productId])) {
                     $option->setParentId($productId);
-
                     $this->removeOptionLinks($entity->getSku(), $option);
-
                     $this->optionRepository->delete($option);
                 }
             }
+        }
 
-            foreach ($options as $option) {
-                $this->optionRepository->save($entity, $option);
-            }
-        } else {
-            //save only labels and not selections + product links
-            foreach ($options as $option) {
-                $this->optionRepository->save($entity, $option);
-            }
-            $entity->setCopyFromView(false);
+        foreach ($options as $option) {
+            $this->optionRepository->save($entity, $option);
         }
 
+        $entity->setCopyFromView(false);
+
         return $entity;
     }