MAGETWO-89220: Cart rule using subselection condition incorrectly gives discount

Author: viktym

app/code/Magento/Quote/Model/Quote.php

@@ -1400,7 +1400,7 @@ public function getAllVisibleItems()
     {
         $items = [];
         foreach ($this->getItemsCollection() as $item) {
-            if (!$item->isDeleted() && !$item->getParentItemId()) {
+            if (!$item->isDeleted() && !$item->getParentItemId() && !$item->getParentItem()) {
                 $items[] = $item;
             }
         }

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -6,6 +6,14 @@
 
 namespace Magento\SalesRule\Model\Rule\Condition;
 
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -94,4 +102,71 @@ public function validateProductConditionDataProvider()
             ]
         ];
     }
+
+    /**
+     * Ensure that SalesRules filtering on quote items quantity validates configurable product correctly
+     *
+     * 1. Load a quote with a configured product and a sales rule set to filter items with quantity 2.
+     * 2. Attempt to validate the sales rule against the quote and assert the output is negative.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off.php
+     */
+    public function testValidateQtySalesRuleWithConfigurable()
+    {
+        // Load the quote that contains a child of a configurable product with quantity 1.
+        $quote = $this->getQuote('test_cart_with_configurable');
+
+        // Load the SalesRule looking for products with quantity 2.
+        $rule = $this->getSalesRule('10% Off on orders with two items');
+
+        $this->assertFalse(
+            $rule->validate($quote->getBillingAddress())
+        );
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+        return array_pop($items);
+    }
+
+    /**
+     * Gets rule by name.
+     *
+     * @param string $name
+     * @return \Magento\SalesRule\Model\Rule
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getSalesRule(string $name): \Magento\SalesRule\Model\Rule
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $ruleRepository = $this->objectManager->get(RuleRepositoryInterface::class);
+        $items = $ruleRepository->getList($searchCriteria)->getItems();
+
+        $rule = array_pop($items);
+        /** @var \Magento\SalesRule\Model\Converter\ToModel $converter */
+        $converter = $this->objectManager->get(\Magento\SalesRule\Model\Converter\ToModel::class);
+
+        return $converter->toModel($rule);
+    }
 }

dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$websiteId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)
+    ->getWebsite()
+    ->getId();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '10% Off on orders with two items',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_NO_COUPON,
+        'simple_action' => 'by_percent',
+        'discount_amount' => 10,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [$websiteId]
+    ]
+);
+
+$salesRule->getConditions()->loadArray([
+    'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+    'attribute' => null,
+    'operator' => null,
+    'value' => '1',
+    'is_value_processed' => null,
+    'aggregator' => 'all',
+    'conditions' =>
+        [
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Subselect::class,
+                'attribute' => 'qty',
+                'operator' => '==',
+                'value' => '2',
+                'is_value_processed' => null,
+                'aggregator' => 'all',
+                'conditions' =>
+                    [
+                        [
+                            'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                            'attribute' => 'attribute_set_id',
+                            'operator' => '==',
+                            'value' => '4',
+                            'is_value_processed' => false,
+                        ],
+                    ],
+            ],
+        ],
+]);
+
+$salesRule->save();