Merged in feat/BOOK-529-update-GLA-design-mystay (pull request #3230)
Feat/BOOK-529 update GLA design mystay * feat(BOOK-529): update gla design on my stay * feat(BOOK-529): open gla modal if error * feat(BOOK-529): add inline accordion to storybook * feat(529): move errormessage below message * feat(529): update infomodal * feat(BOOK-529): update infomodal * feat(BOOK-529): hide guarantee info for adding ancillaries if prepaid * feat(BOOK-529): update width on info dialog * feat(BOOK-529): fix alignment * feat(BOOK-529): check if member price * feat(BOOK-529): refactor msg * feat(BOOK-529): refactor terms and conditions to own component * feat(BOOK-529): clean up confirmation step Approved-by: Christel Westerberg
This commit is contained in:
@@ -28,7 +28,7 @@ export function calculateTotalPrice(
|
||||
}
|
||||
// room.totalPrice is a negative value when
|
||||
// its a vouchers booking (╯°□°)╯︵ ┻━┻
|
||||
if (room.totalPrice && !room.vouchers) {
|
||||
if (room.totalPrice > 0) {
|
||||
total.cash = total.cash + room.totalPrice
|
||||
}
|
||||
return total
|
||||
@@ -42,13 +42,6 @@ export function calculateTotalPrice(
|
||||
)
|
||||
|
||||
let totalPrice = ""
|
||||
if (totals.cheques) {
|
||||
totalPrice = `${totals.cheques} ${CurrencyEnum.CC}`
|
||||
}
|
||||
if (totals.points) {
|
||||
const appendTotalPrice = totalPrice ? `${totalPrice} + ` : ""
|
||||
totalPrice = `${appendTotalPrice}${totals.points} ${CurrencyEnum.POINTS}`
|
||||
}
|
||||
if (totals.vouchers) {
|
||||
const appendTotalPrice = totalPrice ? `${totalPrice} + ` : ""
|
||||
totalPrice = `${appendTotalPrice}${totals.vouchers} ${intl.formatMessage(
|
||||
@@ -62,6 +55,13 @@ export function calculateTotalPrice(
|
||||
}
|
||||
)}`
|
||||
}
|
||||
if (totals.cheques) {
|
||||
totalPrice = `${totals.cheques} ${CurrencyEnum.CC}`
|
||||
}
|
||||
if (totals.points) {
|
||||
const appendTotalPrice = totalPrice ? `${totalPrice} + ` : ""
|
||||
totalPrice = `${appendTotalPrice}${totals.points} ${CurrencyEnum.POINTS}`
|
||||
}
|
||||
if (totals.cash) {
|
||||
const appendTotalPrice = totalPrice ? `${totalPrice} + ` : ""
|
||||
const cashPrice = formatPrice(intl, totals.cash, currency)
|
||||
|
||||
Reference in New Issue
Block a user