Skip to content

Commit

Permalink
Merge pull request #1221 from sharetribe/fix-currency-in-booking-brea…
Browse files Browse the repository at this point in the history
…kdown

Fix currency in booking breakdown
  • Loading branch information
OtterleyW authored Oct 25, 2019
2 parents d222105 + 35c3748 commit fcc9333
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern:

## Upcoming version 2019-XX-XX

- [fix] Use currency of the `lineItem` on every line of the `BookingBreakdown` if possible.
[#1221](https://github.com/sharetribe/flex-template-web/pull/1221)
- [fix] AvailabilityPlan doesn't need to have entries for every day.
[#1214](https://github.com/sharetribe/flex-template-web/pull/1214)
- [change] Default transaction process alias changed.
Expand Down
3 changes: 2 additions & 1 deletion src/components/BookingBreakdown/LineItemRefundMaybe.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const lineItemsTotal = lineItems => {
const amount = lineItems.reduce((total, item) => {
return total.plus(item.lineTotal.amount);
}, new Decimal(0));
return new Money(amount, config.currency);
const currency = lineItems[0] ? lineItems[0].lineTotal.currency : config.currency;
return new Money(amount, currency);
};

/**
Expand Down
3 changes: 2 additions & 1 deletion src/components/BookingBreakdown/LineItemSubTotalMaybe.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ const lineItemsTotal = lineItems => {
const amount = lineItems.reduce((total, item) => {
return total.plus(item.lineTotal.amount);
}, new Decimal(0));
return new Money(amount, config.currency);
const currency = lineItems[0] ? lineItems[0].lineTotal.currency : config.currency;
return new Money(amount, currency);
};

/**
Expand Down

0 comments on commit fcc9333

Please sign in to comment.