Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-96016

Author: zakdma

app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml

@@ -14,4 +14,7 @@
     <page name="WebConfigurationPage" url="admin/system_config/edit/section/web/" area="admin" module="Backend">
         <section name="WYSIWYGOptionsSection"/>
     </page>
+    <page name="GeneralConfigurationPage" url="admin/system_config/edit/section/general/" area="admin" module="Backend">
+        <section name="LocaleOptionsSection"/>
+    </page>
 </pages>

app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LocaleOptionsSection">
+        <element name="sectionHeader" type="text" selector="#general_locale-head"/>
+        <element name="timezone" type="select" selector="#general_locale_timezone"/>
+    </section>
+</sections>

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

@@ -90,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $optionId)
     {
@@ -106,23 +106,24 @@ public function get($sku, $optionId)
 
         $productLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
 
-        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+        /** @var \Magento\Bundle\Api\Data\OptionInterface $optionDataObject */
         $optionDataObject = $this->optionFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $optionDataObject,
             $option->getData(),
             \Magento\Bundle\Api\Data\OptionInterface::class
         );
-        $optionDataObject->setOptionId($option->getId())
-            ->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle())
-            ->setSku($product->getSku())
-            ->setProductLinks($productLinks);
+
+        $optionDataObject->setOptionId($option->getId());
+        $optionDataObject->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle());
+        $optionDataObject->setSku($product->getSku());
+        $optionDataObject->setProductLinks($productLinks);
 
         return $optionDataObject;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
@@ -131,6 +132,8 @@ public function getList($sku)
     }
 
     /**
+     * Return list of product options
+     *
      * @param ProductInterface $product
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
      */
@@ -140,7 +143,7 @@ public function getListByProduct(ProductInterface $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
     {
@@ -156,20 +159,19 @@ public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($sku, $optionId)
     {
-        $product = $this->getProduct($sku);
-        $optionCollection = $this->type->getOptionsCollection($product);
-        $optionCollection->setIdFilter($optionId);
-        $hasBeenDeleted = $this->delete($optionCollection->getFirstItem());
+        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+        $option = $this->get($sku, $optionId);
+        $hasBeenDeleted = $this->delete($option);
 
         return $hasBeenDeleted;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -189,6 +191,9 @@ public function save(
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return $this
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     protected function updateOptionSelection(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -228,9 +233,12 @@ protected function updateOptionSelection(
     }
 
     /**
+     * Retrieve product by SKU
+     *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface
-     * @throws \Magento\Framework\Exception\InputException
+     * @throws InputException
+     * @throws NoSuchEntityException
      */
     private function getProduct($sku)
     {

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Bundle\Test\Unit\Model;
 
 use Magento\Bundle\Model\OptionRepository;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -84,7 +85,7 @@ protected function setUp()
             ->getMock();
         $this->optionResourceMock = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Option::class,
-            ['delete', '__wakeup', 'save', 'removeOptionSelections']
+            ['get', 'delete', '__wakeup', 'save', 'removeOptionSelections']
         );
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->linkManagementMock = $this->createMock(\Magento\Bundle\Api\ProductLinkManagementInterface::class);
@@ -227,32 +228,92 @@ public function testDeleteThrowsExceptionIfCannotDelete()
         $this->model->delete($optionMock);
     }
 
+    /**
+     * Test successful delete action for given $optionId
+     */
     public function testDeleteById()
     {
         $productSku = 'sku';
         $optionId = 100;
-        $productMock = $this->createMock(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
+        $optionMock->expects($this->exactly(2))
+            ->method('getId')
+            ->willReturn($optionId);
+
+        $optionMock->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'title' => 'Option title',
+                'option_id' => $optionId
+            ]);
+
+        $this->optionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($optionMock);
+
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
+        );
         $productMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-        $this->productRepositoryMock->expects($this->once())
+        $productMock->expects($this->exactly(2))->method('getSku')->willReturn($productSku);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
             ->method('get')
             ->with($productSku)
             ->willReturn($productMock);
 
+        $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optCollectionMock);
+
+        $this->assertTrue($this->model->deleteById($productSku, $optionId));
+    }
+
+    /**
+     * Tests if NoSuchEntityException thrown when provided $optionId not found
+     */
+    public function testDeleteByIdException()
+    {
+        $productSku = 'sku';
+        $optionId = null;
+
         $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
+        $optionMock->expects($this->exactly(1))
+            ->method('getId')
+            ->willReturn($optionId);
+
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
+        );
+        $productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
 
         $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
         $this->typeMock->expects($this->once())
             ->method('getOptionsCollection')
             ->with($productMock)
             ->willReturn($optCollectionMock);
 
-        $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
+        $this->expectException(NoSuchEntityException::class);
 
-        $this->optionResourceMock->expects($this->once())->method('delete')->with($optionMock)->willReturnSelf();
-        $this->assertTrue($this->model->deleteById($productSku, $optionId));
+        $this->model->deleteById($productSku, $optionId);
     }
 
     /**

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

@@ -14,6 +14,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
+ * Updates status for a batch of products.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
@@ -87,7 +88,7 @@ public function execute()
         $filterRequest = $this->getRequest()->getParam('filters', null);
         $status = (int) $this->getRequest()->getParam('status');
 
-        if (null !== $storeId && null !== $filterRequest) {
+        if (null === $storeId && null !== $filterRequest) {
             $storeId = (isset($filterRequest['store_id'])) ? (int) $filterRequest['store_id'] : 0;
         }
 

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php

@@ -13,6 +13,9 @@
 
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 
+/**
+ * Backend model for Tierprice attribute
+ */
 class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
 {
     /**
@@ -159,8 +162,22 @@ protected function validatePrice(array $priceRow)
      */
     protected function modifyPriceData($object, $data)
     {
+        /** @var \Magento\Catalog\Model\Product $object */
         $data = parent::modifyPriceData($object, $data);
         $price = $object->getPrice();
+
+        $specialPrice = $object->getSpecialPrice();
+        $specialPriceFromDate = $object->getSpecialFromDate();
+        $specialPriceToDate = $object->getSpecialToDate();
+        $today = time();
+
+        if ($specialPrice && ($object->getPrice() > $object->getFinalPrice())) {
+            if ($today >= strtotime($specialPriceFromDate) && $today <= strtotime($specialPriceToDate) ||
+                $today >= strtotime($specialPriceFromDate) && $specialPriceToDate === null) {
+                $price = $specialPrice;
+            }
+        }
+
         foreach ($data as $key => $tierPrice) {
             $percentageValue = $this->getPercentage($tierPrice);
             if ($percentageValue) {
@@ -172,6 +189,10 @@ protected function modifyPriceData($object, $data)
     }
 
     /**
+     * Update Price values in DB
+     *
+     * Updates price values in DB from array comparing to old values. Returns bool if updated
+     *
      * @param array $valuesToUpdate
      * @param array $oldValues
      * @return boolean