@carlonicora/nextjs-jsonapi 1.32.1 → 1.33.0

package/dist/billing/index.mjs

@@ -47,12 +47,13 @@ import {
   TabsList,
   TabsTrigger,
   useCurrentUserContext
-} from "../chunk-SLANIL6B.mjs";
+} from "../chunk-53WT73E6.mjs";
 import {
   getRoleId,
   getStripePublishableKey
-} from "../chunk-IXVNXOZT.mjs";
+} from "../chunk-XLMJPA4N.mjs";
 import {
+  FeatureService,
   StripeCustomerService,
   StripeInvoiceService,
   StripePriceService,
@@ -60,7 +61,7 @@ import {
   StripeSubscriptionService,
   StripeUsageService,
   cn
-} from "../chunk-YCP2OMFD.mjs";
+} from "../chunk-HWQBSVBT.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import "../chunk-U4MTVHOC.mjs";
@@ -981,7 +982,7 @@ function InvoiceDetails({ invoice, open, onOpenChange, onInvoiceChange }) {
       ] }),
       /* @__PURE__ */ jsxs10("div", { children: [
         /* @__PURE__ */ jsx12("h4", { className: "text-sm font-medium text-muted-foreground mb-2", children: "Line Items" }),
-        /* @__PURE__ */ jsx12("div", { className: "border rounded-lg overflow-hidden", children: /* @__PURE__ */ jsxs10("table", { className: "w-full", children: [
+        /* @__PURE__ */ jsx12("div", { className: "border rounded-lg overflow-clip", children: /* @__PURE__ */ jsxs10("table", { className: "w-full", children: [
           /* @__PURE__ */ jsx12("thead", { className: "bg-muted", children: /* @__PURE__ */ jsxs10("tr", { children: [
             /* @__PURE__ */ jsx12("th", { className: "text-left p-3 text-sm font-medium", children: "Description" }),
             /* @__PURE__ */ jsx12("th", { className: "text-right p-3 text-sm font-medium", children: "Amount" })
@@ -1047,7 +1048,7 @@ function InvoicesList({ invoices, onInvoicesChange }) {
     return invoice.stripeInvoiceId.slice(-8);
   }, "getInvoiceNumber");
   return /* @__PURE__ */ jsxs11(Fragment2, { children: [
-    /* @__PURE__ */ jsx13("div", { className: "border rounded-lg overflow-hidden", children: /* @__PURE__ */ jsxs11(Table, { children: [
+    /* @__PURE__ */ jsx13("div", { className: "border rounded-lg overflow-clip", children: /* @__PURE__ */ jsxs11(Table, { children: [
       /* @__PURE__ */ jsx13(TableHeader, { className: "bg-muted", children: /* @__PURE__ */ jsxs11(TableRow, { children: [
         /* @__PURE__ */ jsx13(TableHead, { children: "Invoice #" }),
         /* @__PURE__ */ jsx13(TableHead, { children: "Date" }),
@@ -1153,7 +1154,6 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 var formSchema = z.object({
-  cancelImmediately: z.boolean(),
   reason: z.string().optional()
 });
 function CancelSubscriptionDialog({
@@ -1166,17 +1166,15 @@ function CancelSubscriptionDialog({
   const form = useForm({
     resolver: zodResolver(formSchema),
     defaultValues: {
-      cancelImmediately: false,
       reason: ""
     }
   });
-  const cancelImmediately = form.watch("cancelImmediately");
   const onSubmit = /* @__PURE__ */ __name(async (values) => {
     setIsSubmitting(true);
     try {
       await StripeSubscriptionService.cancelSubscription({
         id: subscription.id,
-        cancelImmediately: values.cancelImmediately
+        cancelImmediately: false
       });
       onSuccess();
       onOpenChange(false);
@@ -1193,8 +1191,7 @@ function CancelSubscriptionDialog({
       /* @__PURE__ */ jsx15(DialogDescription, { children: "Are you sure you want to cancel this subscription? This action cannot be undone." })
     ] }),
     /* @__PURE__ */ jsx15(Form, { ...form, children: /* @__PURE__ */ jsxs13("form", { onSubmit: form.handleSubmit(onSubmit), className: "flex flex-col gap-y-4", children: [
-      /* @__PURE__ */ jsx15(FormCheckbox, { form, id: "cancelImmediately", name: "Cancel Immediately" }),
-      cancelImmediately ? /* @__PURE__ */ jsx15("div", { className: "bg-red-50 border border-red-200 rounded-lg p-3 text-sm text-red-800", children: "Your subscription will be canceled immediately and you will lose access right away." }) : /* @__PURE__ */ jsxs13("div", { className: "bg-blue-50 border border-blue-200 rounded-lg p-3 text-sm text-blue-800", children: [
+      /* @__PURE__ */ jsxs13("div", { className: "bg-blue-50 border border-blue-200 rounded-lg p-3 text-sm text-blue-800", children: [
         "Your subscription will remain active until ",
         periodEndDate,
         ". You can continue using the service until then."
@@ -1423,7 +1420,7 @@ function SubscriptionsList({ subscriptions, onSubscriptionsChange, onChangePlan
     setSelectedSub(subscription);
   }, "handleRowClick");
   return /* @__PURE__ */ jsxs15(Fragment4, { children: [
-    /* @__PURE__ */ jsx18("div", { className: "border rounded-lg overflow-hidden", children: /* @__PURE__ */ jsxs15(Table, { children: [
+    /* @__PURE__ */ jsx18("div", { className: "border rounded-lg overflow-clip", children: /* @__PURE__ */ jsxs15(Table, { children: [
       /* @__PURE__ */ jsx18(TableHeader, { className: "bg-muted", children: /* @__PURE__ */ jsxs15(TableRow, { children: [
         /* @__PURE__ */ jsx18(TableHead, { children: "Status" }),
         /* @__PURE__ */ jsx18(TableHead, { children: "Plan" }),
@@ -1472,7 +1469,7 @@ __name(SubscriptionsList, "SubscriptionsList");
 
 // src/features/billing/stripe-subscription/components/containers/SubscriptionsContainer.tsx
 import { jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
-function SubscriptionsContainer({ onOpenWizard }) {
+function SubscriptionsContainer({ onOpenWizard, hasActiveRecurringSubscription }) {
   const [subscriptions, setSubscriptions] = useState10([]);
   const [loading, setLoading] = useState10(true);
   const loadSubscriptions = useCallback(async () => {
@@ -1501,7 +1498,7 @@ function SubscriptionsContainer({ onOpenWizard }) {
         /* @__PURE__ */ jsx19(CreditCard3, { className: "h-8 w-8" }),
         /* @__PURE__ */ jsx19("h1", { className: "text-3xl font-bold", children: "Subscriptions" })
       ] }),
-      subscriptions.length > 0 && /* @__PURE__ */ jsx19(Button, { onClick: () => onOpenWizard?.(), children: "Subscribe to a Plan" })
+      subscriptions.length > 0 && /* @__PURE__ */ jsx19(Button, { onClick: () => onOpenWizard?.(), children: hasActiveRecurringSubscription ? "Purchase Add-ons" : "Subscribe to a Plan" })
     ] }),
     criticalSubscriptions.map((subscription) => /* @__PURE__ */ jsx19(BillingAlertBanner, { subscription }, subscription.id)),
     subscriptions.length === 0 && /* @__PURE__ */ jsxs16("div", { className: "flex flex-col items-center justify-center py-12 space-y-4", children: [
@@ -1669,7 +1666,8 @@ function ProductPricingList({
   loadingPriceId,
   loading = false,
   onSelectPrice,
-  hideRecurringPrices = false
+  hideRecurringPrices = false,
+  hideOneTimePrices = false
 }) {
   if (loading) {
     return /* @__PURE__ */ jsx23(ProductPricingListSkeleton, {});
@@ -1684,13 +1682,16 @@ function ProductPricingList({
     if (!aRecurring && bRecurring) return 1;
     return 0;
   });
-  const filteredProducts = hideRecurringPrices ? sortedProducts.map((product) => ({
-    ...product,
-    stripePrices: (product.stripePrices || []).filter((price) => price.priceType !== "recurring")
-  })).filter((product) => product.stripePrices.length > 0) : sortedProducts;
-  return /* @__PURE__ */ jsx23("div", { className: "space-y-6", children: filteredProducts.map((product) => {
+  return /* @__PURE__ */ jsx23("div", { className: "space-y-6", children: sortedProducts.map((product) => {
     const allPrices = product.stripePrices || [];
-    const filteredPrices = getFilteredPrices(allPrices, selectedInterval);
+    let pricesToFilter = allPrices;
+    if (hideRecurringPrices) {
+      pricesToFilter = pricesToFilter.filter((price) => price.priceType !== "recurring");
+    }
+    if (hideOneTimePrices) {
+      pricesToFilter = pricesToFilter.filter((price) => price.priceType !== "one_time");
+    }
+    const filteredPrices = getFilteredPrices(pricesToFilter, selectedInterval);
     if (filteredPrices.length === 0) {
       return null;
     }
@@ -1994,6 +1995,7 @@ function WizardStepPlanSelection({
   selectedInterval,
   currentPriceId,
   hideRecurringPrices,
+  hideOneTimePrices,
   onSelectPrice,
   onIntervalChange,
   onNext,
@@ -2033,7 +2035,7 @@ function WizardStepPlanSelection({
     onSelectPrice(price);
   }, "handleSelectPrice");
   return /* @__PURE__ */ jsxs24("div", { className: "space-y-6", children: [
-    /* @__PURE__ */ jsx27("div", { className: "flex justify-center", children: /* @__PURE__ */ jsx27(
+    !hideRecurringPrices && /* @__PURE__ */ jsx27("div", { className: "flex justify-center", children: /* @__PURE__ */ jsx27(
       IntervalToggle,
       {
         value: selectedInterval,
@@ -2051,6 +2053,7 @@ function WizardStepPlanSelection({
         selectedPriceId: selectedPrice?.id,
         loading,
         hideRecurringPrices,
+        hideOneTimePrices,
         onSelectPrice: handleSelectPrice
       }
     ),
@@ -2101,7 +2104,7 @@ function WizardStepReview({
       /* @__PURE__ */ jsx28("p", { className: "text-sm text-blue-700", children: "Your next charge will be adjusted to account for the plan change." }),
       /* @__PURE__ */ jsxs25("div", { className: "flex justify-between text-sm", children: [
         /* @__PURE__ */ jsx28("span", { className: "text-blue-600", children: "Amount due now:" }),
-        /* @__PURE__ */ jsx28("span", { className: "font-medium text-blue-800", children: formatCurrency(prorationPreview.amountDue, prorationPreview.currency) })
+        /* @__PURE__ */ jsx28("span", { className: "font-medium text-blue-800", children: formatCurrency(prorationPreview.immediateCharge, prorationPreview.currency) })
       ] })
     ] }),
     /* @__PURE__ */ jsx28("div", { className: "border rounded-lg p-4", children: /* @__PURE__ */ jsxs25("div", { className: "flex justify-between items-center", children: [
@@ -2184,8 +2187,10 @@ function SubscriptionWizard({
       actions.reset();
     }
   }, [open, actions.reset]);
-  const dialogTitle = subscription ? "Change Subscription Plan" : "Subscribe to a Plan";
-  const dialogDescription = subscription ? "Select a new plan for your subscription" : "Choose a subscription plan to get started";
+  const isPurchasingAddons = hasActiveRecurringSubscription && !subscription;
+  const isChangePlanMode = !!subscription;
+  const dialogTitle = subscription ? "Change Subscription Plan" : isPurchasingAddons ? "Purchase Add-ons" : "Subscribe to a Plan";
+  const dialogDescription = subscription ? "Select a new plan for your subscription" : isPurchasingAddons ? "Select one-time products to purchase" : "Choose a subscription plan to get started";
   return /* @__PURE__ */ jsx30(Dialog, { open, onOpenChange, children: /* @__PURE__ */ jsxs27(DialogContent, { className: "max-w-2xl", children: [
     /* @__PURE__ */ jsxs27(DialogHeader, { children: [
       /* @__PURE__ */ jsx30(DialogTitle, { children: dialogTitle }),
@@ -2198,7 +2203,8 @@ function SubscriptionWizard({
         selectedPrice: state.selectedPrice,
         selectedInterval: state.selectedInterval,
         currentPriceId: subscription?.price?.id,
-        hideRecurringPrices: hasActiveRecurringSubscription && !subscription,
+        hideRecurringPrices: isPurchasingAddons,
+        hideOneTimePrices: isChangePlanMode,
         onSelectPrice: actions.selectPrice,
         onIntervalChange: actions.setInterval,
         onNext: actions.goToReview,
@@ -2401,7 +2407,7 @@ function UsageHistoryTable({ usageRecords }) {
   }
   return /* @__PURE__ */ jsxs30("div", { className: "flex w-full flex-col gap-y-4", children: [
     /* @__PURE__ */ jsx34("h2", { className: "text-xl font-semibold", children: "Usage History" }),
-    /* @__PURE__ */ jsx34("div", { className: "overflow-hidden rounded-lg border", children: /* @__PURE__ */ jsxs30(Table, { children: [
+    /* @__PURE__ */ jsx34("div", { className: "overflow-clip rounded-lg border", children: /* @__PURE__ */ jsxs30(Table, { children: [
       /* @__PURE__ */ jsx34(TableHeader, { className: "bg-muted", children: /* @__PURE__ */ jsxs30(TableRow, { children: [
         /* @__PURE__ */ jsx34(TableHead, { children: "Date & Time" }),
         /* @__PURE__ */ jsx34(TableHead, { children: "Meter Event" }),
@@ -2777,7 +2783,13 @@ function BillingDashboardContainer() {
           open: activeModal === "subscriptions",
           onOpenChange: handleModalClose,
           title: getModalTitle("subscriptions"),
-          children: /* @__PURE__ */ jsx37(SubscriptionsContainer, { onOpenWizard: handleOpenWizard })
+          children: /* @__PURE__ */ jsx37(
+            SubscriptionsContainer,
+            {
+              onOpenWizard: handleOpenWizard,
+              hasActiveRecurringSubscription
+            }
+          )
         }
       ),
       /* @__PURE__ */ jsx37(
@@ -2865,6 +2877,18 @@ import { z as z2 } from "zod";
 import { jsx as jsx39, jsxs as jsxs34 } from "react/jsx-runtime";
 function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
   const [isSubmitting, setIsSubmitting] = useState14(false);
+  const [allFeatures, setAllFeatures] = useState14([]);
+  useEffect10(() => {
+    const fetchFeatures = /* @__PURE__ */ __name(async () => {
+      try {
+        const features = await FeatureService.findMany({});
+        setAllFeatures(features);
+      } catch (error) {
+        console.error("[PriceEditor] Failed to fetch features:", error);
+      }
+    }, "fetchFeatures");
+    fetchFeatures();
+  }, []);
   const formSchema2 = z2.object({
     unitAmount: z2.preprocess(
       (val) => typeof val === "string" ? parseFloat(val) : val,
@@ -2881,10 +2905,13 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
     active: z2.boolean(),
     description: z2.string().optional(),
     features: z2.array(z2.string()),
-    token: z2.string()
+    token: z2.string(),
+    featureIds: z2.array(z2.string())
   });
   const isEditMode = !!price;
   const defaultUnitAmount = price?.unitAmount ? price.unitAmount / 100 : 0;
+  const coreFeatureIds = allFeatures.filter((f) => f.isCore).map((f) => f.id);
+  const defaultFeatureIds = [.../* @__PURE__ */ new Set([...price?.priceFeatures?.map((f) => f.id) ?? [], ...coreFeatureIds])];
   const form = useForm2({
     resolver: zodResolver2(formSchema2),
     defaultValues: {
@@ -2897,11 +2924,16 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
       active: price?.active ?? true,
       description: price?.description || "",
       features: price?.features || [],
-      token: price?.token?.toString() ?? ""
+      token: price?.token?.toString() ?? "",
+      featureIds: defaultFeatureIds
     }
   });
   useEffect10(() => {
     if (open) {
+      const currentCoreFeatureIds = allFeatures.filter((f) => f.isCore).map((f) => f.id);
+      const resetFeatureIds = [
+        .../* @__PURE__ */ new Set([...price?.priceFeatures?.map((f) => f.id) ?? [], ...currentCoreFeatureIds])
+      ];
       form.reset({
         unitAmount: price?.unitAmount ? price.unitAmount / 100 : 0,
         currency: price?.currency || "usd",
@@ -2912,10 +2944,11 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
         active: price?.active ?? true,
         description: price?.description || "",
         features: price?.features || [],
-        token: price?.token?.toString() ?? ""
+        token: price?.token?.toString() ?? "",
+        featureIds: resetFeatureIds
       });
     }
-  }, [open, price?.id]);
+  }, [open, price?.id, allFeatures]);
   const watchInterval = form.watch("interval");
   const isRecurring = watchInterval !== "one_time";
   const onSubmit = /* @__PURE__ */ __name(async (values) => {
@@ -2928,7 +2961,9 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
           nickname: values.nickname || void 0,
           description: values.description || void 0,
           features: values.features.filter((f) => f.trim()) || void 0,
-          token: values.token ? parseInt(values.token, 10) : void 0
+          token: values.token ? parseInt(values.token, 10) : void 0,
+          // Only include featureIds for recurring prices (one-time prices don't support platform features)
+          ...price?.priceType === "recurring" ? { featureIds: values.featureIds } : {}
         });
       } else {
         const createInput = {
@@ -2957,6 +2992,9 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
         if (values.token) {
           createInput.token = parseInt(values.token, 10);
         }
+        if (isRecurring && values.featureIds.length > 0) {
+          createInput.featureIds = values.featureIds;
+        }
         await StripePriceService.createPrice(createInput);
       }
       onSuccess();
@@ -3111,6 +3149,49 @@ function PriceEditor({ productId, price, open, onOpenChange, onSuccess }) {
           )
         ] })
       ] }),
+      isRecurring && allFeatures.length > 0 && /* @__PURE__ */ jsxs34("div", { className: "space-y-2", children: [
+        /* @__PURE__ */ jsx39(Label, { children: "Platform Features" }),
+        /* @__PURE__ */ jsx39("div", { className: "border rounded-md p-4 space-y-2 max-h-48 overflow-y-auto", children: allFeatures.map((feature) => {
+          const isCore = feature.isCore;
+          const isChecked = form.watch("featureIds").includes(feature.id);
+          return /* @__PURE__ */ jsxs34("div", { className: "flex items-center space-x-2", children: [
+            /* @__PURE__ */ jsx39(
+              "input",
+              {
+                type: "checkbox",
+                id: `feature-${feature.id}`,
+                checked: isChecked,
+                disabled: isCore,
+                onChange: (e) => {
+                  const currentIds = form.getValues("featureIds");
+                  if (e.target.checked) {
+                    form.setValue("featureIds", [...currentIds, feature.id]);
+                  } else {
+                    if (!isCore) {
+                      form.setValue(
+                        "featureIds",
+                        currentIds.filter((id) => id !== feature.id)
+                      );
+                    }
+                  }
+                },
+                className: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary disabled:opacity-50"
+              }
+            ),
+            /* @__PURE__ */ jsxs34(
+              "label",
+              {
+                htmlFor: `feature-${feature.id}`,
+                className: `text-sm ${isCore ? "text-muted-foreground" : ""}`,
+                children: [
+                  feature.name,
+                  isCore && /* @__PURE__ */ jsx39("span", { className: "ml-2 text-xs text-muted-foreground", children: "(Core - Required)" })
+                ]
+              }
+            )
+          ] }, feature.id);
+        }) })
+      ] }),
       /* @__PURE__ */ jsx39(FormCheckbox, { form, id: "active", name: "Active" }),
       /* @__PURE__ */ jsx39(CommonEditorButtons, { isEdit: isEditMode, form, disabled: isSubmitting, setOpen: onOpenChange })
     ] }) })