ACP2E-3986: After applying ACP2E-3841, free shipping isn't always applied properly for multi address checkout

o-rykh · o-rykh · commit 242500b4fed1 · 2025-06-24T16:05:16.000-07:00
- fixed the original issue
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -168,6 +168,7 @@ public function validate(AbstractModel $model)
                 $subSelectConditionsFlag = $this->validateSubSelectConditions($item);
             }
             $total = $this->getBaseRowTotalForChildrenProduct($item, $attr, $total);
+            if ($subSelectConditionsFlag && $this->validateAttribute($total)) return true;
         }
         return $subSelectConditionsFlag && $this->validateAttribute($total);
     }

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ public function validate(AbstractModel $model)`
`168`	`168`	`$subSelectConditionsFlag = $this->validateSubSelectConditions($item);`
`169`	`169`	`}`
`170`	`170`	`$total = $this->getBaseRowTotalForChildrenProduct($item, $attr, $total);`
	`171`	`+ if ($subSelectConditionsFlag && $this->validateAttribute($total)) return true;`
`171`	`172`	`}`
`172`	`173`	`return $subSelectConditionsFlag && $this->validateAttribute($total);`
`173`	`174`	`}`