🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #19918: Fixed Issue #19917 Changed allowDrug to allowDrag (by @GovindaSharma)
 - #19904: [Forwardport]Fix issue 19902 - Store View label and Dropdown misaligned  (by @speedy008)
 - #19508: Fix issue 19507 - Frontend Minicart dropdown alignment issue (by @speedy008)
 - #19766: Update bootstrap.js (by @LuciferStrome)
 - #19888: Fixed incorrect spelling : Invocie -> Invoice (by @Surabhi-Cedcoss)
 - #19232: Don't return categoryId from registry if the product doesn't belong in the current category (by @ErikPel)


Fixed GitHub Issues:
 - #19917: allowDrug? ;-) (reported by @bartspiering) has been fixed in #19918 by @GovindaSharma in 2.3-develop branch
   Related commits:
     1. f2383b8

 - #19507: Frontend Minicart dropdown alignment issue (reported by @speedy008) has been fixed in #19508 by @speedy008 in 2.3-develop branch
   Related commits:
     1. edc9a5c
     2. 17ad0df
     3. d6ffca7
     4. f284eba
     5. 2c488bc
     6. e864a0c

 - #17819: Wrong product url from getProductUrl when current category has not product object (reported by @OleksiiBulba) has been fixed in #19232 by @ErikPel in 2.3-develop branch
   Related commits:
     1. a5dd6dc

Author: magento-engcom-team

app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml

@@ -11,7 +11,7 @@
     <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
         <annotations>
             <features value="Braintree"/>
-            <stories value="Get access to a New Credit Memo Page from Invocie for Order payed with online payment via Admin"/>
+            <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>
             <title value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
             <description value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
             <severity value="CRITICAL"/>
@@ -123,4 +123,4 @@
         <waitForPageLoad stepKey="waitForLoadNewCreditMemoPage"/>
         <see selector="{{AdminCreditMemoOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeNewCreditMemo"/>
     </test>
-</tests>
+</tests>

app/code/Magento/Catalog/Model/Product.php

@@ -727,7 +727,7 @@ public function getIdBySku($sku)
     public function getCategoryId()
     {
         $category = $this->_registry->registry('current_category');
-        if ($category) {
+        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
             return $category->getId();
         }
         return false;

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -549,6 +549,7 @@ public function testSetCategoryCollection()
 
     public function testGetCategory()
     {
+        $this->model->setData('category_ids', [10]);
         $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
         $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
         $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category));
@@ -557,14 +558,23 @@ public function testGetCategory()
 
     public function testGetCategoryId()
     {
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->model->setData('category_ids', [10]);
+        $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
 
         $this->registry->expects($this->at(0))->method('registry');
         $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category));
         $this->assertFalse($this->model->getCategoryId());
         $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));

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

@@ -80,7 +80,7 @@
                             // set the root node
                             this.root = new Ext.tree.TreeNode({
                                 text: 'ROOT',
-                                allowDrug:false,
+                                allowDrag:false,
                                 allowDrop:true,
                                 id:'1'
                             });

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js

@@ -26,7 +26,7 @@ define(function (require) {
         mageInit:       require('./mage-init'),
         keyboard:       require('./keyboard'),
         optgroup:       require('./optgroup'),
-        aferRender:     require('./after-render'),
+        afterRender:     require('./after-render'),
         autoselect:     require('./autoselect'),
         datepicker:     require('./datepicker'),
         outerClick:     require('./outer_click'),

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less

@@ -7,13 +7,13 @@
 //  Main elements -> Actions bar -> Store Switcher
 //  _____________________________________________
 
-//  ToDo UI: Consist old styles, should be changed with new design
+//  ToDo UI:  Consist old styles, should be changed with new design
 
 .store-switcher {
-    color: @text__color; // ToDo UI: Delete with admin scope
+    color: @text__color;
     float: left;
     font-size: round(@font-size__base - .1rem, 1);
-    margin-top: .7rem;
+    margin-top: .59rem;
 
     .admin__action-dropdown {
         background-color: @page-main-actions__background-color;
@@ -47,8 +47,8 @@
             width: 7px;
         }
         &::-webkit-scrollbar-thumb {
-            border-radius: 4px;
             background-color: rgba(0, 0, 0, .5);
+            border-radius: 4px;
         }
 
         li {
@@ -239,7 +239,6 @@
 
     .store-switcher-label {
         display: inline-block;
-        margin-top: @indent__s;
     }
 }
 

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

@@ -110,9 +110,9 @@
             @_toggle-selector: ~'.action.showcart',
             @_options-selector: ~'.block-minicart',
             @_dropdown-list-width: 320px,
-            @_dropdown-list-position-right: 0,
+            @_dropdown-list-position-right: -10px,
             @_dropdown-list-pointer-position: right,
-            @_dropdown-list-pointer-position-left-right: 26px,
+            @_dropdown-list-pointer-position-left-right: 12px,
             @_dropdown-list-z-index: 101,              
             @_dropdown-toggle-icon-content: @icon-cart,
             @_dropdown-toggle-active-icon-content: @icon-cart,
@@ -415,7 +415,6 @@
         margin-left: 13px;
 
         .block-minicart {
-            right: -15px;
             width: 390px;
         }
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php

@@ -69,7 +69,7 @@ public function testGetCategoryId()
     {
         $this->assertFalse($this->_model->getCategoryId());
         $category = new \Magento\Framework\DataObject(['id' => 5]);
-
+        $this->_model->setCategoryIds([5]);
         $this->objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
         try {
             $this->assertEquals(5, $this->_model->getCategoryId());
@@ -83,6 +83,7 @@ public function testGetCategoryId()
     public function testGetCategory()
     {
         $this->assertEmpty($this->_model->getCategory());
+        $this->_model->setCategoryIds([3]);
 
         $this->objectManager->get(\Magento\Framework\Registry::class)
             ->register('current_category', new \Magento\Framework\DataObject(['id' => 3]));