magento
diff --git a/‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml‎
Lines changed: 2 additions & 6 deletions b/‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎app/code/Magento/Bundle/Model/LinkManagement.php‎
Lines changed: 58 additions & 8 deletions b/‎app/code/Magento/Bundle/Model/LinkManagement.php‎
Lines changed: 58 additions & 8 deletions
diff --git a/‎app/code/Magento/Bundle/Model/Option/SaveAction.php‎
Lines changed: 14 additions & 8 deletions b/‎app/code/Magento/Bundle/Model/Option/SaveAction.php‎
Lines changed: 14 additions & 8 deletions
diff --git a/‎app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php‎
Lines changed: 37 additions & 1 deletion b/‎app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php‎
Lines changed: 37 additions & 1 deletion
diff --git a/‎app/code/Magento/Bundle/Model/Selection.php‎
Lines changed: 20 additions & 1 deletion b/‎app/code/Magento/Bundle/Model/Selection.php‎
Lines changed: 20 additions & 1 deletion
diff --git a/‎app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml‎
Lines changed: 9 additions & 0 deletions b/‎app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml‎
Lines changed: 1 addition & 3 deletions b/‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml‎
Lines changed: 1 addition & 3 deletions
@@ -21,15 +21,11 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBeforeTestRun">
-                <argument name="tags" value="config"/>
-            </actionGroup>
+            <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheBeforeTestRun"/>
         </before>
         <after>
             <magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTestComplete">
-                <argument name="tags" value="config"/>
-            </actionGroup>
+            <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheAfterTestComplete"/>
         </after>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
 
@@ -19,9 +19,9 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -173,12 +173,11 @@ public function saveChild(
                 )
             );
         }
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        $selectionModel = $this->mapProductLinkToSelectionModel(
+        $selectionModel = $this->mapProductLinkToBundleSelectionModel(
             $selectionModel,
             $linkedProduct,
-            $linkProductModel->getId(),
-            $product->getData($linkField)
+            $product,
+            (int)$linkProductModel->getId()
         );
 
         try {
@@ -202,6 +201,7 @@ public function saveChild(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @deprecated use mapProductLinkToBundleSelectionModel
      */
     protected function mapProductLinkToSelectionModel(
         Selection $selectionModel,
@@ -239,6 +239,55 @@ protected function mapProductLinkToSelectionModel(
         return $selectionModel;
     }
 
+    /**
+     * Fill selection model with product link data.
+     *
+     * @param Selection $selectionModel
+     * @param LinkInterface $productLink
+     * @param ProductInterface $parentProduct
+     * @param int $linkedProductId
+     * @param string $linkField
+     * @return Selection
+     * @throws NoSuchEntityException
+     */
+    private function mapProductLinkToBundleSelectionModel(
+        Selection $selectionModel,
+        LinkInterface $productLink,
+        ProductInterface $parentProduct,
+        int $linkedProductId
+    ): Selection {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $selectionModel->setProductId($linkedProductId);
+        $selectionModel->setParentProductId($parentProduct->getData($linkField));
+        if ($productLink->getSelectionId() !== null) {
+            $selectionModel->setSelectionId($productLink->getSelectionId());
+        }
+        if ($productLink->getOptionId() !== null) {
+            $selectionModel->setOptionId($productLink->getOptionId());
+        }
+        if ($productLink->getPosition() !== null) {
+            $selectionModel->setPosition($productLink->getPosition());
+        }
+        if ($productLink->getQty() !== null) {
+            $selectionModel->setSelectionQty($productLink->getQty());
+        }
+        if ($productLink->getPriceType() !== null) {
+            $selectionModel->setSelectionPriceType($productLink->getPriceType());
+        }
+        if ($productLink->getPrice() !== null) {
+            $selectionModel->setSelectionPriceValue($productLink->getPrice());
+        }
+        if ($productLink->getCanChangeQuantity() !== null) {
+            $selectionModel->setSelectionCanChangeQty($productLink->getCanChangeQuantity());
+        }
+        if ($productLink->getIsDefault() !== null) {
+            $selectionModel->setIsDefault($productLink->getIsDefault());
+        }
+        $selectionModel->setWebsiteId((int)$this->storeManager->getStore($parentProduct->getStoreId())->getWebsiteId());
+
+        return $selectionModel;
+    }
+
     /**
      * @inheritDoc
      *
@@ -302,12 +351,13 @@ public function addChild(
         }
 
         $selectionModel = $this->bundleSelection->create();
-        $selectionModel = $this->mapProductLinkToSelectionModel(
+        $selectionModel = $this->mapProductLinkToBundleSelectionModel(
             $selectionModel,
             $linkedProduct,
-            $linkProductModel->getEntityId(),
-            $product->getData($linkField)
+            $product,
+            (int)$linkProductModel->getEntityId()
         );
+
         $selectionModel->setOptionId($optionId);
 
         try {
 
@@ -7,13 +7,17 @@
 
 namespace Magento\Bundle\Model\Option;
 
+use Magento\Bundle\Api\Data\LinkInterface;
 use Magento\Bundle\Api\Data\OptionInterface;
 use Magento\Bundle\Model\ResourceModel\Option;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Bundle\Model\Product\Type;
 use Magento\Bundle\Api\ProductLinkManagementInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Encapsulates logic for saving a bundle option, including coalescing the parent product's data.
@@ -45,12 +49,14 @@ class SaveAction
      * @param MetadataPool $metadataPool
      * @param Type $type
      * @param ProductLinkManagementInterface $linkManagement
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         Option $optionResource,
         MetadataPool $metadataPool,
         Type $type,
-        ProductLinkManagementInterface $linkManagement
+        ProductLinkManagementInterface $linkManagement,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->optionResource = $optionResource;
         $this->metadataPool = $metadataPool;
@@ -69,7 +75,7 @@ public function __construct(
      */
     public function save(ProductInterface $bundleProduct, OptionInterface $option)
     {
-        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
         $option->setStoreId($bundleProduct->getStoreId());
         $parentId = $bundleProduct->getData($metadata->getLinkField());
@@ -108,7 +114,7 @@ public function save(ProductInterface $bundleProduct, OptionInterface $option)
             throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
         }
 
-        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
+        /** @var LinkInterface $linkedProduct */
         foreach ($linksToAdd as $linkedProduct) {
             $this->linkManagement->addChild($bundleProduct, $option->getOptionId(), $linkedProduct);
         }
@@ -121,8 +127,8 @@ public function save(ProductInterface $bundleProduct, OptionInterface $option)
     /**
      * Update option selections
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
-     * @param \Magento\Bundle\Api\Data\OptionInterface $option
+     * @param ProductInterface $product
+     * @param OptionInterface $option
      * @return void
      */
     private function updateOptionSelection(ProductInterface $product, OptionInterface $option)
@@ -141,7 +147,7 @@ private function updateOptionSelection(ProductInterface $product, OptionInterfac
                     $linksToUpdate[] = $productLink;
                 }
             }
-            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
+            /** @var LinkInterface[] $linksToDelete */
             $linksToDelete = $this->compareLinks($existingLinks, $linksToUpdate);
         }
         foreach ($linksToUpdate as $linkedProduct) {
@@ -162,8 +168,8 @@ private function updateOptionSelection(ProductInterface $product, OptionInterfac
     /**
      * Compute the difference between given arrays.
      *
-     * @param \Magento\Bundle\Api\Data\LinkInterface[] $firstArray
-     * @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
+     * @param LinkInterface[] $firstArray
+     * @param LinkInterface[] $secondArray
      *
      * @return array
      */
 
@@ -456,6 +456,42 @@ private function getBaseBundleSelectionPriceSelect(): Select
         return $select;
     }
 
+    /**
+     * Get base select for bundle selection price update
+     *
+     * @return Select
+     * @throws \Exception
+     */
+    private function getBaseBundleSelectionPriceUpdateSelect(): Select
+    {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
+        $bundleSelectionTable = $this->getBundleSelectionTable();
+
+        $select = $this->getConnection()->select()
+        ->join(
+            ['i' => $this->getBundlePriceTable()],
+            "i.entity_id = $bundleSelectionTable.entity_id
+             AND i.customer_group_id = $bundleSelectionTable.customer_group_id
+             AND i.website_id = $bundleSelectionTable.website_id",
+            []
+        )->join(
+            ['parent_product' => $this->getTable('catalog_product_entity')],
+            'parent_product.entity_id = i.entity_id',
+            []
+        )->join(
+            ['bo' => $this->getTable('catalog_product_bundle_option')],
+            "bo.parent_id = parent_product.$linkField AND bo.option_id = $bundleSelectionTable.option_id",
+            ['option_id']
+        )->join(
+            ['bs' => $this->getTable('catalog_product_bundle_selection')],
+            "bs.option_id = bo.option_id AND bs.selection_id = $bundleSelectionTable.selection_id",
+            ['selection_id']
+        );
+
+        return $select;
+    }
+
     /**
      * Apply selections price for fixed bundles
      *
@@ -499,7 +535,7 @@ private function applyFixedBundleSelectionPrice()
             ]
         );
 
-        $select = $this->getBaseBundleSelectionPriceSelect();
+        $select = $this->getBaseBundleSelectionPriceUpdateSelect();
         $select->joinInner(
             ['bsp' => $this->getTable('catalog_product_bundle_selection_price')],
             'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
 
@@ -20,6 +20,8 @@
  * @method \Magento\Bundle\Model\Selection setPosition(int $value)
  * @method int getIsDefault()
  * @method \Magento\Bundle\Model\Selection setIsDefault(int $value)
+ * @method int getWebsiteId()
+ * @method \Magento\Bundle\Model\Selection setWebsiteId(int $value)
  * @method int getSelectionPriceType()
  * @method \Magento\Bundle\Model\Selection setSelectionPriceType(int $value)
  * @method float getSelectionPriceValue()
@@ -74,18 +76,35 @@ protected function _construct()
     /**
      * Processing object before save data
      *
+     * @return void
+     */
+    public function beforeSave()
+    {
+        if (!$this->_catalogData->isPriceGlobal() && $this->getWebsiteId()) {
+            $this->setData('tmp_selection_price_value', $this->getSelectionPriceValue());
+            $this->setSelectionPriceValue($this->getOrigData('selection_price_value'));
+        }
+        parent::beforeSave();
+    }
+
+    /**
+     * Processing object after save data
+     *
      * @return $this
      */
     public function afterSave()
     {
         if (!$this->_catalogData->isPriceGlobal() && $this->getWebsiteId()) {
+            if (null !== $this->getData('tmp_selection_price_value')) {
+                $this->setSelectionPriceValue($this->getData('tmp_selection_price_value'));
+            }
             $this->getResource()->saveSelectionPrice($this);
 
             if (!$this->getDefaultPriceScope()) {
                 $this->unsSelectionPriceValue();
                 $this->unsSelectionPriceType();
             }
         }
-        parent::afterSave();
+        return parent::afterSave();
     }
 }
@@ -17,4 +17,13 @@
         <data key="price_type">1</data>
         <data key="can_change_quantity">1</data>
     </entity>
+    <entity name="ApiBundleLinkFixed" type="bundle_link">
+        <var key="option_id" entityKey="return" entityType="bundle_option"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+        <data key="qty">1</data>
+        <data key="is_default">1</data>
+        <data key="price">30</data>
+        <data key="price_type">0</data>
+        <data key="can_change_quantity">1</data>
+    </entity>
 </entities>
@@ -134,9 +134,7 @@
 
         <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
         <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
-        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
-            <argument name="tags" value=""/>
-        </actionGroup>
+        <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
 
         <!--Confirm bundle products have been enabled-->
         <amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPageEnabled"/>