Skip to content

Commit 6393f71

Browse files
MC-37761: Issues when using multiple address checkout
1 parent 5977749 commit 6393f71

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

app/code/Magento/Tax/Model/Plugin/OrderSave.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ public function afterSave(
5050
}
5151

5252
/**
53+
* Save order tax
54+
*
5355
* @param \Magento\Sales\Api\Data\OrderInterface $order
5456
* @return $this
5557
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
5658
* @SuppressWarnings(PHPMD.NPathComplexity)
5759
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
60+
* phpcs:disable Generic.Metrics.NestingLevel.TooHigh
5861
*/
5962
protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
6063
{
@@ -176,7 +179,9 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
176179
} elseif (isset($quoteItemId['associated_item_id'])) {
177180
//This item is associated with a product item
178181
$item = $order->getItemByQuoteItemId($quoteItemId['associated_item_id']);
179-
$associatedItemId = $item->getId();
182+
if ($item !== null && $item->getId()) {
183+
$associatedItemId = $item->getId();
184+
}
180185
}
181186

182187
$data = [

0 commit comments

Comments
 (0)