Skip to content

Commit b4e4e11

Browse files
committed
ACP2E-2646: [Cloud] Sales Rule not applied to first order of Multi Shipping
1 parent 277cc5f commit b4e4e11

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ protected function _compareValues($validatedValue, $value, $strict = true)
905905
public function validate(\Magento\Framework\Model\AbstractModel $model)
906906
{
907907
if (!$model->hasData($this->getAttribute())) {
908+
$model = clone $model;
908909
$model->load($model->getId());
909910
}
910911
$attributeValue = $model->getData($this->getAttribute());

app/code/Magento/SalesRule/Model/Quote/Discount.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ public function collect(
149149
}
150150
$items = [];
151151
foreach ($quote->getAllAddresses() as $quoteAddress) {
152-
if ($quote->getIsMultiShipping() && $quoteAddress->getId() !== $address->getId()) {
153-
continue;
154-
}
155152
foreach ($quoteAddress->getAllItems() as $item) {
156153
$items[] = $item;
157154
}

0 commit comments

Comments
 (0)