🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests: - #20754: Fixed spelling mistakes in comment (by @cedmudit) - #20605: Gift-option-message-overlap-edit-and-remove-button ::Gift option mess… (by @ajay2jcommerce) - #20615: Fixed Minicart close button overlapping (by @mage2pratik) - #20630: Empty block rendering in My Account page sidebar fixed using designing changes. (by @mage2pratik) - #20625: Update Filter.php fix issue #20624 (by @irajneeshgupta) - #20218: Wishlist-alignment-issue-at-mobile (by @priti2jcommerce) - #20144: Fixed apply discount button alignment on checkout page (by @cedarvinda) - #20059: Typo Fixed in code. (by @adityayadav-cedcoss) - #19334: [Forwardport]Fix issue port 19328 - Success Message Icon vertically misaligned in admin panel (by @speedy008) Fixed GitHub Issues: - #20604: Gift option message overlap edit and remove button (reported by @ajay2jcommerce) has been fixed in #20605 by @ajay2jcommerce in 2.3-develop branch Related commits: 1. 93b34b0 - #20614: Minicart close button overlapping in shipping address section whenever any user open minicart in mobile view on the checkout page (reported by @mage2pratik) has been fixed in #20615 by @mage2pratik in 2.3-develop branch Related commits: 1. e9c1157 - #19139: Empty block rendering in My Account page sidebar (reported by @rafaelstz) has been fixed in #20630 by @mage2pratik in 2.3-develop branch Related commits: 1. 21567eb - #20624: `\Magento\ImportExport\Block\Adminhtml\Export\Filter::_getSelectHtmlWithValue()` method overwrites self $value argument (reported by @andkirby) has been fixed in #20625 by @irajneeshgupta in 2.3-develop branch Related commits: 1. 7e46917 2. de2010c - #20137: On checkout page apply discount button is not align with input box (reported by @nainesh2jcommerce) has been fixed in #20144 by @cedarvinda in 2.3-develop branch Related commits: 1. 4441124 2. fe78cec 3. 2b9366f - #19328: Success Message Icon vertically misaligned in admin panel (reported by @speedy008) has been fixed in #19334 by @speedy008 in 2.3-develop branch Related commits: 1. 6be4ebf 2. 0cabc15 3. 67c59ec 4. da33798
magento · Jan 31, 2019 · 4f23251 · 4f23251
2 parents 2abb4fb + 69b152d
commit 4f23251
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 37 deletions.
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -8,7 +8,7 @@
 
 use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Accordion;
-use Magento\Backend\Block\Widget\Tabs as WigetTabs;
+use Magento\Backend\Block\Widget\Tabs as WidgetTabs;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Catalog\Helper\Catalog;
 use Magento\Catalog\Helper\Data;
@@ -22,7 +22,7 @@
  * Admin product edit tabs
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Tabs extends WigetTabs
+class Tabs extends WidgetTabs
 {
     const BASIC_TAB_GROUP_CODE = 'basic';
 
@@ -109,7 +109,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -119,6 +119,8 @@ protected function _construct()
     }
 
     /**
+     * Get group collection.
+     *
      * @param int $attributeSetId
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection
      */
@@ -131,10 +133,11 @@ public function getGroupCollection($attributeSetId)
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _prepareLayout()
     {
@@ -315,6 +318,8 @@ public function getAttributeTabBlock()
     }
 
     /**
+     * Set attribute tab block.
+     *
      * @param string $attributeTabBlock
      * @return $this
      */
@@ -337,6 +342,8 @@ protected function _translateHtml($html)
     }
 
     /**
+     * Get accordion.
+     *
      * @param string $parentTab
      * @return string
      */

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -8,11 +8,11 @@
 
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Product Test
@@ -180,7 +180,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $extensionAttrbutes;
+    private $extensionAttributes;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -200,7 +200,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ProductExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $extensionAttributes;
+    private $productExtAttributes;
 
     /**
      * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
@@ -218,7 +218,7 @@ protected function setUp()
             \Magento\Framework\Module\Manager::class,
             ['isEnabled']
         );
-        $this->extensionAttrbutes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
+        $this->extensionAttributes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
             ->setMethods(['getWebsiteIds', 'setWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -372,13 +372,13 @@ protected function setUp()
         $this->mediaConfig = $this->createMock(\Magento\Catalog\Model\Product\Media\Config::class);
         $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
 
-        $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
+        $this->productExtAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem'])
             ->getMockForAbstractClass();
         $this->extensionAttributesFactory
             ->expects($this->any())
             ->method('create')
-            ->willReturn($this->extensionAttributes);
+            ->willReturn($this->productExtAttributes);
 
         $this->filterCustomAttribute = $this->createTestProxy(
             \Magento\Catalog\Model\FilterProductCustomAttribute::class
@@ -567,14 +567,6 @@ public function testGetCategoryId()
         $this->assertEquals(10, $this->model->getCategoryId());
     }
 
-    public function testGetCategoryIdWhenProductNotInCurrentCategory()
-    {
-        $this->model->setData('category_ids', [12]);
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
-        $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
-        $this->assertFalse($this->model->getCategoryId());
-    }
-
     public function testGetIdBySku()
     {
         $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));

diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -222,7 +222,7 @@ public function getStreet()
     }
 
     /**
-     * Get steet line by number
+     * Get street line by number
      *
      * @param int $number
      * @return string

diff --git a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
@@ -15,7 +15,7 @@
 interface AddressModelInterface
 {
     /**
-     * Get steet line by number
+     * Get street line by number
      *
      * @param int $number
      * @return string

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -237,8 +237,8 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = [];
 
-            foreach ($attribute->getFilterOptions() as $value => $label) {
-                $options[] = ['value' => $value, 'label' => $label];
+            foreach ($attribute->getFilterOptions() as $optionValue => $label) {
+                $options[] = ['value' => $optionValue, 'label' => $label];
             }
         } else {
             $options = $attribute->getSource()->getAllOptions(false);

diff --git a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
@@ -6,7 +6,7 @@
 namespace Magento\Paypal\Model\Billing;
 
 /**
- * Billing Agreement abstaract class
+ * Billing Agreement abstract class
  */
 abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
 {

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -8,6 +8,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Credit memo adjustmets block
+ *
  * @api
  * @since 100.0.2
  */
@@ -50,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Initialize creditmemo agjustment totals
+     * Initialize creditmemo adjustment totals
      *
      * @return $this
      */

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,8 @@
         position: absolute;
         speak: none;
         text-shadow: none;
-        top: 1.5rem;
+        top: 50%;
+        margin-top: -1.25rem;
         width: auto;
     }
 }

diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -350,7 +350,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }

diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -195,10 +195,10 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {

diff --git a/...ontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/...ontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,6 +69,13 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
+            .primary {
+                .action {
+                    &.action-apply {
+                        margin-right: 0;
+                    }
+                }
+            }
         }
 
         .payment-option-inner {

diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -421,6 +421,12 @@
         .column.main {
             width: 77.7%;
         }
+
+        .sidebar-main {
+            .block {
+                margin-bottom: 0;
+            }
+        }
     }
 
     .account {
@@ -532,11 +538,18 @@
         .column.main,
         .sidebar-additional {
             margin: 0;
+            padding: 0;
         }
 
         .data.table {
             &:extend(.abs-table-striped-mobile all);
         }
+
+        .sidebar-main {
+            .account-nav {
+                margin-bottom: 0;
+            }
+        }
     }
 }
 

diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -246,6 +246,9 @@
     .gift-messages-order {
         margin-bottom: @indent__m;
     }
+    .gift-message-summary {
+        padding-right: 7rem;
+    }
 }
 
 //
@@ -282,10 +285,6 @@
         }
     }
 
-    .gift-message-summary {
-        padding-right: 7rem;
-    }
-
     //
     //  In-table block
     //  ---------------------------------------------

diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -429,7 +429,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }

diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -203,11 +203,11 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
 
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {

diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -58,7 +58,7 @@
 
     .modal-custom {
         .action-close {
-            .lib-css(margin, @indent__m);
+            .lib-css(margin, 15px);
         }
     }