Skip to content

Commit

Permalink
Merge pull request #424 from reactioncommerce/fix-aldeed-show-tax-in-…
Browse files Browse the repository at this point in the history
…summary

fix: show tax total in all summaries
  • Loading branch information
nnnnat committed Nov 12, 2018
2 parents 1defbae + f563fc1 commit 2000729
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/components/CheckoutSummary/CheckoutSummary.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class CheckoutSummary extends Component {
const {
fulfillmentTotal,
itemTotal,
taxTotal,
total
} = cart.checkout.summary;

Expand All @@ -93,6 +94,7 @@ class CheckoutSummary extends Component {
isDense
displayShipping={fulfillmentTotal && fulfillmentTotal.displayAmount}
displaySubtotal={itemTotal && itemTotal.displayAmount}
displayTax={taxTotal && taxTotal.displayAmount}
displayTotal={total && total.displayAmount}
itemsQuantity={cart.totalItemQuantity}
/>
Expand Down
2 changes: 2 additions & 0 deletions src/components/OrderSummary/OrderSummary.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class OrderSummary extends Component {
const {
fulfillmentTotal,
itemTotal,
taxTotal,
total
} = fulfillmentGroup.summary;

Expand All @@ -69,6 +70,7 @@ class OrderSummary extends Component {
isDense
displayShipping={fulfillmentTotal && fulfillmentTotal.displayAmount}
displaySubtotal={itemTotal && itemTotal.displayAmount}
displayTax={taxTotal && taxTotal.displayAmount}
displayTotal={total && total.displayAmount}
/>
</OrderSummaryContainer>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/cart.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,14 @@ class CartPage extends Component {
const { cart, classes } = this.props;

if (cart && cart.checkout && cart.checkout.summary && Array.isArray(cart.items) && cart.items.length) {
const { fulfillmentTotal, itemTotal, total } = cart.checkout.summary;
const { fulfillmentTotal, itemTotal, taxTotal, total } = cart.checkout.summary;

return (
<Grid item xs={12} md={3}>
<CartSummary
displayShipping={fulfillmentTotal && fulfillmentTotal.displayAmount}
displaySubtotal={itemTotal && itemTotal.displayAmount}
displayTax={taxTotal && taxTotal.displayAmount}
displayTotal={total && total.displayAmount}
itemsQuantity={cart.totalItemQuantity}
/>
Expand Down

0 comments on commit 2000729

Please sign in to comment.