Skip to content

Commit

Permalink
Merge branch 'trunk' into develop-pwa-studio-5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Cody Nguyen committed Jul 22, 2020
2 parents a4a0172 + 61478a1 commit 1b41795
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion app/code/Simi/Simiconnector/Model/Api/Orders.php
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,10 @@ public function show()

$order['billing_address'] = $this->simiObjectManager->get('Simi\Simiconnector\Helper\Address')
->getAddressDetail($quote->getBillingAddress(), $customer);
$order['shipping_address'] = $this->simiObjectManager->get('Simi\Simiconnector\Helper\Address')
if(!$quote->getIsVirtual()) {
$order['shipping_address'] = $this->simiObjectManager->get('Simi\Simiconnector\Helper\Address')
->getAddressDetail($quote->getShippingAddress(), $customer);
}
$order['shipping'] = $this->simiObjectManager->get('Simi\Simiconnector\Helper\Checkout\Shipping')
->getMethods();
$order['payment'] = $list_payment;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Simi/Simiconnector/Model/Api/Quoteitems.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function addToCart()
}

$product = $this->_initProduct($params['product']);
$cart->addProduct($product, $params);
$cart->addProduct($product, $params)->save();
$this->_getSession()->setCartWasUpdated(true);
// $this->eventManager->dispatch(
// 'checkout_cart_add_product_complete',
Expand Down

0 comments on commit 1b41795

Please sign in to comment.