Merge remote-tracking branch 'origin/2.3-develop' into recheck-129-retrive-customer-token

Author: Valeriy Nayda

app/code/Magento/Backend/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Backend" >
+    <module name="Magento_Backend">
         <sequence>
             <module name="Magento_Directory"/>
         </sequence>

app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
      */
     public function getConfig()
     {
+        $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+        
         return [
             'payment' => [
                 self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
+                    'isRequiredBillingAddress' =>
+                        (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
                 ]
             ]
         ];

app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php

@@ -77,6 +77,9 @@ public function testGetConfig($expected)
                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
             ]);
 
+        $this->config->method('isRequiredBillingAddress')
+            ->willReturn(1);
+
         self::assertEquals($expected, $this->configProvider->getConfig());
     }
 
@@ -101,7 +104,8 @@ public function getConfigDataProvider()
                             'skipOrderReview' => false,
                             'paymentIcon' => [
                                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
-                            ]
+                            ],
+                            'isRequiredBillingAddress' => true
                         ]
                     ]
                 ]

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -206,7 +206,9 @@ define([
         beforePlaceOrder: function (data) {
             this.setPaymentMethodNonce(data.nonce);
 
-            if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
+            if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
+                typeof data.details.billingAddress !== 'undefined'
+            ) {
                 this.setBillingAddress(data.details, data.details.billingAddress);
             }
 
@@ -264,6 +266,14 @@ define([
             return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
         },
 
+        /**
+         * Is billing address required from PayPal side
+         * @returns {Boolean}
+         */
+        isRequiredBillingAddress: function () {
+            return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
+        },
+
         /**
          * Get configuration for PayPal
          * @returns {Object}

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

@@ -56,6 +56,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $catalogRuleProcessor;
 
+    /**
+     * @var array
+     */
+    private $optionsPosition = [];
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -86,6 +91,8 @@ public function __construct(
     }
 
     /**
+     * Return catalog rule processor or creates processor if it does not exist
+     *
      * @deprecated 100.2.0
      * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
      */
@@ -101,6 +108,7 @@ private function getCatalogRuleProcessor()
 
     /**
      * Returns the bundle product options
+     *
      * Will return cached options data if the product options are already initialized
      * In a case when $stripSelection parameter is true will reload stored bundle selections collection from DB
      *
@@ -135,6 +143,8 @@ public function getOptions($stripSelection = false)
     }
 
     /**
+     * Return true if product has options
+     *
      * @return bool
      */
     public function hasOptions()
@@ -150,7 +160,6 @@ public function hasOptions()
      * Returns JSON encoded config to be used in JS scripts
      *
      * @return string
-     *
      */
     public function getJsonConfig()
     {
@@ -172,6 +181,7 @@ public function getJsonConfig()
             }
             $optionId = $optionItem->getId();
             $options[$optionId] = $this->getOptionItemData($optionItem, $currentProduct, $position);
+            $this->optionsPosition[$position] = $optionId;
 
             // Add attribute default value (if set)
             if ($preConfiguredFlag) {
@@ -370,6 +380,7 @@ private function getConfigData(Product $product, array $options)
         $config = [
             'options' => $options,
             'selected' => $this->selectedOptions,
+            'positions' => $this->optionsPosition,
             'bundleId' => $product->getId(),
             'priceFormat' => $this->localeFormat->getPriceFormat(),
             'prices' => [

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

@@ -280,6 +280,7 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
+        $this->assertEquals([1], $jsonConfig['positions']);
     }
 
     /**

app/code/Magento/Bundle/view/frontend/web/js/product-summary.js

@@ -56,8 +56,9 @@ define([
 
             // Clear Summary box
             this.element.html('');
-
-            $.each(this.cache.currentElement.selected, $.proxy(this._renderOption, this));
+            this.cache.currentElement.positions.forEach(function (optionId) {
+                this._renderOption(optionId, this.cache.currentElement.selected[optionId]);
+            }, this);
             this.element
                 .parents(this.options.bundleSummaryContainer)
                 .toggleClass('empty', !this.cache.currentElementCount); // Zero elements equal '.empty' container

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -23,6 +23,8 @@
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
+ * Product gallery block
+ *
  * @api
  * @since 100.0.2
  */
@@ -139,7 +141,7 @@ public function getGalleryImagesJson()
                 'thumb' => $image->getData('small_image_url'),
                 'img' => $image->getData('medium_image_url'),
                 'full' => $image->getData('large_image_url'),
-                'caption'  => $image->getData('label'),
+                'caption' => ($image->getLabel() ?: $this->getProduct()->getName()),
                 'position' => $image->getData('position'),
                 'isMain'   => $this->isMainImage($image),
                 'type' => str_replace('external-', '', $image->getMediaType()),
@@ -196,6 +198,8 @@ public function isMainImage($image)
     }
 
     /**
+     * Returns image attribute
+     *
      * @param string $imageId
      * @param string $attributeName
      * @param string $default
@@ -222,6 +226,8 @@ private function getConfigView()
     }
 
     /**
+     * Returns image gallery config object
+     *
      * @return Collection
      */
     private function getGalleryImagesConfig()

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

@@ -54,6 +54,16 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     private $storeManager;
 
+    /**
+     * @var \Magento\Framework\Escaper|null
+     */
+    private $escaper;
+
+    /**
+     * @var null|\Psr\Log\LoggerInterface
+     */
+    private $logger;
+
     /**
      * Save constructor.
      *
@@ -63,20 +73,26 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
      * @param \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param \Magento\Framework\Escaper|null $escaper
+     * @param \Psr\Log\LoggerInterface|null $logger
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         Initialization\Helper $initializationHelper,
         \Magento\Catalog\Model\Product\Copier $productCopier,
         \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+        \Magento\Framework\Escaper $escaper = null,
+        \Psr\Log\LoggerInterface $logger = null
     ) {
         $this->initializationHelper = $initializationHelper;
         $this->productCopier = $productCopier;
         $this->productTypeManager = $productTypeManager;
         $this->productRepository = $productRepository;
         parent::__construct($context, $productBuilder);
+        $this->escaper = $escaper ?? $this->_objectManager->get(\Magento\Framework\Escaper::class);
+        $this->logger = $logger ?? $this->_objectManager->get(\Psr\Log\LoggerInterface::class);
     }
 
     /**
@@ -103,14 +119,14 @@ public function execute()
                     $this->productBuilder->build($this->getRequest())
                 );
                 $this->productTypeManager->processProduct($product);
-
                 if (isset($data['product'][$product->getIdFieldName()])) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __('The product was unable to be saved. Please try again.')
                     );
                 }
 
                 $originalSku = $product->getSku();
+                $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
                 $this->getCategoryLinkManagement()->assignProductToCategories(
@@ -120,20 +136,17 @@ public function execute()
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();
-
-                $this->copyToStores($data, $productId);
+                $extendedData = $data;
+                $extendedData['can_save_custom_options'] = $canSaveCustomOptions;
+                $this->copyToStores($extendedData, $productId);
                 $this->messageManager->addSuccessMessage(__('You saved the product.'));
                 $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
                     $this->messageManager->addNoticeMessage(
                         __(
                             'SKU for product %1 has been changed to %2.',
-                            $this->_objectManager->get(
-                                \Magento\Framework\Escaper::class
-                            )->escapeHtml($product->getName()),
-                            $this->_objectManager->get(
-                                \Magento\Framework\Escaper::class
-                            )->escapeHtml($product->getSku())
+                            $this->escaper->escapeHtml($product->getName()),
+                            $this->escaper->escapeHtml($product->getSku())
                         )
                     );
                 }
@@ -143,17 +156,18 @@ public function execute()
                 );
 
                 if ($redirectBack === 'duplicate') {
+                    $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->messageManager->addExceptionMessage($e);
                 $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
@@ -242,6 +256,7 @@ protected function copyToStores($data, $productId)
                                     ->setStoreId($copyFrom)
                                     ->load($productId)
                                     ->setStoreId($copyTo)
+                                    ->setCanSaveCustomOptions($data['can_save_custom_options'])
                                     ->setCopyFromView(true)
                                     ->save();
                             }