@carlonicora/nextjs-jsonapi 5.6.0 → 5.7.1

package/src/features/billing/stripe-coupon/components/forms/CouponEditor.tsx

@@ -2,7 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useTranslations } from "next-intl";
-import { ReactNode, useCallback, useMemo } from "react";
+import { ReactNode, useCallback, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { v4 } from "uuid";
 import { z } from "zod";
@@ -21,7 +21,13 @@ import { formatDate, useBillingFormatOptions } from "../../../components/utils";
 import { useCouponContext } from "../../../contexts/CouponContext";
 import { StripeProductInterface } from "../../../stripe-product/data/stripe-product.interface";
 import { StripeProductService } from "../../../stripe-product/data/stripe-product.service";
-import { StripeCouponInput, StripeCouponInterface } from "../../data/stripe-coupon.interface";
+import {
+  StripeCouponDiscountInput,
+  StripeCouponDurationInput,
+  StripeCouponInput,
+  StripeCouponInterface,
+} from "../../data/stripe-coupon.interface";
+import { couponPageModule } from "../../utils/coupon-page-module";
 import { formatCouponDiscount } from "../../utils/format-coupon-discount";
 import {
   CouponCodeFields,
@@ -31,6 +37,8 @@ import {
   optionalDate,
   optionalDecimal,
   optionalPositiveInt,
+  parseOptionalDecimal,
+  parseOptionalPositiveInt,
   toCouponCodeInput,
 } from "./CouponCodeFields";
 
@@ -45,7 +53,105 @@ export type CouponEditorProps = {
   onDialogOpenChange?: (open: boolean) => void;
 };
 
-function CouponEditorInternal({
+type Translator = (key: string) => string;
+
+/**
+ * Edit mode is a rename: Stripe allows changing only a coupon's name after
+ * creation, so the schema is the name alone.
+ */
+const couponRenameSchema = (t: Translator) =>
+  z.object({ id: z.string(), name: z.string().min(1, { message: t("billing.admin.coupons.errors.name") }) });
+
+type CouponRenameValues = z.infer<ReturnType<typeof couponRenameSchema>>;
+
+/** Mirrors StripeCouponPostAttributesDTO. */
+const couponCreateSchema = (t: Translator) =>
+  z
+    .object({
+      id: z.uuidv4(),
+      name: z.string().min(1, { message: t("billing.admin.coupons.errors.name") }),
+      stripeCouponId: z.string().optional(),
+      discountType: z.enum(["percent_off", "amount_off"]),
+      percentOff: optionalDecimal(),
+      amountOff: optionalDecimal(),
+      currency: z.string().min(1),
+      duration: z.enum(["once", "repeating", "forever"]),
+      durationInMonths: optionalPositiveInt(),
+      products: z.array(z.object({ id: z.string(), name: z.string().optional() })),
+      redeemBy: optionalDate(),
+      maxRedemptions: optionalPositiveInt(),
+      firstCode: couponCodeSchema(t),
+    })
+    .superRefine((values, ctx) => {
+      const percentOff = parseOptionalDecimal(values.percentOff);
+      if (values.discountType === "percent_off" && (percentOff === undefined || percentOff < 0.01 || percentOff > 100))
+        ctx.addIssue({
+          code: "custom",
+          path: ["percentOff"],
+          message: t("billing.admin.coupons.errors.percentOff"),
+        });
+      const amountOff = parseOptionalDecimal(values.amountOff);
+      if (values.discountType === "amount_off" && (amountOff === undefined || amountOff <= 0))
+        ctx.addIssue({
+          code: "custom",
+          path: ["amountOff"],
+          message: t("billing.admin.coupons.errors.amountOff"),
+        });
+      if (values.duration === "repeating" && parseOptionalPositiveInt(values.durationInMonths) === undefined)
+        ctx.addIssue({
+          code: "custom",
+          path: ["durationInMonths"],
+          message: t("billing.admin.coupons.errors.durationInMonths"),
+        });
+    });
+
+type CouponCreateValues = z.infer<ReturnType<typeof couponCreateSchema>>;
+
+/** The schema guarantees the value; a missing one is a bug, not user input. */
+function required<T>(value: T | undefined, field: string): T {
+  if (value === undefined) throw new Error(`${field} is not set`);
+  return value;
+}
+
+function toDiscountInput(values: CouponCreateValues): StripeCouponDiscountInput {
+  if (values.discountType === "percent_off")
+    return { discountType: "percent_off", percentOff: required(parseOptionalDecimal(values.percentOff), "percentOff") };
+
+  return {
+    discountType: "amount_off",
+    amountOff: Math.round(required(parseOptionalDecimal(values.amountOff), "amountOff") * 100),
+    currency: values.currency,
+  };
+}
+
+function toDurationInput(values: CouponCreateValues): StripeCouponDurationInput {
+  if (values.duration === "repeating")
+    return {
+      duration: "repeating",
+      durationInMonths: required(parseOptionalPositiveInt(values.durationInMonths), "durationInMonths"),
+    };
+
+  return { duration: values.duration };
+}
+
+/** Form values → the coupon the model serialises. Unset fields are left out. */
+function toCouponInput(values: CouponCreateValues): StripeCouponInput {
+  const payload: StripeCouponInput = {
+    id: values.id,
+    name: values.name,
+    firstCode: toCouponCodeInput(values.firstCode),
+    ...toDiscountInput(values),
+    ...toDurationInput(values),
+  };
+  if (values.stripeCouponId?.trim()) payload.stripeCouponId = values.stripeCouponId.trim();
+  if (values.products.length > 0) payload.productIds = values.products.map((product) => product.id);
+  if (values.redeemBy) payload.redeemBy = values.redeemBy;
+  const maxRedemptions = parseOptionalPositiveInt(values.maxRedemptions);
+  if (maxRedemptions !== undefined) payload.maxRedemptions = maxRedemptions;
+  return payload;
+}
+
+function CouponRenameEditor({
   coupon,
   propagateChanges,
   onSuccess,
@@ -54,85 +160,116 @@ function CouponEditorInternal({
   onClose,
   dialogOpen,
   onDialogOpenChange,
-}: CouponEditorProps) {
+}: CouponEditorProps & { coupon: StripeCouponInterface }) {
   const t = useTranslations();
   const fmt = useBillingFormatOptions();
   const router = useI18nRouter();
-  const { createCoupon, renameCoupon } = useCouponContext();
-  const isEdit = !!coupon;
-
-  // Mirrors StripeCouponPostAttributesDTO. Edit mode is a rename: Stripe allows
-  // changing only a coupon's name after creation, so the schema is the name alone.
-  const formSchema = useMemo(() => {
-    const name = z.string().min(1, { message: t("billing.admin.coupons.errors.name") });
-    if (isEdit) return z.object({ id: z.string(), name });
-
-    return z
-      .object({
-        id: z.uuidv4(),
-        name,
-        stripeCouponId: z.string().optional(),
-        discountType: z.enum(["percent_off", "amount_off"]),
-        percentOff: optionalDecimal(),
-        amountOff: optionalDecimal(),
-        currency: z.string().min(1),
-        duration: z.enum(["once", "repeating", "forever"]),
-        durationInMonths: optionalPositiveInt(),
-        products: z.array(z.object({ id: z.string(), name: z.string().optional() })),
-        redeemBy: optionalDate(),
-        maxRedemptions: optionalPositiveInt(),
-        firstCode: couponCodeSchema(t),
-      })
-      .superRefine((values, ctx) => {
-        if (
-          values.discountType === "percent_off" &&
-          (values.percentOff === undefined || values.percentOff < 0.01 || values.percentOff > 100)
-        )
-          ctx.addIssue({
-            code: "custom",
-            path: ["percentOff"],
-            message: t("billing.admin.coupons.errors.percentOff"),
-          });
-        if (values.discountType === "amount_off" && (values.amountOff === undefined || values.amountOff <= 0))
-          ctx.addIssue({
-            code: "custom",
-            path: ["amountOff"],
-            message: t("billing.admin.coupons.errors.amountOff"),
-          });
-        if (values.duration === "repeating" && values.durationInMonths === undefined)
-          ctx.addIssue({
-            code: "custom",
-            path: ["durationInMonths"],
-            message: t("billing.admin.coupons.errors.durationInMonths"),
-          });
-      });
-  }, [t, isEdit]);
+  const { renameCoupon } = useCouponContext();
+
+  const formSchema = useMemo(() => couponRenameSchema(t), [t]);
+
+  const getDefaultValues = useCallback((): CouponRenameValues => ({ id: coupon.id, name: coupon.name }), [coupon]);
+
+  const form = useForm<CouponRenameValues>({
+    resolver: zodResolver(formSchema),
+    defaultValues: getDefaultValues(),
+  });
+
+  return (
+    <EditorSheet
+      form={form}
+      entityType={t("billing.admin.coupons.entity")}
+      entityName={coupon.name}
+      isEdit
+      module={couponPageModule()}
+      size="lg"
+      propagateChanges={propagateChanges}
+      onSuccess={onSuccess}
+      onNavigate={(url) => router.push(url)}
+      onSubmit={async (values) => await renameCoupon({ id: coupon.id, name: values.name })}
+      onReset={getDefaultValues}
+      trigger={trigger}
+      forceShow={forceShow}
+      onClose={onClose}
+      dialogOpen={dialogOpen}
+      onDialogOpenChange={onDialogOpenChange}
+    >
+      <div className="flex w-full flex-col gap-y-4">
+        <FormInput
+          form={form}
+          id="name"
+          name={t("billing.admin.coupons.fields.name")}
+          placeholder={t("billing.admin.coupons.placeholders.name")}
+          isRequired
+        />
+        <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <DetailField
+            label={t("billing.admin.coupons.fields.discount")}
+            value={<span className="tabular-nums">{formatCouponDiscount(coupon, t, fmt)}</span>}
+          />
+          <DetailField
+            label={t("billing.admin.coupons.fields.redeemBy")}
+            value={<span className="tabular-nums">{coupon.redeemBy ? formatDate(coupon.redeemBy, fmt) : "—"}</span>}
+          />
+          <DetailField
+            label={t("billing.admin.coupons.fields.maxRedemptions")}
+            value={
+              <span className="tabular-nums">
+                {coupon.maxRedemptions ?? t("billing.admin.coupons.places.no_limit")}
+              </span>
+            }
+          />
+          <DetailField
+            label={t("billing.admin.coupons.fields.stripeId")}
+            value={<span className="tabular-nums">{coupon.stripeCouponId}</span>}
+          />
+        </div>
+        {/* Typography role 10 (helper text). */}
+        <p className="text-muted-foreground text-xs/relaxed">{t("billing.admin.coupons.fixed_notice")}</p>
+      </div>
+    </EditorSheet>
+  );
+}
+
+function CouponCreateEditor({
+  propagateChanges,
+  onSuccess,
+  trigger,
+  forceShow,
+  onClose,
+  dialogOpen,
+  onDialogOpenChange,
+}: Omit<CouponEditorProps, "coupon">) {
+  const t = useTranslations();
+  const router = useI18nRouter();
+  const { createCoupon } = useCouponContext();
+  // Read once on mount: render stays pure.
+  const [now] = useState(() => new Date());
+
+  const formSchema = useMemo(() => couponCreateSchema(t), [t]);
 
   const getDefaultValues = useCallback(
-    (): any =>
-      coupon
-        ? { id: coupon.id, name: coupon.name }
-        : {
-            id: v4(),
-            name: "",
-            stripeCouponId: "",
-            discountType: "percent_off",
-            percentOff: "",
-            amountOff: "",
-            currency: "eur",
-            duration: "forever",
-            // "" not undefined for every FormInput: see couponCodeDefaults.
-            durationInMonths: "",
-            products: [],
-            redeemBy: undefined,
-            maxRedemptions: "",
-            firstCode: couponCodeDefaults(),
-          },
-    [coupon],
+    (): CouponCreateValues => ({
+      id: v4(),
+      name: "",
+      stripeCouponId: "",
+      discountType: "percent_off",
+      percentOff: "",
+      amountOff: "",
+      currency: "eur",
+      duration: "forever",
+      // "" not undefined for every FormInput: see couponCodeDefaults.
+      durationInMonths: "",
+      products: [],
+      redeemBy: undefined,
+      maxRedemptions: "",
+      firstCode: couponCodeDefaults(),
+    }),
+    [],
   );
 
-  const form = useForm<any>({
-    resolver: zodResolver(formSchema as any) as any,
+  const form = useForm<CouponCreateValues>({
+    resolver: zodResolver(formSchema),
     defaultValues: getDefaultValues(),
   });
 
@@ -154,36 +291,13 @@ function CouponEditorInternal({
     <EditorSheet
       form={form}
       entityType={t("billing.admin.coupons.entity")}
-      entityName={coupon?.name}
-      isEdit={isEdit}
-      module={Modules.StripeCoupon}
+      isEdit={false}
+      module={couponPageModule()}
       size="lg"
       propagateChanges={propagateChanges}
       onSuccess={onSuccess}
       onNavigate={(url) => router.push(url)}
-      onSubmit={async (values: any) => {
-        if (isEdit) return await renameCoupon({ id: coupon.id, name: values.name });
-
-        const payload: StripeCouponInput = {
-          id: values.id,
-          name: values.name,
-          discountType: values.discountType,
-          duration: values.duration,
-          firstCode: toCouponCodeInput(values.firstCode),
-        };
-        if (values.stripeCouponId?.trim()) payload.stripeCouponId = values.stripeCouponId.trim();
-        if (values.discountType === "percent_off") payload.percentOff = values.percentOff;
-        else {
-          payload.amountOff = Math.round(values.amountOff * 100);
-          payload.currency = values.currency;
-        }
-        if (values.duration === "repeating") payload.durationInMonths = values.durationInMonths;
-        if (values.products.length > 0) payload.productIds = values.products.map((p: { id: string }) => p.id);
-        if (values.redeemBy) payload.redeemBy = values.redeemBy;
-        if (values.maxRedemptions !== undefined) payload.maxRedemptions = values.maxRedemptions;
-
-        return await createCoupon(payload);
-      }}
+      onSubmit={async (values) => await createCoupon(toCouponInput(values))}
       onReset={getDefaultValues}
       trigger={trigger}
       forceShow={forceShow}
@@ -199,135 +313,103 @@ function CouponEditorInternal({
           placeholder={t("billing.admin.coupons.placeholders.name")}
           isRequired
         />
+        <FormInput
+          form={form}
+          id="stripeCouponId"
+          name={t("billing.admin.coupons.fields.stripeCouponId")}
+          placeholder={t("billing.admin.coupons.placeholders.stripeCouponId")}
+        />
 
-        {isEdit ? (
-          <>
-            <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-              <DetailField
-                label={t("billing.admin.coupons.fields.discount")}
-                value={formatCouponDiscount(coupon, t, fmt)}
-              />
-              <DetailField
-                label={t("billing.admin.coupons.fields.redeemBy")}
-                value={coupon.redeemBy ? formatDate(coupon.redeemBy, fmt) : "—"}
-              />
-              <DetailField
-                label={t("billing.admin.coupons.fields.maxRedemptions")}
-                value={
-                  <span className="tabular-nums">
-                    {coupon.maxRedemptions ?? t("billing.admin.coupons.places.no_limit")}
-                  </span>
-                }
-              />
-              <DetailField
-                label={t("billing.admin.coupons.fields.stripeId")}
-                value={<span className="tabular-nums">{coupon.stripeCouponId}</span>}
-              />
-            </div>
-            {/* Typography role 10 (helper text). */}
-            <p className="text-muted-foreground text-xs/relaxed">{t("billing.admin.coupons.fixed_notice")}</p>
-          </>
+        <FormSelect
+          form={form}
+          id="discountType"
+          name={t("billing.admin.coupons.fields.discountType")}
+          values={discountTypeOptions}
+        />
+
+        {watchDiscountType === "percent_off" ? (
+          <FormInput
+            form={form}
+            id="percentOff"
+            type="decimal"
+            name={t("billing.admin.coupons.fields.percentOff")}
+            placeholder={t("billing.admin.coupons.placeholders.percentOff")}
+            isRequired
+          />
         ) : (
-          <>
+          <div className="grid grid-cols-2 gap-x-4">
+            {/* type="decimal", NOT type="currency": the currency variant hardcodes
+                a Euro symbol (FormInput.tsx:105-106), which contradicts the
+                currency selector sitting next to it. */}
             <FormInput
               form={form}
-              id="stripeCouponId"
-              name={t("billing.admin.coupons.fields.stripeCouponId")}
-              placeholder={t("billing.admin.coupons.placeholders.stripeCouponId")}
+              id="amountOff"
+              type="decimal"
+              name={t("billing.admin.coupons.fields.amountOff")}
+              placeholder={t("billing.admin.coupons.placeholders.amountOff")}
+              isRequired
             />
-
             <FormSelect
               form={form}
-              id="discountType"
-              name={t("billing.admin.coupons.fields.discountType")}
-              values={discountTypeOptions}
+              id="currency"
+              name={t("billing.admin.coupons.fields.currency")}
+              values={couponCurrencyOptions}
+              isRequired
             />
+          </div>
+        )}
 
-            {watchDiscountType === "percent_off" ? (
-              <FormInput
-                form={form}
-                id="percentOff"
-                type="decimal"
-                name={t("billing.admin.coupons.fields.percentOff")}
-                placeholder={t("billing.admin.coupons.placeholders.percentOff")}
-                isRequired
-              />
-            ) : (
-              <div className="grid grid-cols-2 gap-x-4">
-                {/* type="decimal", NOT type="currency": the currency variant hardcodes
-                    a Euro symbol (FormInput.tsx:105-106), which contradicts the
-                    currency selector sitting next to it. */}
-                <FormInput
-                  form={form}
-                  id="amountOff"
-                  type="decimal"
-                  name={t("billing.admin.coupons.fields.amountOff")}
-                  placeholder={t("billing.admin.coupons.placeholders.amountOff")}
-                  isRequired
-                />
-                <FormSelect
-                  form={form}
-                  id="currency"
-                  name={t("billing.admin.coupons.fields.currency")}
-                  values={couponCurrencyOptions}
-                  isRequired
-                />
-              </div>
-            )}
+        <FormSelect
+          form={form}
+          id="duration"
+          name={t("billing.admin.coupons.fields.duration")}
+          values={durationOptions}
+        />
 
-            <FormSelect
-              form={form}
-              id="duration"
-              name={t("billing.admin.coupons.fields.duration")}
-              values={durationOptions}
-            />
+        {watchDuration === "repeating" && (
+          <FormInput
+            form={form}
+            id="durationInMonths"
+            type="number"
+            name={t("billing.admin.coupons.fields.durationInMonths")}
+            placeholder={t("billing.admin.coupons.placeholders.durationInMonths")}
+            isRequired
+          />
+        )}
 
-            {watchDuration === "repeating" && (
-              <FormInput
-                form={form}
-                id="durationInMonths"
-                type="number"
-                name={t("billing.admin.coupons.fields.durationInMonths")}
-                placeholder={t("billing.admin.coupons.placeholders.durationInMonths")}
-                isRequired
-              />
-            )}
-
-            <EntityMultiSelector<StripeProductInterface>
-              id="products"
-              form={form}
-              label={t("billing.admin.coupons.fields.products")}
-              description={t("billing.admin.coupons.help.products")}
-              retriever={(params) => StripeProductService.listProducts(params)}
-              module={Modules.StripeProduct}
-              getLabel={(product) => product.name}
-            />
+        <EntityMultiSelector<StripeProductInterface>
+          id="products"
+          form={form}
+          label={t("billing.admin.coupons.fields.products")}
+          description={t("billing.admin.coupons.help.products")}
+          retriever={(params) => StripeProductService.listProducts(params)}
+          module={Modules.StripeProduct}
+          getLabel={(product) => product.name}
+        />
 
-            <FormDateTime
-              form={form}
-              id="redeemBy"
-              name={t("billing.admin.coupons.fields.redeemBy")}
-              minDate={new Date()}
-              allowEmpty
-            />
+        <FormDateTime
+          form={form}
+          id="redeemBy"
+          name={t("billing.admin.coupons.fields.redeemBy")}
+          minDate={now}
+          allowEmpty
+        />
 
-            <FormInput
-              form={form}
-              id="maxRedemptions"
-              type="number"
-              name={t("billing.admin.coupons.fields.maxRedemptions")}
-              placeholder={t("billing.admin.coupons.placeholders.maxRedemptions")}
-            />
+        <FormInput
+          form={form}
+          id="maxRedemptions"
+          type="number"
+          name={t("billing.admin.coupons.fields.maxRedemptions")}
+          placeholder={t("billing.admin.coupons.placeholders.maxRedemptions")}
+        />
 
-            <SectionHeader>{t("billing.admin.coupons.first_code")}</SectionHeader>
-            <CouponCodeFields form={form} prefix="firstCode." />
-          </>
-        )}
+        <SectionHeader>{t("billing.admin.coupons.first_code")}</SectionHeader>
+        <CouponCodeFields form={form} prefix="firstCode." />
       </div>
     </EditorSheet>
   );
 }
 
 export default function CouponEditor(props: CouponEditorProps) {
-  return <CouponEditorInternal {...props} />;
+  return props.coupon ? <CouponRenameEditor {...props} coupon={props.coupon} /> : <CouponCreateEditor {...props} />;
 }

package/src/features/billing/stripe-coupon/components/widgets/CouponCodeActions.tsx

@@ -4,7 +4,7 @@ import { PowerIcon, RotateCcwIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { errorToast } from "../../../../../components/errors";
-import { Button, ConfirmDialog, Switch } from "../../../../../shadcnui";
+import { Button, ConfirmDialog, FieldLabel, Switch } from "../../../../../shadcnui";
 import { useCouponContext } from "../../../contexts/CouponContext";
 import { StripeCouponCodeInterface } from "../../data/stripe-coupon-code.interface";
 import type { CouponCodeStatus } from "../../hooks/useStripeCouponCodeTableStructure";
@@ -33,7 +33,8 @@ export function CouponCodeActions({ code, status }: CouponCodeActionsProps) {
 
   return (
     <div className="flex items-center justify-end gap-x-4">
-      <label className="flex items-center gap-x-2 text-xs">
+      {/* Typography role 9 (field label): FieldLabel wraps the switch, so a click on the text toggles it. */}
+      <FieldLabel>
         <Switch
           checked={code.automatic}
           // Switching off is always allowed; switching on only for a live code.
@@ -53,7 +54,7 @@ export function CouponCodeActions({ code, status }: CouponCodeActionsProps) {
           }}
         />
         {t("billing.admin.coupons.fields.automatic")}
-      </label>
+      </FieldLabel>
       <Button variant="outline" size="sm" disabled={isDead} onClick={() => setOpen(true)}>
         {isInactive ? <RotateCcwIcon /> : <PowerIcon />}
         {t(`billing.admin.coupons.codes.${scope}.confirm`)}

package/src/features/billing/stripe-coupon/data/stripe-coupon.interface.ts

@@ -29,21 +29,25 @@ export interface StripeCouponInterface extends ApiDataInterface {
 // Stripe Coupon Input DTOs
 // ============================================================================
 
+/** The discount of a new coupon: a percentage, or a fixed amount in one currency. */
+export type StripeCouponDiscountInput =
+  | { discountType: "percent_off"; percentOff: number }
+  | { discountType: "amount_off"; amountOff: number; currency: string }; // amountOff in minor units
+
+/** How long a new coupon's discount lasts: months only when it repeats. */
+export type StripeCouponDurationInput =
+  { duration: "once" } | { duration: "forever" } | { duration: "repeating"; durationInMonths: number };
+
 export type StripeCouponInput = {
   id: string;
   name: string;
   stripeCouponId?: string;
-  discountType: StripeCouponDiscountType;
-  percentOff?: number;
-  amountOff?: number;
-  currency?: string;
-  duration: StripeCouponDurationType;
-  durationInMonths?: number;
   productIds?: string[]; // our StripeProduct ids
   redeemBy?: Date;
   maxRedemptions?: number;
   firstCode: Omit<StripeCouponCodeInput, "id" | "couponId">;
-};
+} & StripeCouponDiscountInput &
+  StripeCouponDurationInput;
 
 export type StripeCouponRenameInput = {
   id: string;

package/src/features/billing/stripe-coupon/data/stripe-coupon.ts

@@ -124,10 +124,12 @@ export class StripeCoupon extends AbstractApiData implements StripeCouponInterfa
 
     const attributes = response.data.attributes;
     if (data.stripeCouponId) attributes.stripeCouponId = data.stripeCouponId;
-    if (data.percentOff !== undefined) attributes.percentOff = data.percentOff;
-    if (data.amountOff !== undefined) attributes.amountOff = data.amountOff;
-    if (data.currency) attributes.currency = data.currency;
-    if (data.durationInMonths !== undefined) attributes.durationInMonths = data.durationInMonths;
+    if (data.discountType === "percent_off") attributes.percentOff = data.percentOff;
+    else {
+      attributes.amountOff = data.amountOff;
+      attributes.currency = data.currency;
+    }
+    if (data.duration === "repeating") attributes.durationInMonths = data.durationInMonths;
     if (data.productIds && data.productIds.length > 0) attributes.productIds = data.productIds;
     if (data.redeemBy !== undefined) attributes.redeemBy = data.redeemBy.toISOString();
     if (data.maxRedemptions !== undefined) attributes.maxRedemptions = data.maxRedemptions;