diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/actionButtons.module.css b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/actionButtons.module.css index 875ee841b..f5822f169 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/actionButtons.module.css +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/actionButtons.module.css @@ -2,12 +2,12 @@ display: flex; gap: var(--Spacing-x4); justify-content: flex-end; - padding: var(--Space-x2) var(--Space-x15) 0; + padding: var(--Space-x2) var(--Space-x15) 0 0; } .confirmButtons { display: flex; - padding: 0 var(--Space-x15); + padding-left: var(--Space-x15); justify-content: space-between; align-items: baseline; } diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/index.tsx index 892548b18..782d21eae 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/ActionButtons/index.tsx @@ -25,6 +25,7 @@ export default function ActionButtons({ }: ActionButtonsProps) { const { currentStep, + isBreakfast, prevStep, prevStepMobile, selectQuantity, @@ -33,6 +34,7 @@ export default function ActionButtons({ selectedAncillary, } = useAddAncillaryStore((state) => ({ currentStep: state.currentStep, + isBreakfast: state.isBreakfast, prevStep: state.prevStep, prevStepMobile: state.prevStepMobile, selectQuantity: state.selectQuantity, @@ -96,19 +98,13 @@ export default function ActionButtons({ {intl.formatMessage({ defaultMessage: "Price details", })} - {isPriceDetailsOpen ? ( - - ) : ( - - )} + )}
@@ -140,7 +136,7 @@ export default function ActionButtons({
- {isPriceDetailsOpen && ( + {isPriceDetailsOpen && currentStep === AncillaryStepEnum.confirmation && ( state.breakfastData) - const { setValue } = useFormContext() - - setValue("quantityWithCard", 1) - if (!breakfastData) { return intl.formatMessage({ defaultMessage: "Can not show breakfast prices.", diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx index bfedf19ba..3b04010a3 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx @@ -91,7 +91,8 @@ export default function AddAncillaryFlowModal({ const formMethods = useForm({ defaultValues: { quantityWithPoints: null, - quantityWithCard: !user || hasInsufficientPoints ? 1 : null, + quantityWithCard: + !user || hasInsufficientPoints || isBreakfast ? 1 : null, deliveryTime: defaultDeliveryTime, optionalText: "", termsAndConditions: false, @@ -357,17 +358,17 @@ export default function AddAncillaryFlowModal({
-

- {isBreakfast ? ( - - ) : ( - formatPrice( + {isBreakfast ? ( + + ) : ( +

+ {formatPrice( intl, selectedAncillary.price.total, selectedAncillary.price.currency - ) - )} -

+ )} +

+ )}
{selectedAncillary.points && (
@@ -406,7 +407,8 @@ export default function AddAncillaryFlowModal({ {currentStep === AncillaryStepEnum.selectAncillary ? null : (
+
- + ) })}