Skip to content

Commit 23791e4

Browse files
author
Ievgen Shakhsuvarov
committed
MAGETWO-32831: Can not checkout with multiple addresses
1 parent 38c5a03 commit 23791e4

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/Bundle/Model/Plugin/QuoteItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function aroundConvert(
2323
\Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
2424
Closure $proceed,
2525
\Magento\Quote\Model\Quote\Item\AbstractItem $item,
26-
$additional
26+
$additional = []
2727
) {
2828
/** @var $orderItem \Magento\Sales\Model\Order\Item */
2929
$orderItem = $proceed($item, $additional);

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->convert($address, []));
607+
$order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
608608
}
609609

610-
$order->setPayment($this->quotePaymentToOrderPayment->convert($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->convert($_quoteItem, []);
625+
$orderItem = $this->quoteItemToOrderItem->convert($_quoteItem);
626626
if ($item->getParentItem()) {
627627
$orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
628628
}

app/code/Magento/Tax/Model/Quote/ToOrderConverter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ToOrderConverter
2222
* @param array $additional
2323
* @return array
2424
*/
25-
public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $address, $additional)
25+
public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $address, $additional = [])
2626
{
2727
$this->quoteAddress = $address;
2828
return [$address, $additional];

0 commit comments

Comments
 (0)