Merge branch 'ACP2E-3091' of https://github.com/adobe-commerce-tier-4/magento2ce into TIer4-PR-07-22-2024

Author: thiaramus

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Directory\Model\Currency;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\LocalizedException;
@@ -426,7 +427,7 @@ private function checkUnique(
             foreach ($prices[$tierPrice->getSku()] as $price) {
                 if ($price !== $tierPrice) {
                     $checkWebsiteValue = $isExistingPrice ? $this->compareWebsiteValue($price, $tierPrice)
-                        : ($price->getWebsiteId() == $tierPrice->getWebsiteId());
+                        : $this->compareWebsiteValueNewPrice($price, $tierPrice);
                     if (strtolower($price->getCustomerGroup()) === strtolower($tierPrice->getCustomerGroup())
                         && $price->getQuantity() == $tierPrice->getQuantity()
                         && $checkWebsiteValue
@@ -547,6 +548,29 @@ private function compareWebsiteValue(TierPriceInterface $price, TierPriceInterfa
                 && $price->getWebsiteId() != $tierPrice->getWebsiteId();
     }
 
+    /**
+     * Compare Website Values between for new price records
+     *
+     * @param TierPriceInterface $price
+     * @param TierPriceInterface $tierPrice
+     * @return bool
+     */
+    private function compareWebsiteValueNewPrice(TierPriceInterface $price, TierPriceInterface $tierPrice): bool
+    {
+        if ($price->getWebsiteId() == $this->allWebsitesValue ||
+            $tierPrice->getWebsiteId() == $this->allWebsitesValue
+        ) {
+            $baseCurrency = $this->scopeConfig->getValue(Currency::XML_PATH_CURRENCY_BASE, 'default');
+            $websiteId = max($price->getWebsiteId(), $tierPrice->getWebsiteId());
+            $website = $this->websiteRepository->getById($websiteId);
+            $websiteCurrency = $website->getBaseCurrencyCode();
+
+            return $baseCurrency == $websiteCurrency;
+        }
+
+        return $price->getWebsiteId() == $tierPrice->getWebsiteId();
+    }
+
     /**
      * @inheritDoc
      */

dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php

@@ -354,6 +354,53 @@ public function testCheckWebsite()
         }
     }
 
+    /**
+     * Test replace method.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testCheckNewRecords()
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/tier-prices',
+                'httpMethod' => Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Update',
+            ],
+        ];
+
+        $newPrices = [
+            [
+                'price' => 10.31,
+                'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
+                'website_id' => 0,
+                'sku' => self::SIMPLE_PRODUCT_SKU,
+                'customer_group' => self::CUSTOMER_ALL_GROUPS_NAME,
+                'quantity' => 2
+            ],
+            [
+                'price' => 20.62,
+                'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
+                'website_id' => 1,
+                'sku' => self::SIMPLE_PRODUCT_SKU,
+                'customer_group' => self::CUSTOMER_ALL_GROUPS_NAME,
+                'quantity' => 2
+            ]
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, ['prices' => $newPrices]);
+        $this->assertNotEmpty($response);
+        $message = 'We found a duplicate website, tier price, customer group and quantity: '
+            . 'Customer Group = %customerGroup, Website ID = %websiteId, Quantity = %qty. '
+            . 'Row ID: SKU = %SKU, Website ID: %websiteId, Customer Group: %customerGroup, Quantity: %qty.';
+        $this->assertEquals($message, $response[0]['message']);
+        $this->assertEquals('simple', $response[0]['parameters'][0]);
+    }
+
     /**
      * Check prise exists and is correct.
      *