Merge pull request #1624 from magento-engcom/develop-prs

Public Pull Requests

#11644 Magento sets ISO invalid language code [2.3-develop Backport] by @crissanclick
#11665 Fix app/code/Magento/Backend/Block/Media/Uploader.php getConfigJson() method by @adrian-martinez-interactiv4
#11524 Fix Filter Customer Report Review by @osrecio
#11642 Coupon codes not showing in invoice [2.3-develop Backport] by @crissanclick
#11519 [Port 2.3-develop] Append shipment comment to shipment if appendComment is true by @JeroenVanLeusden

Fixed Public Issues

#11540 Magento sets iso invalid language code in html header
#10301 Customer review report search Bug in 2.1.x, 2.2
#10168 Coupon codes not showing in invoice
#11207 Shipment API won't append comment to email

Author: Oleksii Korshenko

app/code/Magento/Backend/Block/Media/Uploader.php

@@ -6,6 +6,7 @@
 namespace Magento\Backend\Block\Media;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Adminhtml media library uploader
@@ -30,25 +31,24 @@ class Uploader extends \Magento\Backend\Block\Widget
     protected $_fileSizeService;
 
     /**
-     * @var \Magento\Framework\Json\EncoderInterface
+     * @var Json
      */
-    protected $_jsonEncoder;
+    private $jsonEncoder;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param Json $jsonEncoder
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\File\Size $fileSize,
         array $data = [],
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder = null
+        Json $jsonEncoder = null
     ) {
-        $this->_jsonEncoder = $jsonEncoder ?:
-            ObjectManager::getInstance()->get(\Magento\Framework\Json\EncoderInterface::class);
         $this->_fileSizeService = $fileSize;
+        $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct($context, $data);
     }
 
@@ -118,7 +118,7 @@ public function getJsObjectName()
      */
     public function getConfigJson()
     {
-        return $this->_jsonEncoder->encode($this->getConfig()->getData());
+        return $this->jsonEncoder->encode($this->getConfig()->getData());
     }
 
     /**

app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php

@@ -103,20 +103,36 @@ protected function _joinCustomers()
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Additional processing of 'customer_name' field is required, as it is a concat field, which can not be aliased.
+     * @see _joinCustomers
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field === 'customer_name') {
+            $field = $this->getConnection()->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
+        }
+
+        return parent::addFieldToFilter($field, $condition);
+    }
+
     /**
      * Get select count sql
      *
      * @return string
      */
     public function getSelectCountSql()
     {
-        $countSelect = clone $this->_select;
+        $countSelect = clone $this->getSelect();
         $countSelect->reset(\Magento\Framework\DB\Select::ORDER);
         $countSelect->reset(\Magento\Framework\DB\Select::GROUP);
         $countSelect->reset(\Magento\Framework\DB\Select::HAVING);
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $countSelect->reset(\Magento\Framework\DB\Select::WHERE);
 
         $countSelect->columns(new \Zend_Db_Expr('COUNT(DISTINCT detail.customer_id)'));
 

app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php

@@ -90,6 +90,11 @@ public function create(
                 $appendComment,
                 $comment->getIsVisibleOnFront()
             );
+
+            if ($appendComment) {
+                $shipment->setCustomerNote($comment->getComment());
+                $shipment->setCustomerNoteNotify($appendComment);
+            }
         }
 
         return $shipment;

app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php

@@ -92,7 +92,7 @@ protected function setUp()
 
         $this->shipmentMock = $this->getMockBuilder(ShipmentInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addComment', 'addTrack'])
+            ->setMethods(['addComment', 'addTrack', 'setCustomerNote', 'setCustomerNoteNotify'])
             ->getMockForAbstractClass();
 
         $this->hydratorPoolMock = $this->getMockBuilder(HydratorPool::class)
@@ -166,7 +166,7 @@ public function testCreate()
         if ($appendComment) {
             $comment = "New comment!";
             $visibleOnFront = true;
-            $this->commentMock->expects($this->once())
+            $this->commentMock->expects($this->exactly(2))
                 ->method('getComment')
                 ->willReturn($comment);
 
@@ -178,6 +178,10 @@ public function testCreate()
                 ->method('addComment')
                 ->with($comment, $appendComment, $visibleOnFront)
                 ->willReturnSelf();
+
+            $this->shipmentMock->expects($this->once())
+                ->method('setCustomerNoteNotify')
+                ->with(true);
         }
 
         $this->assertEquals(

app/code/Magento/Sales/etc/fieldset.xml

@@ -486,6 +486,12 @@
                 <aspect name="to_quote_address_shipping" />
                 <aspect name="to_cm"/>
             </field>
+            <field name="discount_description">
+                <aspect name="to_quote" />
+                <aspect name="to_invoice" />
+                <aspect name="to_shipment" />
+                <aspect name="to_cm" />
+            </field>
             <field name="shipping_amount">
                 <aspect name="to_quote_address_shipping" />
                 <aspect name="to_cm"/>

dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Reports\Model\ResourceModel\Review\Customer;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Review\Customer\Collection
+     */
+    private $collection;
+
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Reports\Model\ResourceModel\Review\Customer\Collection::class
+        );
+    }
+
+    /**
+     * This tests covers issue described in:
+     * https://github.com/magento/magento2/issues/10301
+     *
+     * @magentoDataFixture Magento/Review/_files/customer_review.php
+     */
+    public function testSelectCountSql()
+    {
+        $this->collection->addFieldToFilter('customer_name', ['like' => '%John%'])->getItems();
+        $this->assertEquals(1, $this->collection->getSize());
+    }
+}

lib/internal/Magento/Framework/View/Page/Config.php

@@ -173,7 +173,7 @@ public function __construct(
         $this->setElementAttribute(
             self::ELEMENT_TYPE_HTML,
             self::HTML_ATTRIBUTE_LANG,
-            str_replace('_', '-', $this->localeResolver->getLocale())
+            strstr($this->localeResolver->getLocale(), '_', true)
         );
     }