Merge branch '2.4-develop' into AC-13833-AC-13547

Author: magento-devops-queue-mgr-svc

app/code/Magento/Sales/Helper/Reorder.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Sales\Helper;
@@ -11,12 +11,7 @@
  */
 class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
-
-    /**
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $customerSession;
+    public const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
@@ -25,22 +20,21 @@ class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
     ) {
         $this->orderRepository = $orderRepository;
-        $this->customerSession = $customerSession;
         parent::__construct(
             $context
         );
     }
 
     /**
+     * Check if reorder is allowed
+     *
      * @return bool
      */
     public function isAllow()
@@ -78,10 +72,6 @@ public function canReorder($orderId)
         if (!$this->isAllowed($order->getStore())) {
             return false;
         }
-        if ($this->customerSession->isLoggedIn()) {
-            return $order->canReorder();
-        } else {
-            return true;
-        }
+        return $order->canReorder();
     }
 }

app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php

@@ -1,13 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Helper;
 
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
@@ -40,11 +39,6 @@ class ReorderTest extends TestCase
      */
     protected $orderMock;
 
-    /**
-     * @var MockObject|Session
-     */
-    protected $customerSessionMock;
-
     /**
      * @var OrderRepositoryInterface|MockObject
      */
@@ -66,15 +60,10 @@ protected function setUp(): void
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
 
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->repositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->helper = new Reorder(
             $contextMock,
-            $this->customerSessionMock,
             $this->repositoryMock
         );
 
@@ -156,40 +145,17 @@ public function testCanReorderStoreNotAllowed()
         $this->assertFalse($this->helper->canReorder(1));
     }
 
-    /**
-     * Tests what happens if the customer is not logged in and the store does allow re-orders.
-     *
-     * @return void
-     */
-    public function testCanReorderCustomerNotLoggedIn()
-    {
-        $this->setupOrderMock(true);
-
-        $this->customerSessionMock->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(false);
-        $this->repositoryMock->expects($this->once())
-            ->method('get')
-            ->with(1)
-            ->willReturn($this->orderMock);
-        $this->assertTrue($this->helper->canReorder(1));
-    }
-
     /**
      * Tests what happens if the customer is logged in and the order does or does not allow reorders.
      *
      * @param bool $orderCanReorder
      * @return void
      * @dataProvider getOrderCanReorder
      */
-    public function testCanReorderCustomerLoggedInAndOrderCanReorder($orderCanReorder)
+    public function testCanReorder($orderCanReorder)
     {
         $this->setupOrderMock(true);
 
-        $this->customerSessionMock->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(true);
-
         $this->orderMock->expects($this->once())
             ->method('canReorder')
             ->willReturn($orderCanReorder);

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\SalesRule\Model\Rule\Condition;
 
@@ -23,7 +23,7 @@ protected function _addSpecialAttributes(array &$attributes)
         $attributes['quote_item_price'] = __('Price in cart');
         $attributes['quote_item_row_total'] = __('Row total in cart');
 
-        $attributes['parent::category_ids'] = __('Category (Parent only)');
+        $attributes['parent::category_ids'] = __('Category (Parent Only)');
         $attributes['children::category_ids'] = __('Category (Children Only)');
     }
 
@@ -72,8 +72,8 @@ public function loadAttributeOptions()
             }
             $frontLabel = $attribute->getFrontendLabel();
             $attributes[$attribute->getAttributeCode()] = $frontLabel;
-            $attributes['parent::' . $attribute->getAttributeCode()] = $frontLabel . __('(Parent Only)');
-            $attributes['children::' . $attribute->getAttributeCode()] = $frontLabel . __('(Children Only)');
+            $attributes['parent::' . $attribute->getAttributeCode()] = __('%1 (Parent Only)', $frontLabel);
+            $attributes['children::' . $attribute->getAttributeCode()] = __('%1 (Children Only)', $frontLabel);
         }
 
         $this->_addSpecialAttributes($attributes);

app/code/Magento/SalesRule/i18n/en_US.csv

@@ -174,3 +174,7 @@ Apply,Apply
 "Code Quantity Limit","Code Quantity Limit"
 "For better performance max value allowed is 250,000. Set 0 to disable it.","For better performance max value allowed is 250,000. Set 0 to disable it."
 "coupon exceeds usage limit.","coupon exceeds usage limit."
+"Category (Parent Only)","Category (Parent Only)"
+"Category (Children Only)","Category (Children Only)"
+"%1 (Parent Only)","%1 (Parent Only)"
+"%1 (Children Only)","%1 (Children Only)"

app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2025 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -43,7 +43,7 @@
     max-width: 100%;
     padding-bottom: 1rem;
     padding-top: @data-grid-header-row__indent;
-    overflow-x: auto
+    overflow-x: visible
 }
 
 .admin__data-grid-loading-mask {

lib/internal/Magento/Framework/Filesystem/Driver/Http.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\Filesystem\Driver;
@@ -36,7 +36,7 @@ public function isExists($path)
             $status = $headers[1];
         }
 
-        return !(strpos($status, '200 OK') === false);
+        return !(strpos($status, '200') === false);
     }
 
     /**

lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -62,7 +62,7 @@ public function testIsExists(string $status, bool $result): void
      */
     public static function dataProviderForTestIsExists(): array
     {
-        return [['200 OK', true], ['404 Not Found', false]];
+        return [['200 OK', true], ['200', true], ['404 Not Found', false]];
     }
 
     /**