merge magento/2.3-develop into magento-mpi/MAGETWO-83340

Author: Magento CICD

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -217,42 +217,49 @@ public function getOptionHtml(Option $option)
     }
 
     /**
-     * Get formed data from option selection item
+     * Get formed data from option selection item.
      *
      * @param Product $product
      * @param Product $selection
+     *
      * @return array
      */
     private function getSelectionItemData(Product $product, Product $selection)
     {
         $qty = ($selection->getSelectionQty() * 1) ?: '1';
 
         $optionPriceAmount = $product->getPriceInfo()
-            ->getPrice('bundle_option')
+            ->getPrice(\Magento\Bundle\Pricing\Price\BundleOptionPrice::PRICE_CODE)
             ->getOptionSelectionAmount($selection);
         $finalPrice = $optionPriceAmount->getValue();
         $basePrice = $optionPriceAmount->getBaseAmount();
 
+        $oldPrice = $product->getPriceInfo()
+            ->getPrice(\Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::PRICE_CODE)
+            ->getOptionSelectionAmount($selection)
+            ->getValue();
+
         $selection = [
             'qty' => $qty,
             'customQty' => $selection->getSelectionCanChangeQty(),
             'optionId' => $selection->getId(),
             'prices' => [
                 'oldPrice' => [
-                    'amount' => $basePrice
+                    'amount' => $oldPrice,
                 ],
                 'basePrice' => [
-                    'amount' => $basePrice
+                    'amount' => $basePrice,
                 ],
                 'finalPrice' => [
-                    'amount' => $finalPrice
-                ]
+                    'amount' => $finalPrice,
+                ],
             ],
             'priceType' => $selection->getSelectionPriceType(),
             'tierPrice' => $this->getTierPrices($product, $selection),
             'name' => $selection->getName(),
-            'canApplyMsrp' => false
+            'canApplyMsrp' => false,
         ];
+
         return $selection;
     }
 

app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php

@@ -8,9 +8,10 @@
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\App\ObjectManager;
 
 /**
- * Bundle option price model
+ * Bundle option price model with final price.
  */
 class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterface
 {
@@ -26,6 +27,7 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
 
     /**
      * @var BundleSelectionFactory
+     * @deprecated
      */
     protected $selectionFactory;
 
@@ -34,23 +36,31 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
      */
     protected $maximalPrice;
 
+    /**
+     * @var BundleOptions
+     */
+    private $bundleOptions;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param BundleCalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param BundleSelectionFactory $bundleSelectionFactory
+     * @param BundleOptions|null $bundleOptions
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         BundleCalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        BundleSelectionFactory $bundleSelectionFactory
+        BundleSelectionFactory $bundleSelectionFactory,
+        BundleOptions $bundleOptions = null
     ) {
         $this->selectionFactory = $bundleSelectionFactory;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->product->setQty($this->quantity);
+        $this->bundleOptions = $bundleOptions ?: ObjectManager::getInstance()->get(BundleOptions::class);
     }
 
     /**
@@ -59,94 +69,61 @@ public function __construct(
     public function getValue()
     {
         if (null === $this->value) {
-            $this->value = $this->calculateOptions();
+            $this->value = $this->bundleOptions->calculateOptions($this->product);
         }
+
         return $this->value;
     }
 
     /**
-     * Getter for maximal price of options
+     * Getter for maximal price of options.
      *
      * @return bool|float
+     * @deprecated
      */
     public function getMaxValue()
     {
         if (null === $this->maximalPrice) {
-            $this->maximalPrice = $this->calculateOptions(false);
+            $this->maximalPrice = $this->bundleOptions->calculateOptions($this->product, false);
         }
+
         return $this->maximalPrice;
     }
 
     /**
-     * Get Options with attached Selections collection
+     * Get Options with attached Selections collection.
      *
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      */
     public function getOptions()
     {
-        $bundleProduct = $this->product;
-        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $typeInstance->setStoreFilter($bundleProduct->getStoreId(), $bundleProduct);
-
-        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionCollection */
-        $optionCollection = $typeInstance->getOptionsCollection($bundleProduct);
-
-        $selectionCollection = $typeInstance->getSelectionsCollection(
-            $typeInstance->getOptionsIds($bundleProduct),
-            $bundleProduct
-        );
-
-        $priceOptions = $optionCollection->appendSelections($selectionCollection, true, false);
-        return $priceOptions;
+        return $this->bundleOptions->getOptions($this->product);
     }
 
     /**
-     * Get selection amount
+     * Get selection amount.
      *
      * @param \Magento\Bundle\Model\Selection $selection
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getOptionSelectionAmount($selection)
     {
-        $cacheKey = implode(
-            '_',
-            [
-                $this->product->getId(),
-                $selection->getOptionId(),
-                $selection->getSelectionId()
-            ]
+        return $this->bundleOptions->getOptionSelectionAmount(
+            $this->product,
+            $selection,
+            false
         );
-
-        if (!isset($this->optionSelecionAmountCache[$cacheKey])) {
-            $selectionPrice = $this->selectionFactory
-                ->create($this->product, $selection, $selection->getSelectionQty());
-            $this->optionSelecionAmountCache[$cacheKey] =  $selectionPrice->getAmount();
-        }
-
-        return $this->optionSelecionAmountCache[$cacheKey];
     }
 
     /**
-     * Calculate maximal or minimal options value
+     * Calculate maximal or minimal options value.
      *
      * @param bool $searchMin
      * @return bool|float
      */
     protected function calculateOptions($searchMin = true)
     {
-        $priceList = [];
-        /* @var $option \Magento\Bundle\Model\Option */
-        foreach ($this->getOptions() as $option) {
-            if ($searchMin && !$option->getRequired()) {
-                continue;
-            }
-            $selectionPriceList = $this->calculator->createSelectionPriceList($option, $this->product);
-            $selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
-            $priceList = array_merge($priceList, $selectionPriceList);
-        }
-        $amount = $this->calculator->calculateBundleAmount(0., $this->product, $priceList);
-        return $amount->getValue();
+        return $this->bundleOptions->calculateOptions($this->product, $searchMin);
     }
 
     /**

app/code/Magento/Bundle/Pricing/Price/BundleOptionRegularPrice.php

@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Pricing\Price;
+
+use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Bundle option price model with final price.
+ */
+class BundleOptionRegularPrice extends AbstractPrice implements BundleOptionPriceInterface
+{
+    /**
+     * Price model code.
+     */
+    const PRICE_CODE = 'bundle_option_regular_price';
+
+    /**
+     * @var BundleCalculatorInterface
+     */
+    protected $calculator;
+
+    /**
+     * @var BundleOptions
+     */
+    private $bundleOptions;
+
+    /**
+     * @param Product $saleableItem
+     * @param float $quantity
+     * @param BundleCalculatorInterface $calculator
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param BundleOptions $bundleOptions
+     */
+    public function __construct(
+        Product $saleableItem,
+        $quantity,
+        BundleCalculatorInterface $calculator,
+        PriceCurrencyInterface $priceCurrency,
+        BundleOptions $bundleOptions
+    ) {
+        parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
+        $this->product->setQty($this->quantity);
+        $this->bundleOptions = $bundleOptions;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getValue()
+    {
+        if (null === $this->value) {
+            $this->value = $this->bundleOptions->calculateOptions($this->product);
+        }
+
+        return $this->value;
+    }
+
+    /**
+     * Get Options with attached Selections collection.
+     *
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     */
+    public function getOptions() : \Magento\Bundle\Model\ResourceModel\Option\Collection
+    {
+        return $this->bundleOptions->getOptions($this->product);
+    }
+
+    /**
+     * Get selection amount.
+     *
+     * @param \Magento\Bundle\Model\Selection $selection
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getOptionSelectionAmount($selection) : \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        return $this->bundleOptions->getOptionSelectionAmount(
+            $this->product,
+            $selection,
+            true
+        );
+    }
+
+    /**
+     * Get minimal amount of bundle price with options.
+     *
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getAmount() : \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        return $this->calculator->getOptionsAmount($this->product);
+    }
+}