Merge pull request #3703 from craftcms/feature/pt-2184-5x-pring-rules-customer-condition-without-matching-customer

Fixed #3700 don’t generate prices if there aren’t any users applicable

Author: nfourtythree

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed a bug where tax categories that were not available to the product type were showing up for selection on the Edit Product screen. ([#3690](https://github.com/craftcms/commerce/issues/3690))
 - Fixed a bug where the store name was being displayed twice on the Edit Order screen.
 - Fixed a bug where the `CatalogPricingRule::$description` property was not being populated. ([#3699](https://github.com/craftcms/commerce/issues/3699))
+- Fixed a bug where catalog pricing rules were generating prices incorrectly. ([#3700](https://github.com/craftcms/commerce/issues/3700))
 
 ## 5.1.2 - 2024-09-19
 

src/services/CatalogPricing.php

@@ -84,6 +84,13 @@ public function generateCatalogPrices(?array $purchasableIds = null, ?array $cat
             return;
         }
 
+        // Rules with user ID records
+        $cprWithUserIds = (new Query())
+            ->select(['catalogPricingRuleId'])
+            ->from(Table::CATALOG_PRICING_RULES_USERS)
+            ->groupBy('catalogPricingRuleId')
+            ->column();
+
         // @TODO maybe mark prices as pending update here?
 
         $cprStartTime = microtime(true);
@@ -115,6 +122,11 @@ public function generateCatalogPrices(?array $purchasableIds = null, ?array $cat
                     continue;
                 }
 
+                // Skip if the rule has user conditions but didn't generate any applicable users
+                if (!empty($catalogPricingRule->getCustomerCondition()->getConditionRules()) && !in_array($catalogPricingRule->id, $cprWithUserIds, true)) {
+                    continue;
+                }
+
                 // If `getPurchasableIds()` is `null` this means all purchasables
                 if ($catalogPricingRule->getPurchasableIds() === null) {
                     $applyPurchasableIds = $purchasableIds;