merge magento/2.3-develop into magento-qwerty/MAGETWO-93969

Author: Magento CICD

app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml

@@ -15,11 +15,12 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
-        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSeoDropDown"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
+        <waitForPageLoad stepKey="waitForDropDownSEO"/>
 
         <!--Fill URL input-->
-        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
+        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="fillsInSeoLinkExtension"/>
     </actionGroup>
 
     <actionGroup name="addBundleOptionWithTwoProducts">

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php

@@ -8,24 +8,14 @@
 use Magento\Ui\Component\Control\Container;
 use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * Class Save
  */
 class Save extends Generic
 {
     /**
-     * @var array
-     */
-    private static $availableProductTypes = [
-        ConfigurableType::TYPE_CODE,
-        Type::TYPE_SIMPLE,
-        Type::TYPE_VIRTUAL
-    ];
-
-    /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getButtonData()
     {
@@ -135,7 +125,8 @@ protected function getOptions()
     }
 
     /**
-     * Retrieve target for button
+     * Retrieve target for button.
+     *
      * @return string
      */
     protected function getSaveTarget()
@@ -148,7 +139,8 @@ protected function getSaveTarget()
     }
 
     /**
-     * Retrieve action for button
+     * Retrieve action for button.
+     *
      * @return string
      */
     protected function getSaveAction()
@@ -161,10 +153,12 @@ protected function getSaveAction()
     }
 
     /**
+     * Is configurable product.
+     *
      * @return boolean
      */
     protected function isConfigurableProduct()
     {
-        return in_array($this->getProduct()->getTypeId(), self::$availableProductTypes);
+        return !$this->getProduct()->isComposite() || $this->getProduct()->getTypeId() === ConfigurableType::TYPE_CODE;
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php

@@ -38,7 +38,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->productMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['isReadonly', 'isDuplicable'])
+            ->setMethods(['isReadonly', 'isDuplicable', 'isComposite'])
             ->getMockForAbstractClass();
 
         $this->registryMock->expects(static::any())

app/code/Magento/Email/view/frontend/email/header.html

@@ -43,8 +43,6 @@
 
                                 {{if logo_height}}
                                     height="{{var logo_height}}"
-                                {{else}}
-                                    height="52"
                                 {{/if}}
 
                                 src="{{var logo_url}}"

app/code/Magento/Email/view/frontend/web/logo_email.png

@@ -176,8 +176,6 @@ class Multishipping extends \Magento\Framework\DataObject
     private $dataObjectHelper;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
@@ -202,8 +200,9 @@ class Multishipping extends \Magento\Framework\DataObject
      * @param array $data
      * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory
      * @param AllowedCountries|null $allowedCountryReader
-     * @param Multishipping\PlaceOrderFactory $placeOrderFactory
-     * @param LoggerInterface $logger
+     * @param Multishipping\PlaceOrderFactory|null $placeOrderFactory
+     * @param LoggerInterface|null $logger
+     * @param \Magento\Framework\Api\DataObjectHelper|null $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -272,6 +271,7 @@ public function __construct(
 
     /**
      * Initialize multishipping checkout.
+     *
      * Split virtual/not virtual items between default billing/shipping addresses
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
@@ -337,6 +337,7 @@ protected function _init()
 
     /**
      * Get quote items assigned to different quote addresses populated per item qty.
+     *
      * Based on result array we can display each item separately
      *
      * @return array
@@ -397,7 +398,7 @@ public function removeAddressItem($addressId, $itemId)
     /**
      * Assign quote items to addresses and specify items qty
      *
-     * array structure:
+     * Array structure:
      * array(
      *      $quoteItemId => array(
      *          'qty'       => $qty,
@@ -693,6 +694,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             $order->setIsVirtual(1);
         } else {
             $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
+            $order->setShippingMethod($address->getShippingMethod());
         }
 
         $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment()));
@@ -927,6 +929,8 @@ public function getMinimumAmountDescription()
     }
 
     /**
+     * Get minimum amount error.
+     *
      * @return string
      */
     public function getMinimumAmountError()
@@ -1071,7 +1075,7 @@ public function getCustomer()
     /**
      * Check if specified address ID belongs to customer.
      *
-     * @param $addressId
+     * @param mixed $addressId
      * @return bool
      */
     protected function isAddressIdApplicable($addressId)
@@ -1084,6 +1088,8 @@ protected function isAddressIdApplicable($addressId)
     }
 
     /**
+     * Prepare shipping assignment.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return \Magento\Quote\Model\Quote
      */
@@ -1104,6 +1110,8 @@ private function prepareShippingAssignment($quote)
     }
 
     /**
+     * Get shipping assignment processor.
+     *
      * @return \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor
      */
     private function getShippingAssignmentProcessor()
@@ -1186,10 +1194,11 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses):
     }
 
     /**
+     * Get quote address errors.
+     *
      * @param OrderInterface[] $orders
      * @param \Magento\Quote\Model\Quote\Address[] $addresses
      * @param \Exception[] $exceptionList
-     *
      * @return string[]
      * @throws NotFoundException
      */

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -659,11 +659,13 @@ private function getOrderMock(
                     'getId',
                     'getCanSendNewEmailFlag',
                     'getItems',
+                    'setShippingMethod',
                 ]
             )->getMock();
         $orderMock->method('setQuote')->with($this->quoteMock);
         $orderMock->method('setBillingAddress')->with($orderAddressMock)->willReturnSelf();
         $orderMock->method('setShippingAddress')->with($orderAddressMock)->willReturnSelf();
+        $orderMock->expects($this->once())->method('setShippingMethod')->with('carrier')->willReturnSelf();
         $orderMock->method('setPayment')->with($orderPaymentMock)->willReturnSelf();
         $orderMock->method('addItem')->with($orderItemMock)->willReturnSelf();
         $orderMock->method('getIncrementId')->willReturn('1');

app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

@@ -10,6 +10,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable;
 
 /**
  * Test Creation for ProductTypeSwitchingOnCreation
@@ -75,18 +76,49 @@ public function __inject(
      *
      * @param string $createProduct
      * @param string $product
+     * @param string $actionName
      * @return array
      */
-    public function test($createProduct, $product)
+    public function test(string $createProduct, string $product, string $actionName = null): array
     {
         // Steps
         list($fixture, $dataset) = explode('::', $product);
         $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
         $this->catalogProductIndex->open();
         $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
+        if ($actionName) {
+            $this->performAction($actionName);
+        }
         $this->catalogProductNew->getProductForm()->fill($product);
         $this->catalogProductNew->getFormPageActions()->save($product);
 
         return ['product' => $product];
     }
+
+    /**
+     * Perform action.
+     *
+     * @param string $actionName
+     * @return void
+     */
+    private function performAction(string $actionName): void
+    {
+        if (method_exists(__CLASS__, $actionName)) {
+            $this->$actionName();
+        }
+    }
+
+    /**
+     * Clear downloadable product data.
+     *
+     * @return void
+     */
+    private function clearDownloadableData(): void
+    {
+        $this->catalogProductNew->getProductForm()->openSection('downloadable_information');
+        /** @var Downloadable $downloadableInfoTab */
+        $downloadableInfoTab = $this->catalogProductNew->getProductForm()->getSection('downloadable_information');
+        $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
+    }
 }