@12-apps/discounts 1.16.0 → 1.18.0

package/src/react/discount-form-validate.ts

@@ -1,8 +1,11 @@
+import { minLength, required } from "@12-apps/forms-core";
+
 import { toMinutes, type DiscountSchedule } from "../engine/schedule";
 import type { ComboRequirement } from "../engine/types";
 
 import { comboUnits } from "./combo-slot-builder";
 import { fill, type DiscountsWebCopy } from "./copy";
+import { isCompleteMaskedDay, isIsoDay } from "./date-field";
 import type { DiscountFormValues } from "./discount-form-values";
 import { isComboKind, typeAndScopeFor } from "./form-kind";
 import type { DiscountsFormatters } from "./format";
@@ -19,12 +22,40 @@ import type { DiscountsFormatters } from "./format";
  * inputs red.
  */
 
-/** A whole number above zero, as typed. `null` when it is neither. */
+/**
+ * A whole number above zero, as typed. `null` when it is neither.
+ *
+ * Digits only (FUT-4143): `Number` reads "2.0" and "1e1" as whole numbers, and
+ * a count an operator typed with a separator in it was meant as something else.
+ */
 function positiveCount(typed: string): number | null {
   const trimmed = typed.trim();
-  if (trimmed === "") return null;
+  if (!/^\d+$/u.test(trimmed)) return null;
   const value = Number(trimmed);
-  return Number.isInteger(value) && value > 0 ? value : null;
+  return value > 0 ? value : null;
+}
+
+/** The name: present, and at least two characters, in the pack's words. */
+function checkName(typed: string, copy: DiscountsWebCopy): Record<string, string> {
+  const refused =
+    required(copy.form.nameRequired)(typed) ?? minLength(2, copy.form.nameTooShort)(typed.trim());
+  return refused === undefined ? {} : { name: refused };
+}
+
+/**
+ * The two redemption caps. Blank is "no cap"; anything else is a whole number
+ * from 1, so "2,5" is refused here instead of reaching the wire as 2 — or, in a
+ * browser that read the comma away, as 25.
+ */
+function checkLimits(values: DiscountFormValues, copy: DiscountsWebCopy): Record<string, string> {
+  const errors: Record<string, string> = {};
+  if (values.usageLimit.trim() !== "" && positiveCount(values.usageLimit) === null) {
+    errors.usageLimit = copy.form.invalidUsageLimit;
+  }
+  if (values.perBuyerLimit.trim() !== "" && positiveCount(values.perBuyerLimit) === null) {
+    errors.perBuyerLimit = copy.form.invalidPerBuyerLimit;
+  }
+  return errors;
 }
 
 /** A money field that has to hold something above zero. */
@@ -77,8 +108,9 @@ function checkPercent(
 /**
  * The reward, checked against the input the chosen KIND actually mounted.
  *
- * `type` is derived rather than read: a combo's reward is a percentage or an
- * amount, and which one it is lives in `comboReward` — so the check runs off
+ * `type` is derived rather than read: a combo's reward is a percentage, an
+ * amount or a closed price (FUT-4417), and which one it is lives in
+ * `comboReward` — so the check runs off
  * the same mapping the submit does, and the two cannot disagree about which
  * input holds the number.
  */
@@ -134,6 +166,28 @@ function checkCombo(
   return errors;
 }
 
+/**
+ * Início and Término. Each is blank or a whole real ISO day — the date box
+ * holds its typed text until it is one (FUT-4156) — and only two real days are
+ * compared. The window is half-open [start, end): equal dates are an EMPTY
+ * window, so the rule is "after", not "not before".
+ */
+function checkPeriod(values: DiscountFormValues, copy: DiscountsWebCopy): Record<string, string> {
+  const errors: Record<string, string> = {};
+  for (const name of ["startsAt", "endsAt"] as const) {
+    if (values[name] === "" || isIsoDay(values[name])) continue;
+    // A whole DD/MM/AAAA that is no day does not exist; anything shorter is
+    // simply not finished, and is told so.
+    errors[name] = isCompleteMaskedDay(values[name])
+      ? copy.form.invalidDate
+      : copy.form.dateIncomplete;
+  }
+  if (isIsoDay(values.startsAt) && isIsoDay(values.endsAt) && values.endsAt <= values.startsAt) {
+    errors.endsAt = copy.form.endsBeforeStarts;
+  }
+  return errors;
+}
+
 /** What the pickers and the builder currently hold, in one argument. */
 export interface FormTargets {
   categoryIds: string[];
@@ -164,13 +218,19 @@ function checkSchedule(
   if (windows.some((window) => window.days.length === 0)) {
     return { schedule: copy.schedule.daysRequired };
   }
-  const badTime = windows.some(
-    (window) =>
-      toMinutes(window.from) === null ||
-      toMinutes(window.to) === null ||
-      window.from === window.to,
-  );
-  return badTime ? { schedule: copy.schedule.timesRequired } : {};
+  const ends = windows.flatMap((window) => [window.from, window.to]);
+  // Unfinished first: "1:00" mid-edit is not a pair of equal ends, it is a
+  // time nobody has finished typing.
+  if (ends.some((end) => !/^\d{2}:\d{2}$/u.test(end))) {
+    return { schedule: copy.schedule.timeIncomplete };
+  }
+  // Then a whole HH:MM that no day has (25:00), in the clock's own words —
+  // "start and end must differ" would be untrue of it.
+  if (ends.some((end) => toMinutes(end) === null)) {
+    return { schedule: copy.schedule.invalidTime };
+  }
+  const sameEnds = windows.some((window) => window.from === window.to);
+  return sameEnds ? { schedule: copy.schedule.timesRequired } : {};
 }
 
 /** The schedule editor's state: its switch and its rows, kept separate. */
@@ -187,8 +247,13 @@ export function validate(
   scheduleState: ScheduleState,
 ): Record<string, string> {
   const slots = targets.comboRequirements;
+  // Every rule in ONE pass, the name's included (FUT-4143): the name used to be
+  // the container's schema, which stops before this function runs, so a 150%
+  // sat unmarked beside a red name until the name was fixed.
   const errors: Record<string, string> = {
+    ...checkName(values.name, copy),
     ...checkValue(values, slots, formatters, copy),
+    ...checkLimits(values, copy),
     ...checkCombo(values, slots, copy),
     ...checkSchedule(scheduleState, copy),
   };
@@ -202,11 +267,7 @@ export function validate(
   if (scope === "ITEM" && targets.menuItemIds.length === 0) {
     errors.scope = copy.form.itemTargetRequired;
   }
-  // The window is half-open [start, end): equal dates are an EMPTY window, so
-  // the rule is "after", not "not before".
-  if (values.startsAt !== "" && values.endsAt !== "" && values.endsAt <= values.startsAt) {
-    errors.endsAt = copy.form.endsBeforeStarts;
-  }
+  Object.assign(errors, checkPeriod(values, copy));
   return errors;
 }
 

package/src/react/discount-form-values.ts

@@ -18,7 +18,7 @@ export interface DiscountFormValues extends Record<string, string> {
   name: string;
   /** What kind of promotion this is. Decides `type` and `scope` — see `./form-kind`. */
   kind: string;
-  /** Which of the two rewards a COMBO gives. Ignored by every other kind. */
+  /** Which of the three rewards a COMBO gives (FUT-4417). Ignored by every other kind. */
   comboReward: string;
   percentOff: string;
   amountOff: string;

package/src/react/discount-form.tsx

@@ -2,7 +2,6 @@
 
 import { useState, type JSX } from "react";
 
-import { minLength, required } from "@12-apps/forms-core";
 import { Alert } from "@12-apps/ui/data-display/Alert";
 import {
   Fields,
@@ -21,7 +20,6 @@ import type { DiscountsWebCopy } from "./copy";
 import {
   ComboCapField,
   DiscountSwitches,
-  KindField,
   LimitFields,
   RewardFields,
   ScopeField,
@@ -29,11 +27,13 @@ import {
   WindowFields,
   type CurrencyFieldComponent,
 } from "./discount-form-fields";
+import { ComboPreviewLayout } from "./combo-cart-preview";
 import { DiscountTargetPicker } from "./discount-target-picker";
+import { KindField } from "./kind-field";
 import { blankWindow } from "./schedule-builder";
 import { validate, type FormTargets } from "./discount-form-validate";
 import { initialValues, type DiscountFormValues } from "./discount-form-values";
-import { kindOptions, typeAndScopeFor } from "./form-kind";
+import { DISCOUNT_KINDS, typeAndScopeFor } from "./form-kind";
 import type { DiscountsFormatters } from "./format";
 
 /**
@@ -147,8 +147,9 @@ function makeSubmit(
       schedule: extra.schedule,
     });
     if (Object.keys(invalid).length > 0) {
+      // ONE message for a client refusal: the red fields and the toast
+      // (FUT-4143). The `saveFailed` alert is the SERVER's, below.
       setFieldErrors(invalid);
-      setError(copy.form.reviewFields);
       return;
     }
     const payload: DiscountFormPayload = {
@@ -188,64 +189,74 @@ export function DiscountForm(props: DiscountFormProps): JSX.Element {
 
   return (
     <FormContainer<DiscountFormValues>
+      // No `schema`: the container runs one before `onSubmit` and stops when
+      // it fails, which judged the name alone. Every rule, the name's too,
+      // lives in `validate` so one Criar marks every field (FUT-4143).
       initialValues={initialValues(editing, formatters)}
-      schema={{ name: [required(copy.form.nameRequired), minLength(2)] }}
       onSubmit={handleSubmit}
       dataTestId="discount-form"
     >
-      <Stack spacing={2}>
-        <Fields.TextField name="name" label={copy.form.name} />
-        <KindField copy={copy} kinds={kindOptions(editing)} />
-        <RewardFields copy={copy} currencyField={currencyField} />
-        <ScopeField copy={copy} />
-        <DiscountTargetPicker
-          groups={groups}
-          copy={copy}
-          selection={{
-            categoryIds: extra.categoryIds,
-            menuItemIds: extra.menuItemIds,
-            comboRequirements: extra.comboRequirements,
-            onCategoryIdsChange: extra.setCategoryIds,
-            onMenuItemIdsChange: extra.setMenuItemIds,
-            onComboRequirementsChange: extra.setComboRequirements,
-          }}
-        />
-        <ComboCapField copy={copy} />
-        <TriggerFields copy={copy} />
-        <WindowFields
-          copy={copy}
-          schedule={extra.schedule}
-          scheduleEnabled={extra.scheduleEnabled}
-          timezoneLabel={props.timezoneLabel ?? null}
-          onScheduleChange={extra.setSchedule}
-          onScheduleEnabledChange={extra.setScheduleEnabled}
-        />
-        <LimitFields copy={copy} currencyField={currencyField} />
-        <FirstOrderField
-          copy={copy}
-          checked={extra.firstOrderOnly}
-          onChange={extra.setFirstOrderOnly}
-        />
-        <DiscountSwitches
-          copy={copy}
-          active={extra.active}
-          stackable={extra.stackable}
-          onActive={extra.setActive}
-          onStackable={extra.setStackable}
-        />
-        {error && (
-          <Alert
-            variant="danger"
-            title={copy.form.saveFailed}
-            description={error}
-            data-testid="discount-form-error"
+      {/* The combo preview's column (FUT-4417) beside a wide form; nothing for other kinds. */}
+      <ComboPreviewLayout
+        copy={copy}
+        formatters={formatters}
+        groups={groups}
+        slots={extra.comboRequirements}
+      >
+        <Stack spacing={2}>
+          <Fields.TextField name="name" label={copy.form.name} />
+          <KindField copy={copy} kinds={DISCOUNT_KINDS} />
+          <RewardFields copy={copy} currencyField={currencyField} />
+          <ScopeField copy={copy} />
+          <DiscountTargetPicker
+            groups={groups}
+            copy={copy}
+            selection={{
+              categoryIds: extra.categoryIds,
+              menuItemIds: extra.menuItemIds,
+              comboRequirements: extra.comboRequirements,
+              onCategoryIdsChange: extra.setCategoryIds,
+              onMenuItemIdsChange: extra.setMenuItemIds,
+              onComboRequirementsChange: extra.setComboRequirements,
+            }}
           />
-        )}
-        <SubmitButton dataTestId="discount-form-submit">
-          {editing ? copy.form.submitEdit : copy.form.submitCreate}
-        </SubmitButton>
-      </Stack>
-      <FormErrorSnackbar />
+          <ComboCapField copy={copy} />
+          <TriggerFields copy={copy} />
+          <WindowFields
+            copy={copy}
+            schedule={extra.schedule}
+            scheduleEnabled={extra.scheduleEnabled}
+            timezoneLabel={props.timezoneLabel ?? null}
+            onScheduleChange={extra.setSchedule}
+            onScheduleEnabledChange={extra.setScheduleEnabled}
+          />
+          <LimitFields copy={copy} currencyField={currencyField} />
+          <FirstOrderField
+            copy={copy}
+            checked={extra.firstOrderOnly}
+            onChange={extra.setFirstOrderOnly}
+          />
+          <DiscountSwitches
+            copy={copy}
+            active={extra.active}
+            stackable={extra.stackable}
+            onActive={extra.setActive}
+            onStackable={extra.setStackable}
+          />
+          {error && (
+            <Alert
+              variant="danger"
+              title={copy.form.saveFailed}
+              description={error}
+              data-testid="discount-form-error"
+            />
+          )}
+          <SubmitButton dataTestId="discount-form-submit">
+            {editing ? copy.form.submitEdit : copy.form.submitCreate}
+          </SubmitButton>
+        </Stack>
+      </ComboPreviewLayout>
+      <FormErrorSnackbar message={copy.form.errorSnackbar} />
     </FormContainer>
   );
 }

package/src/react/discount-target-picker.tsx

@@ -102,7 +102,7 @@ export function DiscountTargetPicker({
     );
   }
 
-  if (kind === "COMBO" || kind === "BUNDLE_PRICE") {
+  if (kind === "COMBO") {
     return (
       <ComboSlotBuilder
         slots={selection.comboRequirements}

package/src/react/discounts-screen.tsx

@@ -18,7 +18,6 @@ import {
 import type { RowAction } from "@12-apps/ui/data-display/DataViews";
 import { ErrorState } from "@12-apps/ui/data-display/ErrorState";
 import { LoadingState } from "@12-apps/ui/data-display/LoadingState";
-import { Dialog, DialogContent } from "@12-apps/ui/feedback/Dialog";
 import { HeaderButton } from "@12-apps/ui/form/HeaderButton";
 import { Dashboard } from "@12-apps/ui/layout/Dashboard";
 import { Text } from "@12-apps/ui/typography/Text";
@@ -28,6 +27,7 @@ import type { DiscountsApiClient } from "./api";
 import { fill, type DiscountsWebCopy } from "./copy";
 import { DiscountActionsMenu } from "./discount-actions-menu";
 import { DiscountCard } from "./discount-card";
+import { DiscountDialog } from "./discount-dialog";
 import { DiscountForm } from "./discount-form";
 import type { CurrencyFieldComponent } from "./discount-form-fields";
 import { DiscountListCard, discountCells } from "./discount-list-card";
@@ -214,7 +214,7 @@ function DiscountsGrid({
   );
 }
 
-/** The create dialog, mounted only while open so the next open re-seeds empty. */
+/** The create dialog; each opening mounts a fresh form, so it re-seeds empty. */
 function CreateDialog({
   open,
   onClose,
@@ -227,25 +227,19 @@ function CreateDialog({
   menu: MenuBinding;
 }): JSX.Element {
   return (
-    <Dialog
+    <DiscountDialog
       open={open}
       onClose={onClose}
       title={menu.copy.form.createTitle}
-      size="md"
-      showCloseButton
-      dataTestId="discount-dialog"
+      copy={menu.copy}
     >
-      {open && (
-        <DialogContent>
-          <DiscountForm
-            {...menu}
-            groups={menu.groups ?? []}
-            editing={null}
-            onSaved={onSaved}
-          />
-        </DialogContent>
-      )}
-    </Dialog>
+      <DiscountForm
+        {...menu}
+        groups={menu.groups ?? []}
+        editing={null}
+        onSaved={onSaved}
+      />
+    </DiscountDialog>
   );
 }
 

package/src/react/en-US.ts

@@ -3,6 +3,7 @@ import {
   EN_US_CATEGORY_SELECT_COPY,
   EN_US_CONFIRM_ACTION_COPY,
   EN_US_DATA_VIEWS_COPY,
+  EN_US_UI_LABELS,
 } from "@12-apps/ui/en-US";
 
 import type { DiscountsWebCopy } from "./copy";
@@ -131,11 +132,14 @@ export const EN_US_DISCOUNTS_WEB_COPY: DiscountsWebCopy = {
     activeNow: "Running now",
     daysRequired: "Pick at least one day.",
     timesRequired: "Enter a start and end time that differ.",
+    invalidTime: "That time does not exist. Use 00:00 to 23:59.",
+    timeIncomplete: "Finish the time: HH:MM.",
     windowsRequired: "Add at least one time.",
   },
   form: {
     createTitle: "New discount",
     editTitle: "Edit discount",
+    dialog: { close: EN_US_UI_LABELS.common.close, back: "Back" },
     submitCreate: "Create discount",
     submitEdit: "Save changes",
     name: "Promotion name",
@@ -172,8 +176,13 @@ export const EN_US_DISCOUNTS_WEB_COPY: DiscountsWebCopy = {
     firstOrderOnlyHint:
       "Only for customers who have never bought here. Menu prices do not change: the discount shows in the cart of whoever can use it.",
     reviewFields: "Check the highlighted fields.",
+    errorSnackbar: EN_US_UI_LABELS.formErrorSnackbar.message,
     saveFailed: "Could not save the discount",
     nameRequired: "Give the promotion a name.",
+    nameTooShort: "The name needs at least 2 characters.",
+    datePlaceholder: "DD/MM/YYYY",
+    invalidDate: "That date does not exist. Use DD/MM/YYYY, such as 25/12/2026.",
+    dateIncomplete: "Finish the date: DD/MM/YYYY.",
     invalidPercent: "Enter a percentage greater than 0 and at most 100.",
     invalidAmount: "Enter a discount amount greater than zero.",
     invalidBundlePrice: "Enter the bundle price, greater than zero.",
@@ -188,8 +197,37 @@ export const EN_US_DISCOUNTS_WEB_COPY: DiscountsWebCopy = {
     comboSlotTargetRequired: "Choose what can go in each group of the bundle.",
     invalidComboQuantity: "Enter how many units each group takes, from 1 upwards.",
     invalidMaxComboApplications: "Enter how many bundles fit in one order, from 1 upwards.",
+    invalidUsageLimit: "Enter a whole number of uses from 1 upwards, or leave it blank.",
+    invalidPerBuyerLimit: "Enter a whole number per customer from 1 upwards, or leave it blank.",
+    wholeNumberOnly: "Whole numbers only, no decimals.",
     endsBeforeStarts: "The end date must be after the start date.",
   },
+  comboRewards: {
+    labels: { PERCENTAGE: "Percentage", FIXED_AMOUNT: "Fixed amount", BUNDLE_PRICE: "Fixed price" },
+    hints: {
+      PERCENTAGE: "The bundle sells for the price of its items minus this discount.",
+      FIXED_AMOUNT: "The bundle sells for the price of its items minus this amount.",
+      BUNDLE_PRICE: "The bundle sells for this price, whatever its items cost.",
+    },
+    preview: {
+      title: "In the cart",
+      itemsRange: "{units} add up to {min}–{max}",
+      itemsExact: "{units} add up to {sum}",
+      paysRange: "The customer pays {min}–{max}",
+      paysRangeOff: "The customer pays {min}–{max} ({off} off)",
+      paysExact: "The customer pays {pays}",
+      paysExactOff: "The customer pays {pays} ({off} off)",
+      paysOff: "The customer pays {off} less",
+      paysPriceSaving: "The customer pays {price} — saves {min}–{max}",
+      paysPriceSavingExact: "The customer pays {price} — saves {saving}",
+      paysPriceSavingUpTo: "The customer pays {price} — saves up to {max}",
+      paysUpToPrice: "The customer pays {min}–{price} — saves up to {max}",
+      noSaving: "The customer pays the items' price: the bundle price is not lower than theirs.",
+      examples: "Examples: {cheapest} · {dearest}",
+      example: "{quantity} × {name} → {pays}",
+      exampleSaving: "{quantity} × {name} → {pays} (saves {saving})",
+    },
+  },
   combo: {
     title: "Build the bundle",
     hint: "Each group is one part of the bundle: how many units it takes, and what can go in it.",
@@ -201,7 +239,11 @@ export const EN_US_DISCOUNTS_WEB_COPY: DiscountsWebCopy = {
     // sentence is built around it rather than naming a noun of its own.
     pick: "{collection} in this group",
     empty: "No groups yet. Add the first one to build the bundle.",
-    summary: "The bundle takes {units} items across {groups} groups.",
+    summary: "The bundle takes {units} across {groups}.",
+    unitsOne: "{count} item",
+    unitsOther: "{count} items",
+    groupsOne: "{count} group",
+    groupsOther: "{count} groups",
     freeUnitsTitle: "Buy more, pay less",
     freeUnitsHint:
       'Choose the products, how many the customer takes and how many are free — the classic "buy 3, pay for 2".',

package/src/react/form-kind.ts

@@ -20,18 +20,20 @@ import { DISCOUNT_SCOPES, type DiscountScope, type DiscountType } from "../engin
  * |---|---|---|---|
  * | `PERCENTAGE` | `PERCENTAGE` | ORDER / CATEGORY / ITEM | the rate, and what it covers |
  * | `FIXED_AMOUNT` | `FIXED_AMOUNT` | ORDER / CATEGORY / ITEM | the amount, and what it covers |
- * | `COMBO` | `PERCENTAGE` or `FIXED_AMOUNT` | `COMBO` | the groups, and which of the two rewards |
+ * | `COMBO` | `PERCENTAGE`, `FIXED_AMOUNT` or `BUNDLE_PRICE` | `COMBO` | the groups, and which of the three rewards |
  * | `FREE_UNITS` | `FREE_UNITS` | `COMBO` | the products, how many, how many free |
  *
  * Two consequences worth stating, because both are deliberate:
  *
- * **A combo is a DISCOUNT off its items, never a price.** "2 refrigerantes, 2
- * hambúrgueres e 2 batatas com 15% de desconto" and "…menos R$ 5,00" are the
- * two offers a merchant describes; a flat "por R$ 49,90" reprices the group and
- * silently goes wrong the moment one of its items changes price. `BUNDLE_PRICE`
- * is still a legal type in the engine and in the database — an older rule that
- * uses it keeps working and keeps being editable, see {@link kindOptions} — it
- * is simply not offered for a new promotion.
+ * **A combo's reward is a discount off its items OR a closed price**
+ * (FUT-4417). "2 refrigerantes, 2 hambúrgueres e 2 batatas com 15% de
+ * desconto" and "…menos R$ 5,00" are two offers a merchant describes; "5
+ * marmitas por R$ 120" is the third, and the one the form used to refuse. A
+ * closed price reprices the matched group whatever its items cost — which is
+ * exactly what the merchant asked for, and why the form says so under the price
+ * field and previews it against the store's real prices ("Como fica no
+ * carrinho"). `BUNDLE_PRICE` is therefore a combo REWARD, not a kind: a rule
+ * saved with it before FUT-4417 opens as a combo with "Preço fechado" chosen.
  *
  * **`COMBO` scope is not a choice any more.** It was never one: a combo is
  * defined by its groups, so "combo scope, but with an order-wide discount" is
@@ -39,15 +41,14 @@ import { DISCOUNT_SCOPES, type DiscountScope, type DiscountType } from "../engin
  * genuinely a choice, and the two combo kinds carry `COMBO` implicitly.
  */
 
-/** The kinds offered for a NEW promotion, in the order the toggle shows them. */
+/** The kinds the form offers, in the order the toggle shows them. */
 export const DISCOUNT_KINDS = ["PERCENTAGE", "FIXED_AMOUNT", "COMBO", "FREE_UNITS"] as const;
 
 /**
- * Every kind the form can HOLD, which is one more than it offers: a rule saved
- * as `BUNDLE_PRICE` before combos became a discount still has to open, edit and
- * save without losing what it is.
+ * Every kind the form can hold. `BUNDLE_PRICE` is not one any more (FUT-4417):
+ * it is the third reward of a `COMBO`, see {@link COMBO_REWARDS}.
  */
-export type DiscountKind = (typeof DISCOUNT_KINDS)[number] | "BUNDLE_PRICE";
+export type DiscountKind = (typeof DISCOUNT_KINDS)[number];
 
 /**
  * True when this kind's targets are groups — a builder, not a flat picker, and
@@ -58,7 +59,7 @@ export type DiscountKind = (typeof DISCOUNT_KINDS)[number] | "BUNDLE_PRICE";
  * second `includes` that drifts from this one.
  */
 export function isComboKind(kind: string): boolean {
-  return kind === "COMBO" || kind === "FREE_UNITS" || kind === "BUNDLE_PRICE";
+  return kind === "COMBO" || kind === "FREE_UNITS";
 }
 
 /** The scopes the toggle offers: every scope except the one a kind implies. */
@@ -70,39 +71,30 @@ export const SELECTABLE_DISCOUNT_SCOPES: readonly DiscountScope[] = DISCOUNT_SCO
  * Which kind an existing rule is, read back from the pair it was stored as.
  *
  * `FREE_UNITS` is checked before the scope because it is the narrower fact: it
- * is only ever legal at `COMBO` scope, so the type alone identifies it.
+ * is only ever legal at `COMBO` scope, so the type alone identifies it. A
+ * `BUNDLE_PRICE` rule is a combo (FUT-4417) — whatever scope it carries, since
+ * the type is only legal at `COMBO`.
  */
 export function kindOf(rule: { type: string; scope: string } | null): DiscountKind {
   if (rule === null) return "PERCENTAGE";
-  if (rule.type === "BUNDLE_PRICE") return "BUNDLE_PRICE";
   if (rule.type === "FREE_UNITS") return "FREE_UNITS";
-  if (rule.scope === "COMBO") return "COMBO";
+  if (rule.type === "BUNDLE_PRICE" || rule.scope === "COMBO") return "COMBO";
   return rule.type === "FIXED_AMOUNT" ? "FIXED_AMOUNT" : "PERCENTAGE";
 }
 
 /**
- * The kinds this particular form may show — the four, plus `BUNDLE_PRICE` when
- * that is what is being edited.
- *
- * Appended rather than inserted so the four keep the positions an operator has
- * learned, and present ONLY on the legacy rule's own form: an operator editing
- * a percentage promotion is not offered a bundle price they cannot create.
- */
-export function kindOptions(editing: { type: string; scope: string } | null): DiscountKind[] {
-  const kind = kindOf(editing);
-  return kind === "BUNDLE_PRICE" ? [...DISCOUNT_KINDS, kind] : [...DISCOUNT_KINDS];
-}
-
-/**
- * A combo's reward is one of the two plain types, chosen separately from the
- * kind — "15% off the combo" and "R$ 5,00 off the combo" are the same kind of
- * promotion with different arithmetic.
+ * A combo's reward, chosen separately from the kind — "15% off the combo",
+ * "R$ 5,00 off the combo" and "the combo for R$ 120" (FUT-4417) are the same
+ * kind of promotion with different arithmetic. In the order the toggle shows
+ * them.
  */
-export const COMBO_REWARDS = ["PERCENTAGE", "FIXED_AMOUNT"] as const;
+export const COMBO_REWARDS = ["PERCENTAGE", "FIXED_AMOUNT", "BUNDLE_PRICE"] as const;
+export type ComboReward = (typeof COMBO_REWARDS)[number];
 
-/** Which reward an existing combo was saved with. */
-export function comboRewardOf(rule: { type: string } | null): string {
-  return rule?.type === "FIXED_AMOUNT" ? "FIXED_AMOUNT" : "PERCENTAGE";
+/** Which reward an existing combo was saved with; a new one starts on the percentage. */
+export function comboRewardOf(rule: { type: string } | null): ComboReward {
+  if (rule?.type === "FIXED_AMOUNT" || rule?.type === "BUNDLE_PRICE") return rule.type;
+  return "PERCENTAGE";
 }
 
 /**
@@ -114,17 +106,19 @@ export function comboRewardOf(rule: { type: string } | null): string {
  * rather than trusted: the toggle is unmounted at combo kinds, so its value is
  * whatever it was before the operator changed their mind.
  */
-export function typeAndScopeFor(values: {
-  kind: string;
-  comboReward: string;
-  scope: string;
-}): { type: DiscountType; scope: DiscountScope } {
-  if (values.kind === "COMBO") {
-    const type = values.comboReward === "FIXED_AMOUNT" ? "FIXED_AMOUNT" : "PERCENTAGE";
-    return { type, scope: "COMBO" };
-  }
+export function typeAndScopeFor(values: { kind: string; comboReward: string; scope: string }): {
+  type: DiscountType;
+  scope: DiscountScope;
+} {
+  if (values.kind === "COMBO")
+    return {
+      type: comboRewardOf({ type: values.comboReward }),
+      scope: "COMBO",
+    };
   if (values.kind === "FREE_UNITS") return { type: "FREE_UNITS", scope: "COMBO" };
-  if (values.kind === "BUNDLE_PRICE") return { type: "BUNDLE_PRICE", scope: "COMBO" };
   const type = values.kind === "FIXED_AMOUNT" ? "FIXED_AMOUNT" : "PERCENTAGE";
-  return { type, scope: values.scope === "COMBO" ? "ORDER" : (values.scope as DiscountScope) };
+  return {
+    type,
+    scope: values.scope === "COMBO" ? "ORDER" : (values.scope as DiscountScope),
+  };
 }