Merge branch 'haroon-new-design' into 'development_new_design_2.0'

Shopping cart fix

See merge request Cloud_Solution/diplomatic-quarter!509
merge-update-with-lab-changes
haroon amjad 4 years ago
commit 6495e931d7

@ -133,7 +133,7 @@ class OrderPreviewViewModel extends BaseViewModel {
cartResponse.shoppingCarts.add(shoppingCart); cartResponse.shoppingCarts.add(shoppingCart);
totalAdditionalShippingCharge += shoppingCart.product.additionalShippingCharge; totalAdditionalShippingCharge += shoppingCart.product.additionalShippingCharge;
}); });
cartResponse.totalAmount = (cartResponse.subtotalWithVat + totalAdditionalShippingCharge + paymentCheckoutData.shippingOption.rateVat); if (paymentCheckoutData.shippingOption != null) cartResponse.totalAmount = (cartResponse.subtotalWithVat + totalAdditionalShippingCharge + paymentCheckoutData.shippingOption.rateVat);
return cartResponse; return cartResponse;
} }

Loading…
Cancel
Save