Merge branch 'MC-18402' of github.com:magento-honey-badgers/magento2ce into MC-18402

Author: Prabhu Ram

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartPromotionsTest.php

@@ -11,11 +11,12 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\SalesRule\Api\RuleRepositoryInterface;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\Rule;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Tax\Model\ClassModel as TaxClassModel;
+use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory as TaxClassCollectionFactory;
 
 /**
  * Test cases for applying cart promotions to items in cart
@@ -56,14 +57,26 @@ public function testCartPromotionSingleCartRule()
         foreach ($ruleCollection as $rule) {
             $ruleLabels =  $rule->getStoreLabels();
         }
-
         $qty = 2;
         $cartId = $this->createEmptyCart();
         $this->addMultipleSimpleProductsToCart($cartId, $qty, $skus[0], $skus[1]);
         $query = $this->getCartItemPricesQuery($cartId);
         $response = $this->graphQlMutation($query);
         $this->assertCount(2, $response['cart']['items']);
         //validating the line item prices, quantity and discount
+        $this->assertLineItemDiscountPrices($response, $productsInCart, $qty, $ruleLabels);
+    }
+
+    /**
+     * Assert the row total discounts and individual discount break down and cart rule labels
+     *
+     * @param $response
+     * @param $productsInCart
+     * @param $qty
+     * @param $ruleLabels
+     */
+    private function assertLineItemDiscountPrices($response, $productsInCart, $qty, $ruleLabels)
+    {
         $productsInResponse = array_map(null, $response['cart']['items'], $productsInCart);
         $count = count($productsInCart);
         for ($itemIndex = 0; $itemIndex < $count; $itemIndex++) {
@@ -80,54 +93,17 @@ public function testCartPromotionSingleCartRule()
                             0 =>[
                                 'amount' =>
                                     ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5],
-                                'label' => $ruleLabels[0]
+                                'label' => 'TestRule_Label'
                             ]
                         ]
                     ],
                 ]
             );
         }
-
-        /** @var Collection $ruleCollection */
-       // $ruleCollection = $objectManager->get(Collection::class);
-        /** @var RuleRepositoryInterface $ruleRepository */
-       // $ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-
-        /** @var Rule $rule */
-//        foreach ($ruleCollection as $rule) {
-//            $ruleName = $rule->getName();
-//            if($ruleName === '50% Off on Large Orders'){
-//                $ruleId = $rule->getRuleId();
-                /** @var \Magento\SalesRule\Model\Data\Rule $salesRule */
-//                $salesRule = $ruleRepository->getById($ruleId);
-//                $salesRule->setStoreLabels(['store_labels' => 'Test Label']);
-
-//                $salesRule->setStoreLabels([
-//                        'store_labels' => [
-//                            [
-//                                'store_id' => 0,
-//                                'store_label' => 'TestRule_Label',
-//                            ]
-//                        ]
-//
-//                    ]
-//                );
-            //    $ruleRepository->save($salesRule);
-               // $salesRule->save();
-        /** @var Rule $salesRule */
-    //    $salesRule = $objectManager->get(Rule::class);
-//        $salesRule->setData
-//        ([
-//                'store_labels' => [0 => '50% discount for products in category']
-//            ]
-//        );
-//        $salesRule->save();
-
-
     }
 
     /**
-     * Test adding multiple cart rules to multiple products in a cart
+     * Test applying multiple cart rules to multiple products in a cart
      *
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoApiDataFixture Magento/SalesRule/_files/rules_category.php
@@ -174,15 +150,22 @@ public function testCartPromotionsMultipleCartRules()
         for ($itemIndex = 0; $itemIndex < $count; $itemIndex++) {
             $this->assertNotEmpty($productsInResponse[$itemIndex]);
             $lineItemDiscount = $productsInResponse[$itemIndex][0]['prices']['discounts'];
-            $expectedTotalDiscountValue = ($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5)+($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5*0.1);
-            $this->assertEquals($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5, current($lineItemDiscount)['amount']['value']);
+            $expectedTotalDiscountValue = ($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5) +
+                ($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5*0.1);
+            $this->assertEquals(
+                $productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5,
+                current($lineItemDiscount)['amount']['value']
+            );
             $this->assertEquals('TestRule_Label', current($lineItemDiscount)['label']);
 
             $lineItemDiscountValue = next($lineItemDiscount)['amount']['value'];
-            $this->assertEquals(round($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5)*0.1, $lineItemDiscountValue );
+            $this->assertEquals(
+                round($productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5)*0.1,
+                $lineItemDiscountValue
+            );
             $this->assertEquals('10% off with two items_Label', end($lineItemDiscount)['label']);
-            $actualTotalDiscountValue = $lineItemDiscount[0]['amount']['value'] + $lineItemDiscount[1]['amount']['value'];
-            $this->assertEquals(round($expectedTotalDiscountValue,2), $actualTotalDiscountValue);
+            $actualTotalDiscountValue = $lineItemDiscount[0]['amount']['value']+$lineItemDiscount[1]['amount']['value'];
+            $this->assertEquals(round($expectedTotalDiscountValue, 2), $actualTotalDiscountValue);
 
             //removing the elements from the response so that the rest of the response values can be compared
             unset($productsInResponse[$itemIndex][0]['prices']['discounts']);
@@ -200,6 +183,90 @@ public function testCartPromotionsMultipleCartRules()
         }
     }
 
+    /**
+     * Test applying single cart rules to multiple products in a cart with tax settings
+     * Tax settings are : Including and Excluding tax for Price Display and Shopping cart display settings
+     * Discount on Prices Includes Tax
+     * Tax rate = 7.5%
+     * Cart rule to apply 50% for products assigned to a specific category
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_price_and_cart_display_settings.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/rules_category.php
+     *
+     */
+    public function testCartPromotionsSingleCartRulesWithTaxes()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        /** @var Product $prod2 */
+        $prod1 = $productRepository->get('simple1');
+        $prod2 = $productRepository->get('simple2');
+        $productsInCart = [$prod1, $prod2];
+        $skus =['simple1', 'simple2'];
+
+        /** @var TaxClassCollectionFactory $taxClassCollectionFactory */
+        $taxClassCollectionFactory = $objectManager->get(TaxClassCollectionFactory::class);
+        $taxClassCollection = $taxClassCollectionFactory->create();
+
+        /** @var TaxClassModel $taxClass */
+        $taxClassCollection->addFieldToFilter('class_type', TaxClassModel::TAX_CLASS_TYPE_PRODUCT);
+        $taxClass = $taxClassCollection->getFirstItem();
+        foreach ($productsInCart as $product) {
+            $product->setCustomAttribute('tax_class_id', $taxClass->getClassId());
+            $productRepository->save($product);
+        }
+        $categoryId = 66;
+        /** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+        $categoryLinkManagement = $objectManager->create(CategoryLinkManagementInterface::class);
+        foreach ($skus as $sku) {
+            $categoryLinkManagement->assignProductToCategories(
+                $sku,
+                [$categoryId]
+            );
+        }
+        $qty = 1;
+        $cartId = $this->createEmptyCart();
+        $this->addMultipleSimpleProductsToCart($cartId, $qty, $skus[0], $skus[1]);
+        $this->setShippingAddressOnCart($cartId);
+        $query = $this->getCartItemPricesQuery($cartId);
+        $response = $this->graphQlMutation($query);
+        $this->assertCount(2, $response['cart']['items']);
+        $productsInResponse = array_map(null, $response['cart']['items'], $productsInCart);
+        $count = count($productsInCart);
+        for ($itemIndex = 0; $itemIndex < $count; $itemIndex++) {
+            $this->assertNotEmpty($productsInResponse[$itemIndex]);
+            $rowTotalIncludingTax = round(
+                $productsInCart[$itemIndex]->getSpecialPrice()*$qty +
+                $productsInCart[$itemIndex]->getSpecialPrice()*$qty*.075,
+                2
+            );
+            $this->assertResponseFields(
+                $productsInResponse[$itemIndex][0],
+                [
+                    'quantity' => $qty,
+                    'prices' => [
+                        // row_total is the line item price without the tax
+                        'row_total' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty],
+                        // row_total including tax is the price + price * tax rate
+                        'row_total_including_tax' => ['value' => $rowTotalIncludingTax],
+                        // discount from cart rule after tax is applied : 50% of row_total_including_tax
+                        'discount' => ['value' => round($rowTotalIncludingTax/2, 2)],
+                        'discounts' => [
+                            0 =>[
+                                'amount' =>
+                                    ['value' => round($rowTotalIncludingTax/2, 2)],
+                                'label' => 'TestRule_Label'
+                            ]
+                        ]
+                    ],
+                ]
+            );
+        }
+    }
+
     /**
      * @param string $cartId
      * @return string
@@ -292,4 +359,55 @@ private function addMultipleSimpleProductsToCart(string $cartId, int $qty, strin
         self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][1]['quantity']);
         self::assertEquals($sku2, $response['addSimpleProductsToCart']['cart']['items'][1]['product']['sku']);
     }
+
+    /**
+     * Set shipping address for the region for which tax rule is set
+     *
+     * @param string $cartId
+     * @return void
+     */
+    private function setShippingAddressOnCart(string $cartId) :void
+    {
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$cartId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "John"
+            lastname: "Doe"
+            company: "Magento"
+            street: ["test street 1", "test street 2"]
+            city: "Montgomery"
+            region: "AL"
+            postcode: "36043"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+        region{label}
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query);
+        self::assertEquals(
+            'Montgomery',
+            $response['setShippingAddressesOnCart']['cart']['shipping_addresses'][0]['city']
+        );
+        self::assertEquals(
+            'Alabama',
+            $response['setShippingAddressesOnCart']['cart']['shipping_addresses'][0]['region']['label']
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_price_and_cart_display_settings.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+//Apply discount on prices to include tax
+$configWriter->save('tax/calculation/discount_tax', '1');
+$configWriter->save('tax/display/type', '3');
+$configWriter->save('tax/display/shipping', '3');
+
+$configWriter->save('tax/cart_display/price', '3');
+$configWriter->save('tax/cart_display/subtotal', '3');
+$configWriter->save('tax/cart_display/shipping', '3');
+$configWriter->save('tax/cart_display/grandtotal', '1');
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();

dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_price_and_cart_display_settings_rollback.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+//Apply discount on prices to include tax
+$configWriter->save('tax/calculation/discount_tax', '0');
+$configWriter->save('tax/display/type', '1');
+$configWriter->save('tax/display/shipping', '1');
+
+$configWriter->save('tax/cart_display/price', '1');
+$configWriter->save('tax/cart_display/subtotal', '1');
+$configWriter->save('tax/cart_display/shipping', '1');
+$configWriter->save('tax/cart_display/grandtotal', '0');
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();

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

@@ -6,4 +6,4 @@
 declare(strict_types=1);
 
 // phpcs:ignore Magento2.Security.IncludeFile
-require __DIR__ . '/rules_rollback.php';
+require __DIR__ . '/rules_rollback.php';

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

@@ -3,11 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
 
 /** @var Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
 
 /** @var Magento\SalesRule\Model\Rule $rule */
 $rule = $registry->registry('_fixture/Magento_SalesRule_Multiple_Categories');
 
 $rule->delete();
+
+// logic to delete the category that was created as part of the rules_category fixture
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('name', 'Category 1')
+    ->create();
+
+/** @var CategoryListInterface $categoryList */
+$categoryList = $objectManager->get(CategoryListInterface::class);
+$categories = $categoryList->getList($searchCriteria)
+    ->getItems();
+
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+
+foreach ($categories as $category) {
+    $categoryRepository->delete($category);
+}

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

@@ -30,7 +30,8 @@
     ]
 );
 
-$salesRule->getConditions()->loadArray([
+$salesRule->getConditions()->loadArray(
+    [
     'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
     'attribute' => null,
     'operator' => null,
@@ -58,7 +59,8 @@
                         ],
                 ],
         ],
-]);
+    ]
+);
 
 $salesRule->save();