@bunnyapp/components 1.8.0-beta.3 → 1.8.0-beta.5

package/dist/cjs/index.js

@@ -1283,7 +1283,7 @@ const DEFAULT_CONFIG = {
 };
 
 // This will be replaced at build time by rollup-plugin-replace
-const PACKAGE_VERSION = '1.8.0-beta.2';
+const PACKAGE_VERSION = '1.8.0-beta.4';
 const createRequestHeaders = (token) => {
     const headers = createClientDevHeaders({ token });
     // Add the components version header
@@ -22955,15 +22955,15 @@ function QuotesWrapper() {
     return (jsxRuntime.jsx(TransactionsDisplay, { transactions: quotesAsTransactions, onSearchValueChanged: setSearch, search: search }));
 }
 
-const shouldShowCouponEditor_QuoteFragment = t(`
-    fragment shouldShowCouponEditor_QuoteFragment on Quote {
+const canApplyCoupons_QuoteFragment = t(`
+    fragment canApplyCoupons_QuoteFragment on Quote {
       id
       kind
       amountDue
     }
   `, []);
-const shouldShowCouponEditor_SubscriptionFragment = t(`
-    fragment shouldShowCouponEditor_SubscriptionFragment on Subscription {
+const canApplyCoupons_SubscriptionFragment = t(`
+    fragment canApplyCoupons_SubscriptionFragment on Subscription {
       id
       state
       charges {
@@ -22971,10 +22971,10 @@ const shouldShowCouponEditor_SubscriptionFragment = t(`
       }
     }
   `, []);
-function shouldShowCouponEditor(maskedQuote, activeCouponsExist, maskedUpgradingSubscription) {
+function canApplyCoupons(maskedQuote, activeCouponsExist, maskedUpgradingSubscription) {
     var _a, _b;
-    const quote = readFragment(shouldShowCouponEditor_QuoteFragment, maskedQuote);
-    const upgradingSubscription = readFragment(shouldShowCouponEditor_SubscriptionFragment, maskedUpgradingSubscription);
+    const quote = readFragment(canApplyCoupons_QuoteFragment, maskedQuote);
+    const upgradingSubscription = readFragment(canApplyCoupons_SubscriptionFragment, maskedUpgradingSubscription);
     const upgradingFromTrial = ((_a = upgradingSubscription === null || upgradingSubscription === void 0 ? void 0 : upgradingSubscription.state) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === t.scalar('SubscriptionState', 'TRIAL') ||
         ((_b = upgradingSubscription === null || upgradingSubscription === void 0 ? void 0 : upgradingSubscription.state) === null || _b === void 0 ? void 0 : _b.toUpperCase()) ===
             t.scalar('SubscriptionState', 'TRIAL_EXPIRED');
@@ -22992,7 +22992,10 @@ function shouldShowCouponEditor(maskedQuote, activeCouponsExist, maskedUpgrading
         return false;
     }
     if (quoteKindIsValid) {
-        return activeCouponsExist && (upgradingFromTrial || upgradingFromFree() || signingUpForNewSubscription);
+        const result = activeCouponsExist &&
+            (upgradingFromTrial || upgradingFromFree() || signingUpForNewSubscription);
+        console.log('returning result', result);
+        return result;
     }
     return false;
 }
@@ -23004,6 +23007,27 @@ function CouponEditor({ className, onAddCoupon, isAddingCoupon, couponCode, setC
     return (jsxRuntime.jsx("div", { className: `bunny-flex bunny-flex-col bunny-gap-2 ${className}`, children: jsxRuntime.jsxs("div", { className: "bunny-flex bunny-flex-row bunny-gap-2", children: [jsxRuntime.jsx(antd.Input, { value: couponCode, onChange: e => setCouponCode(e.target.value), placeholder: "Coupon code", disabled: isAddingCoupon, size: "small" }), jsxRuntime.jsx(antd.Button, { loading: isAddingCoupon, type: "primary", onClick: handleAddCoupon, disabled: couponCode.length === 0, children: "Apply" })] }) }));
 }
 
+t(`
+    fragment sortQuoteChangeCharges_QuoteChargeFragment on QuoteCharge {
+      kind
+    }
+  `, []);
+/**
+ * Sorts quote change charges so that coupon charges appear at the end of the list.
+ * Uses a generic type so the full charge shape is preserved.
+ */
+function sortQuoteChangeCharges(charges) {
+    return [...charges].sort((chargeA, chargeB) => {
+        const aIsCoupon = chargeA.kind === 'COUPON';
+        const bIsCoupon = chargeB.kind === 'COUPON';
+        if (aIsCoupon && !bIsCoupon)
+            return 1;
+        if (!aIsCoupon && bIsCoupon)
+            return -1;
+        return 0;
+    });
+}
+
 const { Text: Text$r } = antd.Typography;
 const CheckoutSummary_PriceListFragment = t(`
     fragment CheckoutSummary_PriceListFragment on PriceList {
@@ -23033,14 +23057,14 @@ const CheckoutSummary_QuoteFragment = t(`
           currencyId
         }
       }
-      ...shouldShowCouponEditor_QuoteFragment
+      ...canApplyCoupons_QuoteFragment
     }
-  `, [shouldShowCouponEditor_QuoteFragment]);
+  `, [canApplyCoupons_QuoteFragment]);
 function CheckoutSummary({ quote: maskedQuote, className, onAddCoupon, onRemoveCoupon, isRemovingCoupon, priceList: maskedPriceList, isAddingCoupon, couponCode, setCouponCode, activeCouponsExist, }) {
     var _a, _b;
     const priceList = readFragment(CheckoutSummary_PriceListFragment, maskedPriceList);
     const quote = readFragment(CheckoutSummary_QuoteFragment, maskedQuote);
-    return (jsxRuntime.jsxs("div", { className: `${className} bunny-space-y-4`, children: [jsxRuntime.jsxs(Text$r, { children: [jsxRuntime.jsxs("div", { className: "bunny-text-lg bunny-font-medium bunny-mb-4", children: ["Checkout summary - ", (_a = priceList === null || priceList === void 0 ? void 0 : priceList.product) === null || _a === void 0 ? void 0 : _a.name, " ", priceList === null || priceList === void 0 ? void 0 : priceList.name] }), jsxRuntime.jsx("div", { className: "bunny-space-y-4", children: (_b = quote === null || quote === void 0 ? void 0 : quote.quoteChanges) === null || _b === void 0 ? void 0 : _b.map(quoteChange => quoteChange === null || quoteChange === void 0 ? void 0 : quoteChange.charges.map(charge => {
+    return (jsxRuntime.jsxs("div", { className: `${className} bunny-space-y-4`, children: [jsxRuntime.jsxs(Text$r, { children: [jsxRuntime.jsxs("div", { className: "bunny-text-lg bunny-font-medium bunny-mb-4", children: ["Checkout summary - ", (_a = priceList === null || priceList === void 0 ? void 0 : priceList.product) === null || _a === void 0 ? void 0 : _a.name, " ", priceList === null || priceList === void 0 ? void 0 : priceList.name] }), jsxRuntime.jsx("div", { className: "bunny-space-y-4", children: (_b = quote === null || quote === void 0 ? void 0 : quote.quoteChanges) === null || _b === void 0 ? void 0 : _b.map(quoteChange => sortQuoteChangeCharges(quoteChange === null || quoteChange === void 0 ? void 0 : quoteChange.charges).map(charge => {
                             var _a;
                             const multiplier = charge.kind === 'COUPON' ? -1 : 1;
                             return (jsxRuntime.jsxs("div", { className: "bunny-grid bunny-grid-cols-3 bunny-gap-4 bunny-items-center", children: [jsxRuntime.jsx("div", { className: "bunny-col-span-1", children: charge.name }), jsxRuntime.jsx("div", { className: "bunny-col-span-1 bunny-text-center", children: ((_a = charge.coupon) === null || _a === void 0 ? void 0 : _a.couponCode) ? (jsxRuntime.jsx("button", { onClick: () => {
@@ -23053,7 +23077,7 @@ function CheckoutSummary({ quote: maskedQuote, className, onAddCoupon, onRemoveC
                                                 }
                                                 onRemoveCoupon((_b = charge.coupon) === null || _b === void 0 ? void 0 : _b.couponCode);
                                             }, className: "bunny-text-orange-500 hover:bunny-text-orange-400 bunny-cursor-pointer bunny-bg-transparent bunny-border-none", children: "Remove" })) : (jsxRuntime.jsx("div", { children: charge.quantity })) }), jsxRuntime.jsx("div", { className: "bunny-col-span-1 bunny-text-right", children: formatCurrency(multiplier * (charge.subtotal || 0), charge.currencyId) })] }, charge.id));
-                        })) }), jsxRuntime.jsx(CheckoutSummaryDivider, {}), jsxRuntime.jsxs("div", { className: "bunny-space-y-4", children: [jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Subtotal" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.subtotal, quote.currencyId) })] }), jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Taxes" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.taxAmount, quote.currencyId) })] })] }), jsxRuntime.jsx(CheckoutSummaryDivider, {}), jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Total" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.amountDue, quote.currencyId) })] })] }), shouldShowCouponEditor(quote, activeCouponsExist) && (jsxRuntime.jsx(CouponEditor, { className: "bunny-w-full", onAddCoupon: onAddCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode }))] }));
+                        })) }), jsxRuntime.jsx(CheckoutSummaryDivider, {}), jsxRuntime.jsxs("div", { className: "bunny-space-y-4", children: [jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Subtotal" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.subtotal, quote.currencyId) })] }), jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Taxes" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.taxAmount, quote.currencyId) })] })] }), jsxRuntime.jsx(CheckoutSummaryDivider, {}), jsxRuntime.jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsxRuntime.jsx("div", { children: "Total" }), jsxRuntime.jsx("div", { children: formatCurrency(quote.amountDue, quote.currencyId) })] })] }), canApplyCoupons(quote, activeCouponsExist) && (jsxRuntime.jsx(CouponEditor, { className: "bunny-w-full", onAddCoupon: onAddCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode }))] }));
 }
 const CheckoutSummaryDivider = () => {
     return (jsxRuntime.jsx("div", { className: "bunny-my-2", children: jsxRuntime.jsx(antd.Divider, { className: "m-0" }) }));
@@ -23104,10 +23128,36 @@ function InitialSignupForm({ className, onSubmit, submitting, defaultValues, })
                                 } }) }) }) }), jsxRuntime.jsx(antd.Form.Item, { children: jsxRuntime.jsx(antd.Button, { type: "primary", onClick: handleSubmit, loading: submitting, className: "bunny-w-full", children: "Proceed to payment" }) })] }) }));
 }
 
+const useApplyDefaultCoupon_QuoteFragment = t(`
+    fragment useApplyDefaultCoupon_QuoteFragment on Quote {
+      ...canApplyCoupons_QuoteFragment
+    }
+  `, [canApplyCoupons_QuoteFragment]);
+/**
+ * Applies a default coupon code once when quoteChangeId is available.
+ * Uses a ref to ensure coupon code is only applied once.
+ */
+function useApplyDefaultCoupon({ couponCode, quoteChangeId, quote: maskedQuote, activeCouponsExist, addCoupon, }) {
+    const defaultCouponAppliedRef = react.useRef(undefined);
+    // Derived state
+    const quote = readFragment(useApplyDefaultCoupon_QuoteFragment, maskedQuote);
+    const canApplyCouponsResult = canApplyCoupons(quote, activeCouponsExist);
+    react.useEffect(() => {
+        if (couponCode &&
+            quoteChangeId &&
+            defaultCouponAppliedRef.current !== couponCode &&
+            canApplyCouponsResult) {
+            addCoupon(couponCode);
+            defaultCouponAppliedRef.current = couponCode;
+        }
+    }, [couponCode, quoteChangeId, addCoupon, canApplyCouponsResult]);
+}
+
 const Signup_QuoteFragment = t(`
     fragment Signup_QuoteFragment on Quote {
       ...CheckoutSummary_QuoteFragment
       ...PaymentForms_QuoteFragment
+      ...useApplyDefaultCoupon_QuoteFragment
       id
       currencyId
       amountDue
@@ -23115,7 +23165,7 @@ const Signup_QuoteFragment = t(`
         id
       }
     }
-  `, [CheckoutSummary_QuoteFragment, PaymentForms_QuoteFragment]);
+  `, [CheckoutSummary_QuoteFragment, PaymentForms_QuoteFragment, useApplyDefaultCoupon_QuoteFragment]);
 
 const query$6 = t(`
     query quote($id: ID) {
@@ -23571,7 +23621,6 @@ function Signup({ companyName, priceListCode, returnUrl, couponCode, className,
     const [portalSessionToken, setPortalSessionToken] = react.useState(undefined);
     const token = portalSessionToken || tokenFromContexts;
     const [purchaseSucceeded, setPurchaseSucceeded] = react.useState(false);
-    const defaultCouponAppliedRef = react.useRef(undefined);
     const [couponEditorCouponCode, setCouponEditorCouponCode] = react.useState('');
     // Read fragment
     const initialQuoteId = (_a = readFragment(Signup_QuoteFragment, initialQuote)) === null || _a === void 0 ? void 0 : _a.id;
@@ -23688,13 +23737,7 @@ function Signup({ companyName, priceListCode, returnUrl, couponCode, className,
             handleRecalculateTaxes(quote === null || quote === void 0 ? void 0 : quote.id);
         },
     });
-    // Handle default coupon application
-    react.useEffect(() => {
-        if (couponCode && quoteChangeId && defaultCouponAppliedRef.current !== couponCode) {
-            addCoupon(couponCode);
-            defaultCouponAppliedRef.current = couponCode;
-        }
-    }, [couponCode, quoteChangeId]);
+    useApplyDefaultCoupon({ couponCode, quoteChangeId, addCoupon, activeCouponsExist, quote });
     async function handleSubmit(formData) {
         if (selfServiceBuyEnabled === false) {
             handleShowSelfServiceBuyWarning();
@@ -23924,22 +23967,22 @@ const QuoteCheckout_QuoteFragment = t(`
         }
       }
       ...QuoteFields_QuoteFragment
-      ...shouldShowCouponEditor_QuoteFragment
+      ...canApplyCoupons_QuoteFragment
       ...PaymentForm_QuoteFragment
       ...getQuoteAmountDue_QuoteFragment
     }
   `, [
     QuoteFields_QuoteFragment,
-    shouldShowCouponEditor_QuoteFragment,
+    canApplyCoupons_QuoteFragment,
     PaymentForm_QuoteFragment,
     getQuoteAmountDue_QuoteFragment,
 ]);
 const QuoteCheckout_SubscriptionFragment = t(`
     fragment QuoteCheckout_SubscriptionFragment on Subscription {
       id
-      ...shouldShowCouponEditor_SubscriptionFragment
+      ...canApplyCoupons_SubscriptionFragment
     }
-  `, [shouldShowCouponEditor_SubscriptionFragment]);
+  `, [canApplyCoupons_SubscriptionFragment]);
 const showSuccessNotification = useSuccessNotification();
 const QuoteCheckout = ({ account, onSuccess, onFail, quote: maskedQuote, taxationRequiredAccountFields, isUpdatingQuote, onRecalculateTaxes, isRecalculatingTaxes, }) => {
     var _a, _b, _c, _d, _e;
@@ -24025,7 +24068,7 @@ const QuoteCheckout = ({ account, onSuccess, onFail, quote: maskedQuote, taxatio
     if (taxationRequiredAccountFields)
         return (jsxRuntime.jsx(PaymentFormWrapper, { setMaxHeight: false, children: jsxRuntime.jsx(TaxationForm, { account: account, accountId: quote.accountId }) }));
     return (jsxRuntime.jsx(PaymentFormWrapper, { setMaxHeight: false, children: paymentRequired ? (jsxRuntime.jsxs("div", { className: "bunny-flex bunny-flex-col bunny-gap-2 bunny-w-full", children: [jsxRuntime.jsx(PaymentForm, { onPaymentSuccess: onSuccess, quote: quote, onSavePaymentMethod: (paymentMethod) => onPaymentMethodSaved === null || onPaymentMethodSaved === void 0 ? void 0 : onPaymentMethodSaved(paymentMethod.savedPaymentMethodResponse.paymentMethodId), onPaymentMethodRemoved: (paymentMethod) => onPaymentMethodRemoved === null || onPaymentMethodRemoved === void 0 ? void 0 : onPaymentMethodRemoved(paymentMethod.id), disablePayButton: isFinalizingQuote }), isFinalizingQuote && jsxRuntime.jsx(QuoteLoadingIndicator, {}), (couponsOnQuote === null || couponsOnQuote === void 0 ? void 0 : couponsOnQuote.length) === 0 ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: upgradingSubscription &&
-                        shouldShowCouponEditor(quote, activeCouponsExist, upgradingSubscription) && (jsxRuntime.jsx(CouponEditor, { className: "bunny-px-4 bunny-pt-1", onAddCoupon: addCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode })) })) : (jsxRuntime.jsx(antd.Button, { type: "link", loading: isRemovingCoupon, onClick: () => {
+                        canApplyCoupons(quote, activeCouponsExist, upgradingSubscription) && (jsxRuntime.jsx(CouponEditor, { className: "bunny-px-4 bunny-pt-1", onAddCoupon: addCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode })) })) : (jsxRuntime.jsx(antd.Button, { type: "link", loading: isRemovingCoupon, onClick: () => {
                         couponsOnQuote === null || couponsOnQuote === void 0 ? void 0 : couponsOnQuote.forEach(couponCharge => {
                             var _a;
                             const couponCode = (_a = couponCharge === null || couponCharge === void 0 ? void 0 : couponCharge.coupon) === null || _a === void 0 ? void 0 : _a.couponCode;
@@ -26561,20 +26604,6 @@ function priceListChargePriceDescription(maskedPriceListCharge) {
     return `Per ${unitName ? `${unitName} / ` : ''}${priceListCharge.showPriceAsMonthly ? 'month' : periodLabel}`;
 }
 
-const GetActiveCharges_PriceListChargeFragment = t(`
-    fragment GetActiveCharges_PriceListChargeFragment on PriceListCharge {
-      deprecated
-      featureAddon
-    }
-  `);
-// Active charges: any charge that is not deprecated and not a feature addon
-function getActiveCharges(charges) {
-    return charges.filter(maskedCharge => {
-        const charge = readFragment(GetActiveCharges_PriceListChargeFragment, maskedCharge);
-        return !charge.deprecated && !charge.featureAddon;
-    });
-}
-
 const getPriceListUnitName_PriceListFragment = t(`
     fragment getPriceListUnitName_PriceListFragment on PriceList {
       charges {
@@ -26717,12 +26746,10 @@ const PricingTooltip_PriceListChargeFragment = t(`
       ...priceListChargePriceDescription_PriceListChargeFragment
       ...ChargeHasPriceTiers_PriceListChargeFragment
       ...ChargePriceTiers_PriceListChargeFragment
-      ...GetActiveCharges_PriceListChargeFragment
     }
   `, [
     ChargeHasPriceTiers_PriceListChargeFragment,
     ChargePriceTiers_PriceListChargeFragment,
-    GetActiveCharges_PriceListChargeFragment,
     priceListChargePriceDescription_PriceListChargeFragment
 ]);
 const PricingTooltip_PriceListFragment = t(`
@@ -26736,16 +26763,15 @@ const PricingTooltip_PriceListFragment = t(`
 const PricingTooltip = ({ className, priceListCharges: maskedPriceListCharges, currencyId, }) => {
     // Read fragments
     const priceListCharges = maskedPriceListCharges.map(charge => readFragment(PricingTooltip_PriceListChargeFragment, charge));
-    const activeCharges = getActiveCharges(priceListCharges);
     const content = react.useMemo(() => {
-        return (jsxRuntime.jsx("div", { className: "bunny-flex bunny-flex-col bunny-gap-3", children: activeCharges === null || activeCharges === void 0 ? void 0 : activeCharges.map((charge, index) => {
+        return (jsxRuntime.jsx("div", { className: "bunny-flex bunny-flex-col bunny-gap-3", children: priceListCharges === null || priceListCharges === void 0 ? void 0 : priceListCharges.map((charge, index) => {
                 const hasPriceTiers = chargeHasPriceTiers(charge);
                 if (hasPriceTiers) {
                     return jsxRuntime.jsx(ChargePriceTiers, { charge: charge, currencyId: currencyId }, index);
                 }
                 return (jsxRuntime.jsxs("div", { className: "bunny-flex bunny-flex-col bunny-gap-1", children: [jsxRuntime.jsx("div", { className: "bunny-text-white bunny-font-bold", children: charge.name }), jsxRuntime.jsxs("div", { className: "bunny-text-gray-400 bunny-text-xs/3", children: [getChargeBasePrice(charge, currencyId), ' ', priceListChargePriceDescription(charge)] })] }, index));
             }) }));
-    }, [activeCharges, currencyId]);
+    }, [priceListCharges, currencyId]);
     return (jsxRuntime.jsx(Tooltip, { className: `bunny-text-gray-400 bunny-text-sm ${className}`, title: content, children: jsxRuntime.jsx(icons.InfoCircleOutlined, { className: "bunny-text-gray-400 ", size: 15 }) }));
 };
 
@@ -26759,6 +26785,20 @@ function isEmptyHTML(html) {
     return /^<[^>]*>(\s*)<\/[^>]*>$/.test(html);
 }
 
+const GetActiveCharges_PriceListChargeFragment = t(`
+    fragment GetActiveCharges_PriceListChargeFragment on PriceListCharge {
+      deprecated
+      featureAddon
+    }
+  `);
+// Active charges: any charge that is not deprecated and not a feature addon
+function getActiveCharges(charges) {
+    return charges.filter(maskedCharge => {
+        const charge = readFragment(GetActiveCharges_PriceListChargeFragment, maskedCharge);
+        return !charge.deprecated && !charge.featureAddon;
+    });
+}
+
 const BillingPeriodDescription_PriceListFragment = t(`
     fragment BillingPeriodDescription_PriceListFragment on PriceList {
       periodMonths

package/dist/cjs/types/src/components/Checkout/QuoteCheckout.d.ts

@@ -72,7 +72,7 @@ export declare const QuoteCheckout_QuoteFragment: import("gql.tada").TadaDocumen
     }[];
     kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE";
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_QuoteFragment: "Quote";
+        canApplyCoupons_QuoteFragment: "Quote";
     } & {
         PaymentForm_QuoteFragment: "Quote";
     } & {
@@ -86,7 +86,7 @@ export declare const QuoteCheckout_QuoteFragment: import("gql.tada").TadaDocumen
 export declare const QuoteCheckout_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
     id: string;
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_SubscriptionFragment: "Subscription";
+        canApplyCoupons_SubscriptionFragment: "Subscription";
     };
 }, {}, {
     fragment: "QuoteCheckout_SubscriptionFragment";

package/dist/cjs/types/src/components/Signup/{CheckoutSummary.d.ts → components/CheckoutSummary/CheckoutSummary.d.ts}

@@ -29,7 +29,7 @@ export declare const CheckoutSummary_QuoteFragment: import("gql.tada").TadaDocum
         }[];
     }[] | null;
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_QuoteFragment: "Quote";
+        canApplyCoupons_QuoteFragment: "Quote";
     };
 }, {}, {
     fragment: "CheckoutSummary_QuoteFragment";

package/dist/cjs/types/src/components/Signup/components/CheckoutSummary/hooks/sortQuoteChangeCharges.d.ts

@@ -0,0 +1,14 @@
+import { ResultOf } from 'gql.tada';
+declare const sortQuoteChangeCharges_QuoteChargeFragment: import("gql.tada").TadaDocumentNode<{
+    kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE" | null;
+}, {}, {
+    fragment: "sortQuoteChangeCharges_QuoteChargeFragment";
+    on: "QuoteCharge";
+    masked: true;
+}>;
+/**
+ * Sorts quote change charges so that coupon charges appear at the end of the list.
+ * Uses a generic type so the full charge shape is preserved.
+ */
+export declare function sortQuoteChangeCharges<T extends ResultOf<typeof sortQuoteChangeCharges_QuoteChargeFragment>>(charges: T[]): T[];
+export {};

package/dist/cjs/types/src/components/Signup/fragments/Signup_QuoteFragment.d.ts

@@ -3,6 +3,8 @@ export declare const Signup_QuoteFragment: import("gql.tada").TadaDocumentNode<{
         CheckoutSummary_QuoteFragment: "Quote";
     } & {
         PaymentForms_QuoteFragment: "Quote";
+    } & {
+        useApplyDefaultCoupon_QuoteFragment: "Quote";
     };
     id: string | null;
     currencyId: string;

package/dist/cjs/types/src/components/Signup/hooks/useApplyDefaultCoupon.d.ts

@@ -0,0 +1,21 @@
+import { FragmentOf } from 'gql.tada';
+export declare const useApplyDefaultCoupon_QuoteFragment: import("gql.tada").TadaDocumentNode<{
+    [$tada.fragmentRefs]: {
+        canApplyCoupons_QuoteFragment: "Quote";
+    };
+}, {}, {
+    fragment: "useApplyDefaultCoupon_QuoteFragment";
+    on: "Quote";
+    masked: true;
+}>;
+/**
+ * Applies a default coupon code once when quoteChangeId is available.
+ * Uses a ref to ensure coupon code is only applied once.
+ */
+export default function useApplyDefaultCoupon({ couponCode, quoteChangeId, quote: maskedQuote, activeCouponsExist, addCoupon, }: {
+    couponCode: string | undefined;
+    quoteChangeId: string | undefined;
+    quote: FragmentOf<typeof useApplyDefaultCoupon_QuoteFragment> | undefined | null;
+    activeCouponsExist: boolean;
+    addCoupon: (code: string) => void;
+}): void;

package/dist/cjs/types/src/components/priceListPricing/PricingTooltip.d.ts

@@ -17,8 +17,6 @@ export declare const PricingTooltip_PriceListChargeFragment: import("gql.tada").
         ChargeHasPriceTiers_PriceListChargeFragment: "PriceListCharge";
     } & {
         ChargePriceTiers_PriceListChargeFragment: "PriceListCharge";
-    } & {
-        GetActiveCharges_PriceListChargeFragment: "PriceListCharge";
     };
 }, {}, {
     fragment: "PricingTooltip_PriceListChargeFragment";

package/dist/cjs/types/src/utils/couponUtils.d.ts

@@ -1,22 +1,22 @@
 import { FragmentOf } from 'gql.tada';
-export declare const shouldShowCouponEditor_QuoteFragment: import("gql.tada").TadaDocumentNode<{
+export declare const canApplyCoupons_QuoteFragment: import("gql.tada").TadaDocumentNode<{
     id: string | null;
     kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE";
     amountDue: number | null;
 }, {}, {
-    fragment: "shouldShowCouponEditor_QuoteFragment";
+    fragment: "canApplyCoupons_QuoteFragment";
     on: "Quote";
     masked: true;
 }>;
-export declare const shouldShowCouponEditor_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
+export declare const canApplyCoupons_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
     id: string;
     state: "ACTIVE" | "TRIAL" | "CANCELED" | "EXPIRED" | "TRIAL_EXPIRED" | "PENDING";
     charges: {
         discountedPrice: string | null;
     }[] | null;
 }, {}, {
-    fragment: "shouldShowCouponEditor_SubscriptionFragment";
+    fragment: "canApplyCoupons_SubscriptionFragment";
     on: "Subscription";
     masked: true;
 }>;
-export declare function shouldShowCouponEditor(maskedQuote: FragmentOf<typeof shouldShowCouponEditor_QuoteFragment>, activeCouponsExist: boolean, maskedUpgradingSubscription?: FragmentOf<typeof shouldShowCouponEditor_SubscriptionFragment>): boolean;
+export declare function canApplyCoupons(maskedQuote: FragmentOf<typeof canApplyCoupons_QuoteFragment> | undefined | null, activeCouponsExist: boolean, maskedUpgradingSubscription?: FragmentOf<typeof canApplyCoupons_SubscriptionFragment>): boolean;

package/dist/esm/index.js

@@ -1281,7 +1281,7 @@ const DEFAULT_CONFIG = {
 };
 
 // This will be replaced at build time by rollup-plugin-replace
-const PACKAGE_VERSION = '1.8.0-beta.2';
+const PACKAGE_VERSION = '1.8.0-beta.4';
 const createRequestHeaders = (token) => {
     const headers = createClientDevHeaders({ token });
     // Add the components version header
@@ -22953,15 +22953,15 @@ function QuotesWrapper() {
     return (jsx(TransactionsDisplay, { transactions: quotesAsTransactions, onSearchValueChanged: setSearch, search: search }));
 }
 
-const shouldShowCouponEditor_QuoteFragment = t(`
-    fragment shouldShowCouponEditor_QuoteFragment on Quote {
+const canApplyCoupons_QuoteFragment = t(`
+    fragment canApplyCoupons_QuoteFragment on Quote {
       id
       kind
       amountDue
     }
   `, []);
-const shouldShowCouponEditor_SubscriptionFragment = t(`
-    fragment shouldShowCouponEditor_SubscriptionFragment on Subscription {
+const canApplyCoupons_SubscriptionFragment = t(`
+    fragment canApplyCoupons_SubscriptionFragment on Subscription {
       id
       state
       charges {
@@ -22969,10 +22969,10 @@ const shouldShowCouponEditor_SubscriptionFragment = t(`
       }
     }
   `, []);
-function shouldShowCouponEditor(maskedQuote, activeCouponsExist, maskedUpgradingSubscription) {
+function canApplyCoupons(maskedQuote, activeCouponsExist, maskedUpgradingSubscription) {
     var _a, _b;
-    const quote = readFragment(shouldShowCouponEditor_QuoteFragment, maskedQuote);
-    const upgradingSubscription = readFragment(shouldShowCouponEditor_SubscriptionFragment, maskedUpgradingSubscription);
+    const quote = readFragment(canApplyCoupons_QuoteFragment, maskedQuote);
+    const upgradingSubscription = readFragment(canApplyCoupons_SubscriptionFragment, maskedUpgradingSubscription);
     const upgradingFromTrial = ((_a = upgradingSubscription === null || upgradingSubscription === void 0 ? void 0 : upgradingSubscription.state) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === t.scalar('SubscriptionState', 'TRIAL') ||
         ((_b = upgradingSubscription === null || upgradingSubscription === void 0 ? void 0 : upgradingSubscription.state) === null || _b === void 0 ? void 0 : _b.toUpperCase()) ===
             t.scalar('SubscriptionState', 'TRIAL_EXPIRED');
@@ -22990,7 +22990,10 @@ function shouldShowCouponEditor(maskedQuote, activeCouponsExist, maskedUpgrading
         return false;
     }
     if (quoteKindIsValid) {
-        return activeCouponsExist && (upgradingFromTrial || upgradingFromFree() || signingUpForNewSubscription);
+        const result = activeCouponsExist &&
+            (upgradingFromTrial || upgradingFromFree() || signingUpForNewSubscription);
+        console.log('returning result', result);
+        return result;
     }
     return false;
 }
@@ -23002,6 +23005,27 @@ function CouponEditor({ className, onAddCoupon, isAddingCoupon, couponCode, setC
     return (jsx("div", { className: `bunny-flex bunny-flex-col bunny-gap-2 ${className}`, children: jsxs("div", { className: "bunny-flex bunny-flex-row bunny-gap-2", children: [jsx(Input, { value: couponCode, onChange: e => setCouponCode(e.target.value), placeholder: "Coupon code", disabled: isAddingCoupon, size: "small" }), jsx(Button, { loading: isAddingCoupon, type: "primary", onClick: handleAddCoupon, disabled: couponCode.length === 0, children: "Apply" })] }) }));
 }
 
+t(`
+    fragment sortQuoteChangeCharges_QuoteChargeFragment on QuoteCharge {
+      kind
+    }
+  `, []);
+/**
+ * Sorts quote change charges so that coupon charges appear at the end of the list.
+ * Uses a generic type so the full charge shape is preserved.
+ */
+function sortQuoteChangeCharges(charges) {
+    return [...charges].sort((chargeA, chargeB) => {
+        const aIsCoupon = chargeA.kind === 'COUPON';
+        const bIsCoupon = chargeB.kind === 'COUPON';
+        if (aIsCoupon && !bIsCoupon)
+            return 1;
+        if (!aIsCoupon && bIsCoupon)
+            return -1;
+        return 0;
+    });
+}
+
 const { Text: Text$r } = Typography;
 const CheckoutSummary_PriceListFragment = t(`
     fragment CheckoutSummary_PriceListFragment on PriceList {
@@ -23031,14 +23055,14 @@ const CheckoutSummary_QuoteFragment = t(`
           currencyId
         }
       }
-      ...shouldShowCouponEditor_QuoteFragment
+      ...canApplyCoupons_QuoteFragment
     }
-  `, [shouldShowCouponEditor_QuoteFragment]);
+  `, [canApplyCoupons_QuoteFragment]);
 function CheckoutSummary({ quote: maskedQuote, className, onAddCoupon, onRemoveCoupon, isRemovingCoupon, priceList: maskedPriceList, isAddingCoupon, couponCode, setCouponCode, activeCouponsExist, }) {
     var _a, _b;
     const priceList = readFragment(CheckoutSummary_PriceListFragment, maskedPriceList);
     const quote = readFragment(CheckoutSummary_QuoteFragment, maskedQuote);
-    return (jsxs("div", { className: `${className} bunny-space-y-4`, children: [jsxs(Text$r, { children: [jsxs("div", { className: "bunny-text-lg bunny-font-medium bunny-mb-4", children: ["Checkout summary - ", (_a = priceList === null || priceList === void 0 ? void 0 : priceList.product) === null || _a === void 0 ? void 0 : _a.name, " ", priceList === null || priceList === void 0 ? void 0 : priceList.name] }), jsx("div", { className: "bunny-space-y-4", children: (_b = quote === null || quote === void 0 ? void 0 : quote.quoteChanges) === null || _b === void 0 ? void 0 : _b.map(quoteChange => quoteChange === null || quoteChange === void 0 ? void 0 : quoteChange.charges.map(charge => {
+    return (jsxs("div", { className: `${className} bunny-space-y-4`, children: [jsxs(Text$r, { children: [jsxs("div", { className: "bunny-text-lg bunny-font-medium bunny-mb-4", children: ["Checkout summary - ", (_a = priceList === null || priceList === void 0 ? void 0 : priceList.product) === null || _a === void 0 ? void 0 : _a.name, " ", priceList === null || priceList === void 0 ? void 0 : priceList.name] }), jsx("div", { className: "bunny-space-y-4", children: (_b = quote === null || quote === void 0 ? void 0 : quote.quoteChanges) === null || _b === void 0 ? void 0 : _b.map(quoteChange => sortQuoteChangeCharges(quoteChange === null || quoteChange === void 0 ? void 0 : quoteChange.charges).map(charge => {
                             var _a;
                             const multiplier = charge.kind === 'COUPON' ? -1 : 1;
                             return (jsxs("div", { className: "bunny-grid bunny-grid-cols-3 bunny-gap-4 bunny-items-center", children: [jsx("div", { className: "bunny-col-span-1", children: charge.name }), jsx("div", { className: "bunny-col-span-1 bunny-text-center", children: ((_a = charge.coupon) === null || _a === void 0 ? void 0 : _a.couponCode) ? (jsx("button", { onClick: () => {
@@ -23051,7 +23075,7 @@ function CheckoutSummary({ quote: maskedQuote, className, onAddCoupon, onRemoveC
                                                 }
                                                 onRemoveCoupon((_b = charge.coupon) === null || _b === void 0 ? void 0 : _b.couponCode);
                                             }, className: "bunny-text-orange-500 hover:bunny-text-orange-400 bunny-cursor-pointer bunny-bg-transparent bunny-border-none", children: "Remove" })) : (jsx("div", { children: charge.quantity })) }), jsx("div", { className: "bunny-col-span-1 bunny-text-right", children: formatCurrency(multiplier * (charge.subtotal || 0), charge.currencyId) })] }, charge.id));
-                        })) }), jsx(CheckoutSummaryDivider, {}), jsxs("div", { className: "bunny-space-y-4", children: [jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Subtotal" }), jsx("div", { children: formatCurrency(quote.subtotal, quote.currencyId) })] }), jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Taxes" }), jsx("div", { children: formatCurrency(quote.taxAmount, quote.currencyId) })] })] }), jsx(CheckoutSummaryDivider, {}), jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Total" }), jsx("div", { children: formatCurrency(quote.amountDue, quote.currencyId) })] })] }), shouldShowCouponEditor(quote, activeCouponsExist) && (jsx(CouponEditor, { className: "bunny-w-full", onAddCoupon: onAddCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode }))] }));
+                        })) }), jsx(CheckoutSummaryDivider, {}), jsxs("div", { className: "bunny-space-y-4", children: [jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Subtotal" }), jsx("div", { children: formatCurrency(quote.subtotal, quote.currencyId) })] }), jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Taxes" }), jsx("div", { children: formatCurrency(quote.taxAmount, quote.currencyId) })] })] }), jsx(CheckoutSummaryDivider, {}), jsxs("div", { className: "bunny-flex bunny-justify-between", children: [jsx("div", { children: "Total" }), jsx("div", { children: formatCurrency(quote.amountDue, quote.currencyId) })] })] }), canApplyCoupons(quote, activeCouponsExist) && (jsx(CouponEditor, { className: "bunny-w-full", onAddCoupon: onAddCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode }))] }));
 }
 const CheckoutSummaryDivider = () => {
     return (jsx("div", { className: "bunny-my-2", children: jsx(Divider, { className: "m-0" }) }));
@@ -23102,10 +23126,36 @@ function InitialSignupForm({ className, onSubmit, submitting, defaultValues, })
                                 } }) }) }) }), jsx(Form.Item, { children: jsx(Button, { type: "primary", onClick: handleSubmit, loading: submitting, className: "bunny-w-full", children: "Proceed to payment" }) })] }) }));
 }
 
+const useApplyDefaultCoupon_QuoteFragment = t(`
+    fragment useApplyDefaultCoupon_QuoteFragment on Quote {
+      ...canApplyCoupons_QuoteFragment
+    }
+  `, [canApplyCoupons_QuoteFragment]);
+/**
+ * Applies a default coupon code once when quoteChangeId is available.
+ * Uses a ref to ensure coupon code is only applied once.
+ */
+function useApplyDefaultCoupon({ couponCode, quoteChangeId, quote: maskedQuote, activeCouponsExist, addCoupon, }) {
+    const defaultCouponAppliedRef = useRef(undefined);
+    // Derived state
+    const quote = readFragment(useApplyDefaultCoupon_QuoteFragment, maskedQuote);
+    const canApplyCouponsResult = canApplyCoupons(quote, activeCouponsExist);
+    useEffect(() => {
+        if (couponCode &&
+            quoteChangeId &&
+            defaultCouponAppliedRef.current !== couponCode &&
+            canApplyCouponsResult) {
+            addCoupon(couponCode);
+            defaultCouponAppliedRef.current = couponCode;
+        }
+    }, [couponCode, quoteChangeId, addCoupon, canApplyCouponsResult]);
+}
+
 const Signup_QuoteFragment = t(`
     fragment Signup_QuoteFragment on Quote {
       ...CheckoutSummary_QuoteFragment
       ...PaymentForms_QuoteFragment
+      ...useApplyDefaultCoupon_QuoteFragment
       id
       currencyId
       amountDue
@@ -23113,7 +23163,7 @@ const Signup_QuoteFragment = t(`
         id
       }
     }
-  `, [CheckoutSummary_QuoteFragment, PaymentForms_QuoteFragment]);
+  `, [CheckoutSummary_QuoteFragment, PaymentForms_QuoteFragment, useApplyDefaultCoupon_QuoteFragment]);
 
 const query$6 = t(`
     query quote($id: ID) {
@@ -23569,7 +23619,6 @@ function Signup({ companyName, priceListCode, returnUrl, couponCode, className,
     const [portalSessionToken, setPortalSessionToken] = useState(undefined);
     const token = portalSessionToken || tokenFromContexts;
     const [purchaseSucceeded, setPurchaseSucceeded] = useState(false);
-    const defaultCouponAppliedRef = useRef(undefined);
     const [couponEditorCouponCode, setCouponEditorCouponCode] = useState('');
     // Read fragment
     const initialQuoteId = (_a = readFragment(Signup_QuoteFragment, initialQuote)) === null || _a === void 0 ? void 0 : _a.id;
@@ -23686,13 +23735,7 @@ function Signup({ companyName, priceListCode, returnUrl, couponCode, className,
             handleRecalculateTaxes(quote === null || quote === void 0 ? void 0 : quote.id);
         },
     });
-    // Handle default coupon application
-    useEffect(() => {
-        if (couponCode && quoteChangeId && defaultCouponAppliedRef.current !== couponCode) {
-            addCoupon(couponCode);
-            defaultCouponAppliedRef.current = couponCode;
-        }
-    }, [couponCode, quoteChangeId]);
+    useApplyDefaultCoupon({ couponCode, quoteChangeId, addCoupon, activeCouponsExist, quote });
     async function handleSubmit(formData) {
         if (selfServiceBuyEnabled === false) {
             handleShowSelfServiceBuyWarning();
@@ -23922,22 +23965,22 @@ const QuoteCheckout_QuoteFragment = t(`
         }
       }
       ...QuoteFields_QuoteFragment
-      ...shouldShowCouponEditor_QuoteFragment
+      ...canApplyCoupons_QuoteFragment
       ...PaymentForm_QuoteFragment
       ...getQuoteAmountDue_QuoteFragment
     }
   `, [
     QuoteFields_QuoteFragment,
-    shouldShowCouponEditor_QuoteFragment,
+    canApplyCoupons_QuoteFragment,
     PaymentForm_QuoteFragment,
     getQuoteAmountDue_QuoteFragment,
 ]);
 const QuoteCheckout_SubscriptionFragment = t(`
     fragment QuoteCheckout_SubscriptionFragment on Subscription {
       id
-      ...shouldShowCouponEditor_SubscriptionFragment
+      ...canApplyCoupons_SubscriptionFragment
     }
-  `, [shouldShowCouponEditor_SubscriptionFragment]);
+  `, [canApplyCoupons_SubscriptionFragment]);
 const showSuccessNotification = useSuccessNotification();
 const QuoteCheckout = ({ account, onSuccess, onFail, quote: maskedQuote, taxationRequiredAccountFields, isUpdatingQuote, onRecalculateTaxes, isRecalculatingTaxes, }) => {
     var _a, _b, _c, _d, _e;
@@ -24023,7 +24066,7 @@ const QuoteCheckout = ({ account, onSuccess, onFail, quote: maskedQuote, taxatio
     if (taxationRequiredAccountFields)
         return (jsx(PaymentFormWrapper, { setMaxHeight: false, children: jsx(TaxationForm, { account: account, accountId: quote.accountId }) }));
     return (jsx(PaymentFormWrapper, { setMaxHeight: false, children: paymentRequired ? (jsxs("div", { className: "bunny-flex bunny-flex-col bunny-gap-2 bunny-w-full", children: [jsx(PaymentForm, { onPaymentSuccess: onSuccess, quote: quote, onSavePaymentMethod: (paymentMethod) => onPaymentMethodSaved === null || onPaymentMethodSaved === void 0 ? void 0 : onPaymentMethodSaved(paymentMethod.savedPaymentMethodResponse.paymentMethodId), onPaymentMethodRemoved: (paymentMethod) => onPaymentMethodRemoved === null || onPaymentMethodRemoved === void 0 ? void 0 : onPaymentMethodRemoved(paymentMethod.id), disablePayButton: isFinalizingQuote }), isFinalizingQuote && jsx(QuoteLoadingIndicator, {}), (couponsOnQuote === null || couponsOnQuote === void 0 ? void 0 : couponsOnQuote.length) === 0 ? (jsx(Fragment, { children: upgradingSubscription &&
-                        shouldShowCouponEditor(quote, activeCouponsExist, upgradingSubscription) && (jsx(CouponEditor, { className: "bunny-px-4 bunny-pt-1", onAddCoupon: addCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode })) })) : (jsx(Button, { type: "link", loading: isRemovingCoupon, onClick: () => {
+                        canApplyCoupons(quote, activeCouponsExist, upgradingSubscription) && (jsx(CouponEditor, { className: "bunny-px-4 bunny-pt-1", onAddCoupon: addCoupon, isAddingCoupon: isAddingCoupon, couponCode: couponCode, setCouponCode: setCouponCode })) })) : (jsx(Button, { type: "link", loading: isRemovingCoupon, onClick: () => {
                         couponsOnQuote === null || couponsOnQuote === void 0 ? void 0 : couponsOnQuote.forEach(couponCharge => {
                             var _a;
                             const couponCode = (_a = couponCharge === null || couponCharge === void 0 ? void 0 : couponCharge.coupon) === null || _a === void 0 ? void 0 : _a.couponCode;
@@ -26559,20 +26602,6 @@ function priceListChargePriceDescription(maskedPriceListCharge) {
     return `Per ${unitName ? `${unitName} / ` : ''}${priceListCharge.showPriceAsMonthly ? 'month' : periodLabel}`;
 }
 
-const GetActiveCharges_PriceListChargeFragment = t(`
-    fragment GetActiveCharges_PriceListChargeFragment on PriceListCharge {
-      deprecated
-      featureAddon
-    }
-  `);
-// Active charges: any charge that is not deprecated and not a feature addon
-function getActiveCharges(charges) {
-    return charges.filter(maskedCharge => {
-        const charge = readFragment(GetActiveCharges_PriceListChargeFragment, maskedCharge);
-        return !charge.deprecated && !charge.featureAddon;
-    });
-}
-
 const getPriceListUnitName_PriceListFragment = t(`
     fragment getPriceListUnitName_PriceListFragment on PriceList {
       charges {
@@ -26715,12 +26744,10 @@ const PricingTooltip_PriceListChargeFragment = t(`
       ...priceListChargePriceDescription_PriceListChargeFragment
       ...ChargeHasPriceTiers_PriceListChargeFragment
       ...ChargePriceTiers_PriceListChargeFragment
-      ...GetActiveCharges_PriceListChargeFragment
     }
   `, [
     ChargeHasPriceTiers_PriceListChargeFragment,
     ChargePriceTiers_PriceListChargeFragment,
-    GetActiveCharges_PriceListChargeFragment,
     priceListChargePriceDescription_PriceListChargeFragment
 ]);
 const PricingTooltip_PriceListFragment = t(`
@@ -26734,16 +26761,15 @@ const PricingTooltip_PriceListFragment = t(`
 const PricingTooltip = ({ className, priceListCharges: maskedPriceListCharges, currencyId, }) => {
     // Read fragments
     const priceListCharges = maskedPriceListCharges.map(charge => readFragment(PricingTooltip_PriceListChargeFragment, charge));
-    const activeCharges = getActiveCharges(priceListCharges);
     const content = useMemo(() => {
-        return (jsx("div", { className: "bunny-flex bunny-flex-col bunny-gap-3", children: activeCharges === null || activeCharges === void 0 ? void 0 : activeCharges.map((charge, index) => {
+        return (jsx("div", { className: "bunny-flex bunny-flex-col bunny-gap-3", children: priceListCharges === null || priceListCharges === void 0 ? void 0 : priceListCharges.map((charge, index) => {
                 const hasPriceTiers = chargeHasPriceTiers(charge);
                 if (hasPriceTiers) {
                     return jsx(ChargePriceTiers, { charge: charge, currencyId: currencyId }, index);
                 }
                 return (jsxs("div", { className: "bunny-flex bunny-flex-col bunny-gap-1", children: [jsx("div", { className: "bunny-text-white bunny-font-bold", children: charge.name }), jsxs("div", { className: "bunny-text-gray-400 bunny-text-xs/3", children: [getChargeBasePrice(charge, currencyId), ' ', priceListChargePriceDescription(charge)] })] }, index));
             }) }));
-    }, [activeCharges, currencyId]);
+    }, [priceListCharges, currencyId]);
     return (jsx(Tooltip, { className: `bunny-text-gray-400 bunny-text-sm ${className}`, title: content, children: jsx(InfoCircleOutlined, { className: "bunny-text-gray-400 ", size: 15 }) }));
 };
 
@@ -26757,6 +26783,20 @@ function isEmptyHTML(html) {
     return /^<[^>]*>(\s*)<\/[^>]*>$/.test(html);
 }
 
+const GetActiveCharges_PriceListChargeFragment = t(`
+    fragment GetActiveCharges_PriceListChargeFragment on PriceListCharge {
+      deprecated
+      featureAddon
+    }
+  `);
+// Active charges: any charge that is not deprecated and not a feature addon
+function getActiveCharges(charges) {
+    return charges.filter(maskedCharge => {
+        const charge = readFragment(GetActiveCharges_PriceListChargeFragment, maskedCharge);
+        return !charge.deprecated && !charge.featureAddon;
+    });
+}
+
 const BillingPeriodDescription_PriceListFragment = t(`
     fragment BillingPeriodDescription_PriceListFragment on PriceList {
       periodMonths

package/dist/esm/types/src/components/Checkout/QuoteCheckout.d.ts

@@ -72,7 +72,7 @@ export declare const QuoteCheckout_QuoteFragment: import("gql.tada").TadaDocumen
     }[];
     kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE";
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_QuoteFragment: "Quote";
+        canApplyCoupons_QuoteFragment: "Quote";
     } & {
         PaymentForm_QuoteFragment: "Quote";
     } & {
@@ -86,7 +86,7 @@ export declare const QuoteCheckout_QuoteFragment: import("gql.tada").TadaDocumen
 export declare const QuoteCheckout_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
     id: string;
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_SubscriptionFragment: "Subscription";
+        canApplyCoupons_SubscriptionFragment: "Subscription";
     };
 }, {}, {
     fragment: "QuoteCheckout_SubscriptionFragment";

package/dist/esm/types/src/components/Signup/{CheckoutSummary.d.ts → components/CheckoutSummary/CheckoutSummary.d.ts}

@@ -29,7 +29,7 @@ export declare const CheckoutSummary_QuoteFragment: import("gql.tada").TadaDocum
         }[];
     }[] | null;
     [$tada.fragmentRefs]: {
-        shouldShowCouponEditor_QuoteFragment: "Quote";
+        canApplyCoupons_QuoteFragment: "Quote";
     };
 }, {}, {
     fragment: "CheckoutSummary_QuoteFragment";

package/dist/esm/types/src/components/Signup/components/CheckoutSummary/hooks/sortQuoteChangeCharges.d.ts

@@ -0,0 +1,14 @@
+import { ResultOf } from 'gql.tada';
+declare const sortQuoteChangeCharges_QuoteChargeFragment: import("gql.tada").TadaDocumentNode<{
+    kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE" | null;
+}, {}, {
+    fragment: "sortQuoteChangeCharges_QuoteChargeFragment";
+    on: "QuoteCharge";
+    masked: true;
+}>;
+/**
+ * Sorts quote change charges so that coupon charges appear at the end of the list.
+ * Uses a generic type so the full charge shape is preserved.
+ */
+export declare function sortQuoteChangeCharges<T extends ResultOf<typeof sortQuoteChangeCharges_QuoteChargeFragment>>(charges: T[]): T[];
+export {};

package/dist/esm/types/src/components/Signup/fragments/Signup_QuoteFragment.d.ts

@@ -3,6 +3,8 @@ export declare const Signup_QuoteFragment: import("gql.tada").TadaDocumentNode<{
         CheckoutSummary_QuoteFragment: "Quote";
     } & {
         PaymentForms_QuoteFragment: "Quote";
+    } & {
+        useApplyDefaultCoupon_QuoteFragment: "Quote";
     };
     id: string | null;
     currencyId: string;

package/dist/esm/types/src/components/Signup/hooks/useApplyDefaultCoupon.d.ts

@@ -0,0 +1,21 @@
+import { FragmentOf } from 'gql.tada';
+export declare const useApplyDefaultCoupon_QuoteFragment: import("gql.tada").TadaDocumentNode<{
+    [$tada.fragmentRefs]: {
+        canApplyCoupons_QuoteFragment: "Quote";
+    };
+}, {}, {
+    fragment: "useApplyDefaultCoupon_QuoteFragment";
+    on: "Quote";
+    masked: true;
+}>;
+/**
+ * Applies a default coupon code once when quoteChangeId is available.
+ * Uses a ref to ensure coupon code is only applied once.
+ */
+export default function useApplyDefaultCoupon({ couponCode, quoteChangeId, quote: maskedQuote, activeCouponsExist, addCoupon, }: {
+    couponCode: string | undefined;
+    quoteChangeId: string | undefined;
+    quote: FragmentOf<typeof useApplyDefaultCoupon_QuoteFragment> | undefined | null;
+    activeCouponsExist: boolean;
+    addCoupon: (code: string) => void;
+}): void;

package/dist/esm/types/src/components/priceListPricing/PricingTooltip.d.ts

@@ -17,8 +17,6 @@ export declare const PricingTooltip_PriceListChargeFragment: import("gql.tada").
         ChargeHasPriceTiers_PriceListChargeFragment: "PriceListCharge";
     } & {
         ChargePriceTiers_PriceListChargeFragment: "PriceListCharge";
-    } & {
-        GetActiveCharges_PriceListChargeFragment: "PriceListCharge";
     };
 }, {}, {
     fragment: "PricingTooltip_PriceListChargeFragment";

package/dist/esm/types/src/utils/couponUtils.d.ts

@@ -1,22 +1,22 @@
 import { FragmentOf } from 'gql.tada';
-export declare const shouldShowCouponEditor_QuoteFragment: import("gql.tada").TadaDocumentNode<{
+export declare const canApplyCoupons_QuoteFragment: import("gql.tada").TadaDocumentNode<{
     id: string | null;
     kind: "SUBSCRIBE" | "UPDATE" | "RENEW" | "REINSTATE" | "UNSUBSCRIBE" | "ADJUSTMENT" | "COUPON" | "DISCOUNT" | "CREDIT" | "PRICE_UPDATE" | "QUANTITY_UPDATE" | "FREE_PERIOD_DISCOUNT" | "ACTIVATE";
     amountDue: number | null;
 }, {}, {
-    fragment: "shouldShowCouponEditor_QuoteFragment";
+    fragment: "canApplyCoupons_QuoteFragment";
     on: "Quote";
     masked: true;
 }>;
-export declare const shouldShowCouponEditor_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
+export declare const canApplyCoupons_SubscriptionFragment: import("gql.tada").TadaDocumentNode<{
     id: string;
     state: "ACTIVE" | "TRIAL" | "CANCELED" | "EXPIRED" | "TRIAL_EXPIRED" | "PENDING";
     charges: {
         discountedPrice: string | null;
     }[] | null;
 }, {}, {
-    fragment: "shouldShowCouponEditor_SubscriptionFragment";
+    fragment: "canApplyCoupons_SubscriptionFragment";
     on: "Subscription";
     masked: true;
 }>;
-export declare function shouldShowCouponEditor(maskedQuote: FragmentOf<typeof shouldShowCouponEditor_QuoteFragment>, activeCouponsExist: boolean, maskedUpgradingSubscription?: FragmentOf<typeof shouldShowCouponEditor_SubscriptionFragment>): boolean;
+export declare function canApplyCoupons(maskedQuote: FragmentOf<typeof canApplyCoupons_QuoteFragment> | undefined | null, activeCouponsExist: boolean, maskedUpgradingSubscription?: FragmentOf<typeof canApplyCoupons_SubscriptionFragment>): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnyapp/components",
-  "version": "1.8.0-beta.3",
+  "version": "1.8.0-beta.5",
   "description": "Components from the Bunny portal to embed Bunny UI functionality into your application.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",