Merge pull request #266 from eurofurence/issue-265-bug-required-addon…

…s-handling correctly handle required add-ons
eurofurence · Feb 16, 2025 · 9f59d6e · 9f59d6e
2 parents f7fb372 + 8cc6d39
commit 9f59d6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/funnels/funnels/register/steps/ticket/level/addons/addon.tsx b/src/components/funnels/funnels/register/steps/ticket/level/addons/addon.tsx
@@ -38,7 +38,7 @@ const TicketLevelAddon = ({ addon, formContext }: TicketLevelAddonProps) => {
 			if (resetOnLevelChange && name === 'level' && type === 'change') {
 				const levelValue = value.level as Exclude<typeof value.level, undefined>
 
-				setValue(`addons.${addon.id}.selected`, isIncluded(levelValue) && !isUnavailable(levelValue) || addon.default)
+				setValue(`addons.${addon.id}.selected`, (isIncluded(levelValue) || isRequired(levelValue)) && !isUnavailable(levelValue) || addon.default)
 			}
 
 			if (name) {
@@ -67,7 +67,7 @@ const TicketLevelAddon = ({ addon, formContext }: TicketLevelAddonProps) => {
 			label={addon.id}
 			description={addon.id}
 			price={isIncluded(level) ? 0 : addon.price}
-			disabled={isIncluded(level) || isRequired(level)}
+			disabled={isIncluded(level) || isRequired(level) || addon.id === 'stage-pass'}
 			{...register(`addons.${addon.id}.selected`)}
 		>
 			{Object.entries(addon.options).map(([id, option]) =>

diff --git a/src/config.ts b/src/config.ts
@@ -186,6 +186,9 @@ const configEf = {
 				type: ['day'],
 			},
 			hidden: false,
+			resetOn: {
+				levelChange: true,
+			},
 		},
 		'tshirt': {
 			price: 20,