🔃 [EngCom] Public Pull Requests - 2.3-develop

Oleksii Korshenko · web-flow · commit 221e2a48991d · 2018-02-01T21:33:20.000-06:00
Accepted Public Pull Requests: - magento-engcom/magento2ce#1325: [EngCom Team] Batch 23. Forwardports to 2.3-develop (by @magento-engcom-team) - #13301: Add @see tag to deprecated property (by @akiojalehto) - #13304: Fix misspellings in method names and deprecate old ones (by @akiojalehto) Fixed GitHub Issues: - #10128: New Orders not being saved to order grid (reported by @joergmaertin) has been fixed in magento-engcom/magento2ce#1325 by @magento-engcom-team in 2.3-develop branch Related commits: 1. e84cb3e 2. 742819b 3. cc2b11f 4. ae8b187 5. 35b3c02 6. eae8936 7. 90e4923 8. b098dbc 9. e8e4cdd 10. 058e5e5 11. 9368d5d 12. bf19409 13. a15ec34 14. 9e4ce76 15. 0995681 16. 6772a2d 17. b0d6bfc 18. b037357 19. 8de5951 - #11740: Sending emails from Admin in Multi-Store Environment defaults to Primary Store (reported by @lee586) has been fixed in magento-engcom/magento2ce#1325 by @magento-engcom-team in 2.3-develop branch Related commits: 1. e84cb3e 2. 742819b 3. cc2b11f 4. ae8b187 5. 35b3c02 6. eae8936 7. 90e4923 8. b098dbc 9. e8e4cdd 10. 058e5e5 11. 9368d5d 12. bf19409 13. a15ec34 14. 9e4ce76 15. 0995681 16. 6772a2d 17. b0d6bfc 18. b037357 19. 8de5951 - #12209: Substitution payment method - Incorrect message (reported by @ihor-sviziev) has been fixed in magento-engcom/magento2ce#1325 by @magento-engcom-team in 2.3-develop branch Related commits: 1. e84cb3e 2. 742819b 3. cc2b11f 4. ae8b187 5. 35b3c02 6. eae8936 7. 90e4923 8. b098dbc 9. e8e4cdd 10. 058e5e5 11. 9368d5d 12. bf19409 13. a15ec34 14. 9e4ce76 15. 0995681 16. 6772a2d 17. b0d6bfc 18. b037357 19. 8de5951 - #12601: A space between the category page and the main footer when applying specific settings (reported by @wd7080) has been fixed in magento-engcom/magento2ce#1325 by @magento-engcom-team in 2.3-develop branch Related commits: 1. e84cb3e 2. 742819b 3. cc2b11f 4. ae8b187 5. 35b3c02 6. eae8936 7. 90e4923 8. b098dbc 9. e8e4cdd 10. 058e5e5 11. 9368d5d 12. bf19409 13. a15ec34 14. 9e4ce76 15. 0995681 16. 6772a2d 17. b0d6bfc 18. b037357 19. 8de5951
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -92,7 +92,7 @@ protected function _prepareCollection()
     protected function _afterLoadCollection()
     {
         foreach ($this->getCollection() as $item) {
-            $item->getCustomer() ?: $item->setCustomer('Guest');
+            $item->getCustomer() ?: $item->setCustomer($item->getBillingAddress()->getName());
         }
         return $this;
     }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -24,7 +24,7 @@
                 <div class="field">
                     <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
                     <div class="control">
-                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" />
+                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
                     </div>
                 </div>
                 <div class="actions-toolbar">
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -36,12 +36,21 @@ public function __construct(
         parent::__construct($context, $data);
     }
 
+    /**
+     * @deprecated Misspelled method
+     * @see getCompatibleInputTypes
+     */
+    public function getComaptibleInputTypes()
+    {
+        return $this->getCompatibleInputTypes();
+    }
+
     /**
      * Get compatible input types.
      *
      * @return array
      */
-    public function getComaptibleInputTypes()
+    public function getCompatibleInputTypes()
     {
         return $this->inputtype->getVolatileInputTypes();
     }
diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -23,6 +23,7 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
      * @deprecated 100.2.0 please use instead \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
+     * @see $attributeCollectionFactory
      */
     protected $attributeCollection;
 
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -71,7 +71,7 @@ public function getText()
         return __(
             'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
             $url,
-            'http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html#config-cli-cron-bkg'
+            'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
         );
         //@codingStandardsIgnoreEnd
     }
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
@@ -10,6 +10,8 @@
  */
 ?>
 <div>
-    <?php $block->escapeHtml($block->getMethod()->getTitle());?>
+    <?= $block->getMethod()->getTitle()
+        ? $block->escapeHtml($block->getMethod()->getTitle())
+        : $block->escapeHtml(__('Payment method')); ?>
     <?= $block->escapeHtml(__(' is not available. You still can process offline actions.')) ?>
 </div>
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating.php b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
@@ -41,9 +41,18 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @deprecated Misspelled method
+     * @see initEntityId
      */
     protected function initEnityId()
+    {
+        $this->initEntityId();
+    }
+
+    /**
+     * @return void
+     */
+    protected function initEntityId()
     {
         $this->coreRegistry->register(
             'entityId',
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
@@ -15,7 +15,7 @@ class Edit extends RatingController
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Review\Model\Rating $ratingModel */
         $ratingModel = $this->_objectManager->create(\Magento\Review\Model\Rating::class);
         if ($this->getRequest()->getParam('id')) {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
@@ -15,7 +15,7 @@ class Index extends RatingController
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_ratings');
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -17,7 +17,7 @@ class Save extends RatingController
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if ($this->getRequest()->getPostValue()) {
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Email;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -26,19 +28,29 @@ class SenderBuilder
      */
     protected $transportBuilder;
 
+    /**
+     * @var TransportBuilderByStore
+     */
+    private $transportBuilderByStore;
+
     /**
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
+     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder
+        TransportBuilder $transportBuilder,
+        TransportBuilderByStore $transportBuilderByStore = null
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
         $this->transportBuilder = $transportBuilder;
+        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
+            TransportBuilderByStore::class
+        );
     }
 
     /**
@@ -98,6 +110,9 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilder->setFrom($this->identityContainer->getEmailIdentity());
+        $this->transportBuilderByStore->setFromByStore(
+            $this->identityContainer->getEmailIdentity(),
+            $this->identityContainer->getStore()->getId()
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\SenderBuilder;
 
 class SenderBuilderTest extends \PHPUnit\Framework\TestCase
@@ -29,6 +31,16 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $transportBuilder;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transportBuilderByStore;
+
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -42,7 +54,11 @@ protected function setUp()
             ['getTemplateVars', 'getTemplateOptions', 'getTemplateId']
         );
 
-        $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']);
+        $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+            'getStoreId',
+            '__wakeup',
+            'getId',
+        ]);
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class,
@@ -52,15 +68,24 @@ protected function setUp()
                 'getCustomerName',
                 'getTemplateOptions',
                 'getEmailCopyTo',
-                'getCopyMethod'
+                'getCopyMethod',
+                'getStore',
             ]
         );
 
-        $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class, [
-                'addTo', 'addBcc', 'getTransport',
-                'setTemplateIdentifier', 'setTemplateOptions', 'setTemplateVars',
-                'setFrom',
-            ]);
+        $this->transportBuilder = $this->createPartialMock(
+            \Magento\Framework\Mail\Template\TransportBuilder::class,
+            [
+                'addTo',
+                'addBcc',
+                'getTransport',
+                'setTemplateIdentifier',
+                'setTemplateOptions',
+                'setTemplateVars',
+            ]
+        );
+
+        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
 
         $this->templateContainerMock->expects($this->once())
             ->method('getTemplateId')
@@ -84,8 +109,8 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
-        $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+        $this->transportBuilderByStore->expects($this->once())
+            ->method('setFromByStore')
             ->with($this->equalTo($emailIdentity));
 
         $this->identityContainerMock->expects($this->once())
@@ -95,7 +120,8 @@ protected function setUp()
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
-            $this->transportBuilder
+            $this->transportBuilder,
+            $this->transportBuilderByStore
         );
     }
 
@@ -119,6 +145,12 @@ public function testSend()
         $this->identityContainerMock->expects($this->once())
             ->method('getCustomerName')
             ->will($this->returnValue($customerName));
+        $this->identityContainerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -145,7 +177,12 @@ public function testSendCopyTo()
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
-
+        $this->identityContainerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
         $this->transportBuilder->expects($this->once())
             ->method('getTransport')
             ->will($this->returnValue($transportMock));
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -27,7 +27,7 @@
                                id="discount-code"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
-                               data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+                               data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/region.js b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
@@ -35,6 +35,11 @@ define([
                 return;
             }
             option = options[value];
+
+            if (typeof option === 'undefined') {
+                return;
+            }
+
             defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
 
             if (this.skipValidation) {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_structure.less b/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
@@ -36,6 +36,7 @@ body {
 //  ToDo UI: should be moved to messages
 .notices-wrapper {
     margin: 0 3rem;
+    min-height: 5rem;
     .messages {
         margin-bottom: 0;
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -497,6 +497,16 @@
         }
     }
 
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -566,6 +566,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php
@@ -140,7 +140,7 @@ protected function prepareOrder()
                 [
                     'shipping' => [
                         'address' => $address,
-                        'method' => 'Flat Rate - Fixed'
+                        'method' => 'flatrate_flatrate'
                     ],
                     'items' => [$orderItem->getData()],
                     'stock_id' => null,
@@ -232,6 +232,9 @@ public function testOrderCreate()
         $this->assertEquals($order['grand_total'], $model->getGrandTotal());
         $this->assertNotNull($model->getShippingAddress());
         $this->assertTrue((bool)$model->getShippingAddress()->getId());
-        $this->assertEquals('Flat Rate - Fixed', $model->getShippingMethod());
+        $this->assertEquals('Flat Rate - Fixed', $model->getShippingDescription());
+        $shippingMethod = $model->getShippingMethod(true);
+        $this->assertEquals('flatrate', $shippingMethod['carrier_code']);
+        $this->assertEquals('flatrate', $shippingMethod['method']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Orders/GridTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Orders/GridTest.php
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function _prepareCollection()`
`92`	`92`	`protected function _afterLoadCollection()`
`93`	`93`	`{`
`94`	`94`	`foreach ($this->getCollection() as $item) {`
`95`		`- $item->getCustomer() ?: $item->setCustomer('Guest');`
	`95`	`+ $item->getCustomer() ?: $item->setCustomer($item->getBillingAddress()->getName());`
`96`	`96`	`}`
`97`	`97`	`return $this;`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,21 @@ public function __construct(`
`36`	`36`	`parent::__construct($context, $data);`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ /**`
	`40`	`+ * @deprecated Misspelled method`
	`41`	`+ * @see getCompatibleInputTypes`
	`42`	`+ */`
	`43`	`+ public function getComaptibleInputTypes()`
	`44`	`+ {`
	`45`	`+ return $this->getCompatibleInputTypes();`
	`46`	`+ }`
	`47`	`+`
`39`	`48`	`/**`
`40`	`49`	`* Get compatible input types.`
`41`	`50`	`*`
`42`	`51`	`* @return array`
`43`	`52`	`*/`
`44`		`- public function getComaptibleInputTypes()`
	`53`	`+ public function getCompatibleInputTypes()`
`45`	`54`	`{`
`46`	`55`	`return $this->inputtype->getVolatileInputTypes();`
`47`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function getText()`
`71`	`71`	`return __(`
`72`	`72`	`'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',`
`73`	`73`	`$url,`
`74`		`- 'http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html#config-cli-cron-bkg'`
	`74`	`+ 'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'`
`75`	`75`	`);`
`76`	`76`	`//@codingStandardsIgnoreEnd`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Edit extends RatingController`
`15`	`15`	`*/`
`16`	`16`	`public function execute()`
`17`	`17`	`{`
`18`		`- $this->initEnityId();`
	`18`	`+ $this->initEntityId();`
`19`	`19`	`/** @var \Magento\Review\Model\Rating $ratingModel */`
`20`	`20`	`$ratingModel = $this->_objectManager->create(\Magento\Review\Model\Rating::class);`
`21`	`21`	`if ($this->getRequest()->getParam('id')) {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Index extends RatingController`
`15`	`15`	`*/`
`16`	`16`	`public function execute()`
`17`	`17`	`{`
`18`		`- $this->initEnityId();`
	`18`	`+ $this->initEntityId();`
`19`	`19`	`/** @var \Magento\Backend\Model\View\Result\Page $resultPage */`
`20`	`20`	`$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);`
`21`	`21`	`$resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_ratings');`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Save extends RatingController`
`17`	`17`	`*/`
`18`	`18`	`public function execute()`
`19`	`19`	`{`
`20`		`- $this->initEnityId();`
	`20`	`+ $this->initEntityId();`
`21`	`21`	`/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */`
`22`	`22`	`$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);`
`23`	`23`	`if ($this->getRequest()->getPostValue()) {`