Merged in fix/STAY-135 (pull request #3368)
Fix/STAY-135 & STAY-127 * fix: make quantity and delivery separate steps in mobile * fix: update design for delivery step in ancillary flow * fix: add error state for missing time * fix: only allow points or cash payment for ancillaries * fix: break out stepper to design system * fix: update design of select quantity step in add ancillaries flow * fix: add error states for quantity * fix: handle insufficient points case * fix: update stepper to include optional disabledMessage tooltip * fix: handle validations * fix: change name to camel case Approved-by: Bianca Widstam Approved-by: Chuma Mcphoy (We Ahead)
This commit is contained in:
@@ -51,7 +51,7 @@ interface AddAncillaryState {
|
||||
ancillariesBySelectedCategory: Ancillary["ancillaryContent"]
|
||||
openModal: () => void
|
||||
closeModal: () => void
|
||||
prevStep: (isMobile: boolean) => void
|
||||
prevStep: () => void
|
||||
breakfastData: BreakfastData | null
|
||||
setBreakfastData: (breakfastData: BreakfastData | null) => void
|
||||
isBreakfast: boolean
|
||||
@@ -60,7 +60,6 @@ interface AddAncillaryState {
|
||||
selectAncillary: (ancillary: SelectedAncillary) => void
|
||||
selectQuantity: () => void
|
||||
selectDeliveryTime: () => void
|
||||
selectQuantityAndDeliveryTime: () => void
|
||||
}
|
||||
|
||||
function findAncillaryByCategory(
|
||||
@@ -150,14 +149,6 @@ export const createAddAncillaryStore = (
|
||||
state.steps[AncillaryStepEnum.selectQuantity].isValid = true
|
||||
})
|
||||
),
|
||||
selectQuantityAndDeliveryTime: () =>
|
||||
set(
|
||||
produce((state: AddAncillaryState) => {
|
||||
state.steps[AncillaryStepEnum.selectQuantity].isValid = true
|
||||
state.steps[AncillaryStepEnum.selectDelivery].isValid = true
|
||||
state.currentStep = AncillaryStepEnum.confirmation
|
||||
})
|
||||
),
|
||||
selectDeliveryTime: () =>
|
||||
set(
|
||||
produce((state: AddAncillaryState) => {
|
||||
@@ -166,7 +157,7 @@ export const createAddAncillaryStore = (
|
||||
})
|
||||
),
|
||||
|
||||
prevStep: (isMobile) =>
|
||||
prevStep: () =>
|
||||
set(
|
||||
produce((state: AddAncillaryState) => {
|
||||
if (state.currentStep === AncillaryStepEnum.selectQuantity) {
|
||||
@@ -176,7 +167,7 @@ export const createAddAncillaryStore = (
|
||||
state.steps = steps
|
||||
} else {
|
||||
if (
|
||||
(!state.selectedAncillary?.requiresDeliveryTime || isMobile) &&
|
||||
!state.selectedAncillary?.requiresDeliveryTime &&
|
||||
state.currentStep === AncillaryStepEnum.confirmation
|
||||
) {
|
||||
state.currentStep = AncillaryStepEnum.selectQuantity
|
||||
|
||||
Reference in New Issue
Block a user