🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento#15372: Fixed Purchased Order Form button should visible properly (by @vgelani)
 - magento#15336: magento#12820 - Wrong annotation in _toOptionArray - magento/framework/Data/� (by @sanjay-wagento)
 - magento#15332: magento#14063 - Wrong invoice prefix in multistore setup due to default stor� (by @sanjay-wagento)
 - magento#15347: Fixed breadcrumb quote issue in product page magento#15037 (by @jignesh-baldha)
 - magento#15275: [fix] typo in method name _exportAddress[s]es (by @mhauri)
 - magento#15247: ISSUE-14747 Newsletter subscription confirmation message does not dis� (by @KaushikChavda)
 - magento#15089: Fix unnecessary recalculation of product list pricing (by @JeroenVanLeusden)


Fixed GitHub Issues:
 - magento#15334: Purchased Order Form button should visible properly (reported by @neeta-wagento) has been fixed in magento#15372 by @vgelani in 2.2-develop branch
   Related commits:
     1. 35b2cdf
     2. be8c6cb

 - magento#15037: Product Details Page breadcrumbs cause syntax error on products containing quotes (reported by @brian-labelle) has been fixed in magento#15347 by @jignesh-baldha in 2.2-develop branch
   Related commits:
     1. 6fcfb88
     2. bfb39b5
     3. 8e93b0d

 - magento#14747: Newsletter subscription confirmation message does not display after clicking link in email (reported by @tohann) has been fixed in magento#15247 by @KaushikChavda in 2.2-develop branch
   Related commits:
     1. 6eb96c6

 - magento#14941: Unnecessary recalculation of product list pricing causes huge slowdowns (reported by @paales) has been fixed in magento#15089 by @JeroenVanLeusden in 2.2-develop branch
   Related commits:
     1. c5536d3

Author: magento-engcom-team

app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml

@@ -11,7 +11,7 @@ $viewModel = $block->getData('viewModel');
     "breadcrumbs": {
         "categoryUrlSuffix": "<?= $block->escapeHtml($viewModel->getCategoryUrlSuffix()); ?>",
         "useCategoryPathInUrl": <?= (int)$viewModel->isCategoryUsedInProductUrl(); ?>,
-        "product": "<?= $block->escapeHtml($block->escapeJsQuote($viewModel->getProductName(), '"')); ?>"
+        "product": "<?= $block->escapeHtml($block->escapeJs($viewModel->getProductName())); ?>"
     }
 }'>
 </div>

app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php

@@ -32,6 +32,8 @@ public function execute()
             }
         }
 
-        $this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
+        return $resultRedirect;
     }
 }

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -846,7 +846,7 @@ public function callGetExpressCheckoutDetails()
         $request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest);
         $response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request);
         $this->_importFromResponse($this->_paymentInformationResponse, $response);
-        $this->_exportAddressses($response);
+        $this->_exportAddresses($response);
     }
 
     /**
@@ -1463,8 +1463,21 @@ protected function _exportLineItems(array &$request, $i = 0)
      *
      * @param array $data
      * @return void
+     * @deprecated 100.2.2 typo in method name
+     * @see _exportAddresses
      */
     protected function _exportAddressses($data)
+    {
+        $this->_exportAddresses($data);
+    }
+
+    /**
+     * Create billing and shipping addresses basing on response data
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function _exportAddresses($data)
     {
         $address = new \Magento\Framework\DataObject();
         \Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap);

app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php

@@ -123,10 +123,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
         if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+            $store = $object->getStore();
+            $storeId = $store->getId();
+            if ($storeId === null) {
+                $storeId = $store->getGroup()->getDefaultStoreId();
+            }
             $object->setIncrementId(
                 $this->sequenceManager->getSequence(
                     $object->getEntityType(),
-                    $object->getStore()->getGroup()->getDefaultStoreId()
+                    $storeId
                 )->getNextValue()
             );
         }

app/code/Magento/Tax/Model/Config.php

@@ -832,20 +832,20 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

@@ -63,6 +63,10 @@
                     }
                 }
             }
+            
+            #po_number {
+                margin-bottom: 20px;
+            }
         }
 
         .payment-method-title {

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

@@ -629,7 +629,7 @@ public function fetchItem()
     /**
      * Overridden to use _idFieldName by default.
      *
-     * @param null $valueField
+     * @param string|null $valueField
      * @param string $labelField
      * @param array $additional
      * @return array