Skip to content

Commit bc8cd5f

Browse files
author
Ievgen Shakhsuvarov
committed
MAGETWO-32831: Can not checkout with multiple addresses
1 parent 9b13e73 commit bc8cd5f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -597,17 +597,17 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
597597
$quote->reserveOrderId();
598598
$quote->collectTotals();
599599

600-
$order = $this->quoteAddressToOrder->convert($address);
600+
$order = $this->quoteAddressToOrder->convert($address, []);
601601
$order->setQuote($quote);
602-
$order->setBillingAddress($this->quoteAddressToOrderAddress->convert($quote->getBillingAddress()));
602+
$order->setBillingAddress($this->quoteAddressToOrderAddress->convert($quote->getBillingAddress(), []));
603603

604604
if ($address->getAddressType() == 'billing') {
605605
$order->setIsVirtual(1);
606606
} else {
607-
$order->setShippingAddress($this->quoteAddressToOrderAddress->addressToOrderAddress($address));
607+
$order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address, []));
608608
}
609609

610-
$order->setPayment($this->quotePaymentToOrderPayment->paymentToOrderPayment($quote->getPayment()));
610+
$order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment(), []));
611611
if ($this->priceCurrency->round($address->getGrandTotal()) == 0) {
612612
$order->getPayment()->setMethod('free');
613613
}
@@ -622,7 +622,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
622622
)->setProductOptions(
623623
$_quoteItem->getProduct()->getTypeInstance()->getOrderOptions($_quoteItem->getProduct())
624624
);
625-
$orderItem = $this->quoteItemToOrderItem->itemToOrderItem($item);
625+
$orderItem = $this->quoteItemToOrderItem->convert($_quoteItem, []);
626626
if ($item->getParentItem()) {
627627
$orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
628628
}

0 commit comments

Comments
 (0)