Merge remote-tracking branch 'origin/MAGETWO-93692' into 2.3-develop

Author: serhii-balko

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -6,6 +6,7 @@
 
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
+use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
 
@@ -209,7 +210,9 @@ public function setValidationFilter(
                 $andWhereCondition = implode(' AND ', $andWhereConditions);
 
                 $select->where(
-                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')'
+                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
+                    null,
+                    Select::TYPE_CONDITION
                 );
             } else {
                 $this->addFieldToFilter(
@@ -320,7 +323,7 @@ public function addAttributeInConditionFilter($attributeCode)
         $this->getSelect()->where(
             sprintf('(%s OR %s)', $cCond, $aCond),
             null,
-            \Magento\Framework\DB\Select::TYPE_CONDITION
+            Select::TYPE_CONDITION
         );
 
         return $this;

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

@@ -93,6 +93,36 @@ public function applyFixedDiscountDataProvider(): array
         ];
     }
 
+    /**
+     * Tests that coupon with wildcard symbols in code can be successfully applied.
+     *
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testCouponCodeWithWildcard()
+    {
+        $expectedDiscount = '-5.00';
+        $couponCode =  '2?ds5!2d';
+        $cartId = $this->cartManagement->createEmptyCart();
+        $productPrice = 10;
+
+        $product = $this->createProduct($productPrice);
+
+        /** @var CartItemInterface $quoteItem */
+        $quoteItem = Bootstrap::getObjectManager()->create(CartItemInterface::class);
+        $quoteItem->setQuoteId($cartId);
+        $quoteItem->setProduct($product);
+        $quoteItem->setQty(1);
+        $this->cartItemRepository->save($quoteItem);
+
+        $this->couponManagement->set($cartId, $couponCode);
+
+        /** @var GuestCartTotalRepositoryInterface $cartTotalRepository */
+        $cartTotalRepository = Bootstrap::getObjectManager()->get(GuestCartTotalRepositoryInterface::class);
+        $total = $cartTotalRepository->get($cartId);
+
+        $this->assertEquals($expectedDiscount, $total->getBaseDiscountAmount());
+    }
+
     /**
      * Returns simple product with given price.
      *

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

@@ -0,0 +1,45 @@
+<?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\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '5$ fixed discount on whole cart',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'conditions' => [],
+        'simple_action' => Rule::CART_FIXED_ACTION,
+        'discount_amount' => 5,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+        ],
+    ]
+);
+$objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
+
+// Create coupon and assign "15$ fixed discount" rule to this coupon.
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode('2?ds5!2d')
+    ->setType(0);
+
+/** @var CouponRepositoryInterface $couponRepository */
+$couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+$couponRepository->save($coupon);

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

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = getSalesRule('5$ fixed discount on whole cart');
+if ($salesRule !== null) {
+    /** @var RuleRepositoryInterface $ruleRepository */
+    $ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+    $ruleRepository->deleteById($salesRule->getRuleId());
+}
+
+$coupon = $objectManager->create(Coupon::class);
+$coupon->loadByCode('2?ds5!2d');
+if ($coupon->getCouponId()) {
+    /** @var CouponRepositoryInterface $couponRepository */
+    $couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+    $couponRepository->deleteById($coupon->getCouponId());
+}
+
+function getSalesRule(string $name)
+{
+    /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+    $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+    $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+        ->create();
+
+    /** @var RuleRepositoryInterface $ruleRepository */
+    $ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+    $items = $ruleRepository->getList($searchCriteria)
+        ->getItems();
+
+    return array_pop($items);
+}