Skip to content

Collect totals in placeOrder when no paymentMethod provided #18768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 2 commits into from
Dec 10, 2018
Merged

Collect totals in placeOrder when no paymentMethod provided #18768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc9c31
Collect totals in placeOrder when no paymentMethod provided
pmclain Oct 23, 2018
389a16b
ENGCOM-3257: Collect totals in placeOrder when no paymentMethod provi…
slavvka Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions app/code/Magento/Quote/Model/QuoteManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
* @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Model\CustomerFactory $customerModelFactory
* @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
* @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
* @param StoreManagerInterface $storeManager
* @param \Magento\Checkout\Model\Session $checkoutSession
Expand Down Expand Up @@ -221,7 +221,7 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function createEmptyCart()
{
Expand All @@ -241,7 +241,7 @@ public function createEmptyCart()
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function createEmptyCartForCustomer($customerId)
{
Expand All @@ -257,7 +257,7 @@ public function createEmptyCartForCustomer($customerId)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function assignCustomer($cartId, $customerId, $storeId)
{
Expand Down Expand Up @@ -332,7 +332,7 @@ protected function createCustomerCart($customerId, $storeId)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
{
Expand All @@ -349,6 +349,8 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)

$data = $paymentMethod->getData();
$quote->getPayment()->importData($data);
} else {
$quote->collectTotals();
}

if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
Expand Down Expand Up @@ -379,7 +381,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getCartForCustomer($customerId)
{
Expand All @@ -406,6 +408,8 @@ public function submit(QuoteEntity $quote, $orderData = [])
}

/**
* Convert quote items to order items for quote
*
* @param Quote $quote
* @return array
*/
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ protected function setUp()
'setCustomerGroupId',
'assignCustomer',
'getPayment',
'collectTotals'
]);

$this->quoteAddressFactory = $this->createPartialMock(
Expand Down Expand Up @@ -687,6 +688,7 @@ public function testPlaceOrderIfCustomerIsGuest()
$service->expects($this->once())->method('submit')->willReturn($orderMock);

$this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
$this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();

$orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
$orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
Expand Down