Merge branch 'issue-35981' of github.com:rogerdz/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

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

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\SalesRule\Model\Rule\Condition;
 
 /**
@@ -22,7 +21,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
     protected function _addSpecialAttributes(array &$attributes)
     {
         parent::_addSpecialAttributes($attributes);
-        $attributes['quote_item_qty'] = __('Quantity in cart');
+        $attributes['parent::quote_item_qty'] = __('Quantity in cart');
         $attributes['quote_item_price'] = __('Price in cart');
         $attributes['quote_item_row_total'] = __('Row total in cart');
 

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

@@ -45,7 +45,7 @@ public function getNewChildSelectOptions()
         $pAttributes = [];
         $iAttributes = [];
         foreach ($productAttributes as $code => $label) {
-            if (strpos($code, 'quote_item_') === 0) {
+            if (strpos($code, 'quote_item_') === 0 || strpos($code, 'parent::quote_item_') === 0) {
                 $iAttributes[] = [
                     'value' => \Magento\SalesRule\Model\Rule\Condition\Product::class . '|' . $code,
                     'label' => $label,

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/CombineTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model\Rule\Condition\Product;
+
+use Magento\Rule\Model\Condition\Context;
+use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
+use Magento\SalesRule\Model\Rule\Condition\Product\Combine;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class CombineTest extends TestCase
+{
+    /**
+     * @var Combine
+     */
+    private $model;
+
+    /**
+     * @var SalesRuleProduct|MockObject
+     */
+    private $ruleConditionMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->ruleConditionMock = $this->getMockBuilder(SalesRuleProduct::class)
+            ->setMethods(['loadAttributeOptions', 'getAttributeOption'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = new Combine(
+            $contextMock,
+            $this->ruleConditionMock,
+            []
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetNewChildSelectOptions()
+    {
+        $this->ruleConditionMock->expects($this->any())
+            ->method('loadAttributeOptions')
+            ->willReturn($this->ruleConditionMock);
+        $this->ruleConditionMock->expects($this->any())
+            ->method('getAttributeOption')
+            ->willReturn([
+                'parent::quote_item_qty' => __('Quantity in cart'),
+                'name' => __('Name')
+            ]);
+        $this->assertEquals([
+            [
+                'value' => '',
+                'label' => __('Please choose a condition to add.')],
+            [
+                'value' => Combine::class,
+                'label' => __('Conditions Combination'),
+            ],
+            [
+                'label' => __('Cart Item Attribute'),
+                'value' => [
+                    [
+                        'value' => SalesRuleProduct::class . '|' . 'parent::quote_item_qty',
+                        'label' => __('Quantity in cart'),
+                    ]
+                ]
+            ],
+            [
+                'label' => __('Product Attribute'),
+                'value' => [
+                    [
+                        'value' => SalesRuleProduct::class . '|' . 'name',
+                        'label' => __('Name'),
+                    ]
+                ]
+            ]
+        ], $this->model->getNewChildSelectOptions());
+    }
+}