Merge branch 'main' of https://github.com/mage-os/mirror-commerce-dat…

…a-export
mage-os · Dec 19, 2023 · 5adf8b4 · 5adf8b4
2 parents 0f8abc1 + a51f56a
commit 5adf8b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/ProductPriceDataExporter/Model/Provider/ProductPrice.php b/ProductPriceDataExporter/Model/Provider/ProductPrice.php
@@ -245,7 +245,7 @@ private function addCustomerGroupPrices(
                 $prices[$key] = $fallbackPrice;
 
                 // override customer group specific fields
-                $this->addDiscountPrice($prices[$key], 'group', $priceValue, $pricePercentage, true);
+                $this->addDiscountPrice($prices[$key], 'group', $priceValue, $pricePercentage);
             }
 
             if ($row['rule_price'] !== null) {
@@ -315,22 +315,18 @@ private function buildKey(int|string $productId, int|string $websiteId, int|stri
      * @param string $code
      * @param ?string $price
      * @param ?string $percentage
-     * @param bool $override
      * @return void
      */
     private function addDiscountPrice(
         array &$priceFeedItem,
         string $code,
         string $price = null,
-        string $percentage = null,
-        bool $override = false
+        string $percentage = null
     ): void {
-        if ($override) {
-            foreach ($priceFeedItem['discounts'] as &$discount) {
-                if ($discount['code'] === $code) {
-                    $this->setPriceOrPercentageDiscount($discount, $price, $percentage);
-                    return;
-                }
+        foreach ($priceFeedItem['discounts'] as &$discount) {
+            if ($discount['code'] === $code) {
+                $this->setPriceOrPercentageDiscount($discount, $price, $percentage);
+                return;
             }
         }
         unset($discount);

diff --git a/ProductPriceDataExporter/Test/_files/simple_products.php b/ProductPriceDataExporter/Test/_files/simple_products.php
@@ -72,6 +72,7 @@
     ->setName('Simple Product With Special Price')
     ->setSku('simple_product_with_special_price')
     ->setPrice(100.10)
+    ->setData('special_price', 45.00)
     ->setWebsiteIds([$firstWebsiteId, $secondWebsiteId])
     ->setStatus(Status::STATUS_ENABLED);
 $productRepository->save($product2);