magento#12584: Bundle Item price cannot differ per website.

rain2o · Nov 19, 2020 · a7adbdc · a7adbdc
1 parent ed0f987
commit a7adbdc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -235,9 +235,7 @@ protected function mapProductLinkToSelectionModel(
         if ($productLink->getIsDefault() !== null) {
             $selectionModel->setIsDefault($productLink->getIsDefault());
         }
-        if ($productLink->getWebsiteId() !== null) {
-            $selectionModel->setWebsiteId($productLink->getWebsiteId());
-        }
+        $selectionModel->setWebsiteId((int)$this->storeManager->getWebsite()->getId());
 
         return $selectionModel;
     }

diff --git a/app/code/Magento/Bundle/Model/Option/SaveAction.php b/app/code/Magento/Bundle/Model/Option/SaveAction.php
@@ -16,6 +16,7 @@
 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;
 
 /**
@@ -105,7 +106,7 @@ public function save(ProductInterface $bundleProduct, OptionInterface $option)
             }
         } else {
             if (!$existingOption->getOptionId()) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __("The option that was requested doesn't exist. Verify the entity and try again.")
                 );
             }
@@ -147,7 +148,6 @@ private function updateOptionSelection(ProductInterface $product, OptionInterfac
         if (is_array($option->getProductLinks())) {
             $productLinks = $option->getProductLinks();
             foreach ($productLinks as $productLink) {
-                $productLink->setWebsiteId($this->storeManager->getStore($product->getStoreId())->getWebsiteId());
                 if (!$productLink->getId() && !$productLink->getSelectionId()) {
                     $linksToAdd[] = $productLink;
                 } else {

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -31,6 +31,7 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -139,6 +140,11 @@ class LinkManagementTest extends TestCase
      */
     private $linkField = 'product_id';
 
+    /**
+     * @var WebsiteInterface|MockObject
+     */
+    private $websiteMock;
+
     /**
      * @inheritDoc
      */
@@ -203,6 +209,9 @@ protected function setUp(): void
         $this->dataObjectHelperMock = $this->getMockBuilder(DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->websiteMock = $this->getMockForAbstractClass( WebsiteInterface::class);
+
         $this->model = $helper->getObject(
             LinkManagement::class,
             [
@@ -539,7 +548,8 @@ public function testAddChildCouldNotSave()
         $productLink->method('getSku')->willReturn('linked_product_sku');
         $productLink->method('getOptionId')->willReturn(1);
         $productLink->method('getSelectionId')->willReturn(1);
-        $productLink->method('getWebSiteId')->willReturn(100);
+        $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())->method('getId')->willReturn(100);
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->createMock(Product::class);
@@ -617,7 +627,8 @@ public function testAddChild()
         $productLink->method('getSku')->willReturn('linked_product_sku');
         $productLink->method('getOptionId')->willReturn(1);
         $productLink->method('getSelectionId')->willReturn(1);
-        $productLink->method('getWebSiteId')->willReturn(100);
+        $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())->method('getId')->willReturn(100);
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->createMock(Product::class);
@@ -705,7 +716,8 @@ public function testSaveChild()
             ->willReturn($canChangeQuantity);
         $productLink->method('getIsDefault')->willReturn($isDefault);
         $productLink->method('getSelectionId')->willReturn($optionId);
-        $productLink->method('getWebSiteId')->willReturn($websiteId);
+        $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())->method('getId')->willReturn($websiteId);
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->createMock(Product::class);
@@ -785,7 +797,8 @@ public function testSaveChildFailedToSave()
         $productLink->method('getSku')->willReturn('linked_product_sku');
         $productLink->method('getId')->willReturn($id);
         $productLink->method('getSelectionId')->willReturn(1);
-        $productLink->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())->method('getId')->willReturn($websiteId);
 
         $bundleProductSku = 'bundleProductSku';