@zuplo/zudoku-plugin-monetization 0.0.27 → 0.0.28

package/dist/index.mjs

@@ -78,6 +78,16 @@ const useDeploymentName = () => {
 	return deploymentName;
 };
 
+//#endregion
+//#region src/hooks/usePurchaseDetails.ts
+const usePurchaseDetails = (planId) => {
+	const zudoku = useZudoku();
+	return useSuspenseQuery({
+		queryKey: [`/v3/zudoku-metering/${useDeploymentName()}/plans/${planId}/purchase-details`],
+		meta: { context: zudoku }
+	});
+};
+
 //#endregion
 //#region src/MonetizationContext.tsx
 const MonetizationContext = createContext({});
@@ -215,6 +225,24 @@ const getPriceFromPlan = (plan) => {
 	};
 };
 
+//#endregion
+//#region src/utils/purchaseDetails.ts
+const getPlanFromPurchaseDetails = (response) => {
+	return response;
+};
+const getTaxAmountFromPurchaseDetails = (response) => {
+	const taxAmount = response?.tax?.taxAmount;
+	const numericAmount = typeof taxAmount === "number" ? taxAmount : Number.parseFloat(taxAmount ?? "");
+	if (!Number.isFinite(numericAmount)) return;
+	return numericAmount;
+};
+const getTaxLabelFromPurchaseDetails = (response) => {
+	return (response.tax?.taxes ?? []).some((tax) => tax.taxType?.toLowerCase() === "vat") ? "VAT" : "tax";
+};
+const isTaxInclusiveFromPurchaseDetails = (response) => {
+	return response.tax?.taxInclusive === true;
+};
+
 //#endregion
 //#region src/ZuploMonetizationWrapper.tsx
 const DEFAULT_GATEWAY_URL = "https://api.zuploedge.com";
@@ -289,15 +317,6 @@ const ZuploMonetizationWrapper = ({ options = {} }) => /* @__PURE__ */ jsx(Query
 
 //#endregion
 //#region src/pages/CheckoutConfirmPage.tsx
-const getPlanFromPurchaseDetails = (response) => {
-	return "plan" in response ? response.plan : response;
-};
-const getTaxAmountFromPurchaseDetails = (response) => {
-	const taxAmount = response?.tax?.amount;
-	const numericAmount = typeof taxAmount === "number" ? taxAmount : Number.parseFloat(taxAmount ?? "");
-	if (!Number.isFinite(numericAmount)) return;
-	return numericAmount;
-};
 const CheckoutConfirmPage = () => {
 	const [search] = useSearchParams();
 	const planId = search.get("planId");
@@ -306,12 +325,11 @@ const CheckoutConfirmPage = () => {
 	const navigate = useNavigate();
 	const { pricing } = useMonetizationConfig();
 	if (!planId) throw new Error("Parameter `planId` missing");
-	const purchaseDetails = useSuspenseQuery({
-		queryKey: [`/v3/zudoku-metering/${deploymentName}/plans/${planId}/purchase-details`],
-		meta: { context: zudoku }
-	});
+	const purchaseDetails = usePurchaseDetails(planId);
 	const selectedPlan = getPlanFromPurchaseDetails(purchaseDetails.data);
 	const taxAmount = getTaxAmountFromPurchaseDetails(purchaseDetails.data);
+	const taxLabel = getTaxLabelFromPurchaseDetails(purchaseDetails.data);
+	const taxInclusive = isTaxInclusiveFromPurchaseDetails(purchaseDetails.data);
 	const rateCards = selectedPlan?.phases.at(-1)?.rateCards;
 	const { quotas, features } = categorizeRateCards(rateCards ?? [], {
 		currency: selectedPlan?.currency,
@@ -396,13 +414,9 @@ const CheckoutConfirmPage = () => {
 												className: "text-sm text-muted-foreground font-normal",
 												children: ["Billed ", formatBillingCycle(billingCycle)]
 											}),
-											taxAmount != null && /* @__PURE__ */ jsxs("div", {
+											taxAmount != null && /* @__PURE__ */ jsx("div", {
 												className: "text-xs text-muted-foreground font-normal mt-1",
-												children: [
-													"+ ",
-													formatPrice(taxAmount, selectedPlan?.currency),
-													" VAT"
-												]
+												children: taxInclusive ? `${formatPrice(taxAmount, selectedPlan?.currency)} ${taxLabel} included` : `+ ${formatPrice(taxAmount, selectedPlan?.currency)} ${taxLabel}`
 											})
 										]
 									}),
@@ -787,14 +801,18 @@ const SubscriptionChangeConfirmPage = () => {
 	const [search] = useSearchParams();
 	const planId = search.get("planId");
 	const subscriptionId = search.get("subscriptionId");
+	const mode = search.get("mode");
 	const zudoku = useZudoku();
 	const deploymentName = useDeploymentName();
 	const navigate = useNavigate();
-	const { data: plans } = usePlans();
 	const { pricing } = useMonetizationConfig();
-	const selectedPlan = plans?.items?.find((plan) => plan.id === planId);
 	if (!planId) throw new Error("Parameter `planId` missing");
 	if (!subscriptionId) throw new Error("Parameter `subscriptionId` missing");
+	const purchaseDetails = usePurchaseDetails(planId);
+	const selectedPlan = getPlanFromPurchaseDetails(purchaseDetails.data);
+	const taxAmount = getTaxAmountFromPurchaseDetails(purchaseDetails.data);
+	const taxLabel = getTaxLabelFromPurchaseDetails(purchaseDetails.data);
+	const taxInclusive = isTaxInclusiveFromPurchaseDetails(purchaseDetails.data);
 	const rateCards = selectedPlan?.phases.at(-1)?.rateCards;
 	const { quotas, features } = categorizeRateCards(rateCards ?? [], {
 		currency: selectedPlan?.currency,
@@ -803,6 +821,7 @@ const SubscriptionChangeConfirmPage = () => {
 	});
 	const price = selectedPlan ? getPriceFromPlan(selectedPlan) : null;
 	const billingCycle = selectedPlan?.billingCadence ? formatDuration(selectedPlan.billingCadence) : null;
+	const effectiveChangeMessage = mode === "downgrade" ? "This change will take effect at the start of your next billing cycle." : "This change will take effect immediately.";
 	const changeMutation = useMutation({
 		mutationKey: [`/v3/zudoku-metering/${deploymentName}/subscriptions/${subscriptionId}/change`],
 		meta: {
@@ -837,13 +856,20 @@ const SubscriptionChangeConfirmPage = () => {
 					}),
 					/* @__PURE__ */ jsxs("div", {
 						className: "text-center mb-8",
-						children: [/* @__PURE__ */ jsx("h1", {
-							className: "text-2xl font-bold text-card-foreground mb-3",
-							children: "Confirm plan change"
-						}), /* @__PURE__ */ jsx("p", {
-							className: "text-muted-foreground text-base",
-							children: "Please confirm the details below to change your subscription."
-						})]
+						children: [
+							/* @__PURE__ */ jsx("h1", {
+								className: "text-2xl font-bold text-card-foreground mb-3",
+								children: "Confirm plan change"
+							}),
+							/* @__PURE__ */ jsx("p", {
+								className: "text-muted-foreground text-base",
+								children: effectiveChangeMessage
+							}),
+							/* @__PURE__ */ jsx("p", {
+								className: "text-muted-foreground text-base",
+								children: "Please confirm the details below to change your subscription."
+							})
+						]
 					}),
 					selectedPlan && /* @__PURE__ */ jsxs(Card, {
 						className: "bg-muted/50",
@@ -868,13 +894,20 @@ const SubscriptionChangeConfirmPage = () => {
 								}),
 								price && price.monthly > 0 && /* @__PURE__ */ jsxs("div", {
 									className: "text-right",
-									children: [/* @__PURE__ */ jsx("div", {
-										className: "text-2xl font-bold",
-										children: formatPrice(price.monthly, selectedPlan?.currency)
-									}), billingCycle && /* @__PURE__ */ jsxs("div", {
-										className: "text-sm text-muted-foreground font-normal",
-										children: ["Billed ", formatBillingCycle(billingCycle)]
-									})]
+									children: [
+										/* @__PURE__ */ jsx("div", {
+											className: "text-2xl font-bold",
+											children: formatPrice(price.monthly, selectedPlan?.currency)
+										}),
+										billingCycle && /* @__PURE__ */ jsxs("div", {
+											className: "text-sm text-muted-foreground font-normal",
+											children: ["Billed ", formatBillingCycle(billingCycle)]
+										}),
+										taxAmount != null && /* @__PURE__ */ jsx("div", {
+											className: "text-xs text-muted-foreground font-normal mt-1",
+											children: taxInclusive ? `${formatPrice(taxAmount, selectedPlan?.currency)} ${taxLabel} included` : `+ ${formatPrice(taxAmount, selectedPlan?.currency)} ${taxLabel}`
+										})
+									]
 								}),
 								price && price.monthly === 0 && /* @__PURE__ */ jsx("div", {
 									className: "text-2xl text-muted-foreground font-bold",
@@ -1529,7 +1562,12 @@ const modeLabelMap = {
 	downgrade: "Downgrade",
 	private: "Switch"
 };
-const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange }) => {
+const isSwitchPlanTarget = (value) => {
+	if (typeof value !== "object" || value === null) return false;
+	if (!("subscriptionId" in value) || !("plan" in value) || !("mode" in value)) return false;
+	return true;
+};
+const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange, isSwitching }) => {
 	const price = getPriceFromPlan(comparison.plan);
 	const isCustom = comparison.plan.key === "enterprise";
 	const displayPrice = price.monthly;
@@ -1569,6 +1607,7 @@ const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange
 					mode
 				}),
 				size: "sm",
+				disabled: isSwitching,
 				children: modeLabelMap[mode]
 			})]
 		}), hasChanges && /* @__PURE__ */ jsxs("div", {
@@ -1663,24 +1702,32 @@ const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange
 		})]
 	});
 };
-const ConfirmSwitchAlert = ({ switchTo, onRequestClose }) => {
+const SwitchPlanModal = ({ subscription, children }) => {
+	const [open, setOpen] = useState(false);
+	const { data: plansData } = usePlans();
+	const { pricing } = useMonetizationConfig();
 	const deploymentName = useDeploymentName();
 	const context = useZudoku();
 	const { generateUrl } = useUrlUtils();
-	const mutation = useMutation({
+	const switchPlanMutation = useMutation({
 		mutationKey: [`/v3/zudoku-metering/${deploymentName}/stripe/checkout`],
 		meta: {
 			context,
-			request: {
-				method: "POST",
-				body: JSON.stringify({
-					planId: switchTo.plan.id,
-					successURL: generateUrl(`/subscription-change-confirm`, { searchParams: {
+			request: (variables) => {
+				if (!isSwitchPlanTarget(variables)) throw new Error("Couldn't start the plan change. Please refresh and try again.");
+				const switchTo = variables;
+				return {
+					method: "POST",
+					body: JSON.stringify({
 						planId: switchTo.plan.id,
-						subscriptionId: switchTo.subscriptionId
-					} }),
-					cancelURL: generateUrl("/subscriptions", { searchParams: { subscriptionId: switchTo.subscriptionId } })
-				})
+						successURL: generateUrl(`/subscription-change-confirm`, { searchParams: {
+							planId: switchTo.plan.id,
+							subscriptionId: switchTo.subscriptionId,
+							mode: switchTo.mode
+						} }),
+						cancelURL: generateUrl("/subscriptions", { searchParams: { subscriptionId: switchTo.subscriptionId } })
+					})
+				};
 			}
 		},
 		retry: false,
@@ -1688,38 +1735,6 @@ const ConfirmSwitchAlert = ({ switchTo, onRequestClose }) => {
 			window.location.href = data.url;
 		}
 	});
-	return /* @__PURE__ */ jsx(AlertDialog, {
-		open: true,
-		onOpenChange: onRequestClose,
-		children: /* @__PURE__ */ jsxs(AlertDialogContent, { children: [/* @__PURE__ */ jsxs(AlertDialogHeader, { children: [
-			/* @__PURE__ */ jsxs(AlertDialogTitle, { children: [
-				"Confirm",
-				" ",
-				switchTo.mode === "private" ? "plan change" : switchTo.mode === "upgrade" ? "upgrade" : "downgrade"
-			] }),
-			mutation.isError && /* @__PURE__ */ jsx(Alert, {
-				variant: "destructive",
-				children: /* @__PURE__ */ jsx(AlertDescription, {
-					className: "first-letter:uppercase",
-					children: mutation.error.message
-				})
-			}),
-			/* @__PURE__ */ jsx(AlertDialogDescription, { children: switchTo.mode === "private" ? `Are you sure you want to switch to ${switchTo.plan.name}? This will take effect immediately.` : switchTo.mode === "upgrade" ? `Are you sure you want to upgrade to ${switchTo.plan.name}? This will take effect immediately.` : `Are you sure you want to downgrade to ${switchTo.plan.name}? This will take effect at the start of your next billing cycle.` })
-		] }), /* @__PURE__ */ jsxs(AlertDialogFooter, { children: [/* @__PURE__ */ jsx(AlertDialogCancel, {
-			disabled: mutation.isPending,
-			children: "Cancel"
-		}), /* @__PURE__ */ jsx(ActionButton, {
-			isPending: mutation.isPending,
-			onClick: () => mutation.mutate(),
-			children: modeLabelMap[switchTo.mode]
-		})] })] })
-	});
-};
-const SwitchPlanModal = ({ subscription, children }) => {
-	const [open, setOpen] = useState(false);
-	const { data: plansData } = usePlans();
-	const [switchTo, setSwitchTo] = useState(null);
-	const { pricing } = useMonetizationConfig();
 	const currentPlan = plansData?.items.find((p) => p.id === subscription.plan.id);
 	const { upgrades, downgrades, privatePlans } = useMemo(() => {
 		if (!plansData?.items || !currentPlan) return {
@@ -1742,10 +1757,7 @@ const SwitchPlanModal = ({ subscription, children }) => {
 		currentPlan,
 		pricing?.units
 	]);
-	return /* @__PURE__ */ jsxs(Fragment, { children: [switchTo !== null && /* @__PURE__ */ jsx(ConfirmSwitchAlert, {
-		switchTo,
-		onRequestClose: () => setSwitchTo(null)
-	}), /* @__PURE__ */ jsxs(Dialog, {
+	return /* @__PURE__ */ jsxs(Dialog, {
 		open,
 		onOpenChange: setOpen,
 		children: [/* @__PURE__ */ jsx(DialogTrigger, {
@@ -1766,6 +1778,13 @@ const SwitchPlanModal = ({ subscription, children }) => {
 			}), /* @__PURE__ */ jsxs("div", {
 				className: "mt-4 space-y-6",
 				children: [
+					switchPlanMutation.isError && /* @__PURE__ */ jsx(Alert, {
+						variant: "destructive",
+						children: /* @__PURE__ */ jsx(AlertDescription, {
+							className: "first-letter:uppercase",
+							children: switchPlanMutation.error.message
+						})
+					}),
 					currentPlan && /* @__PURE__ */ jsx(Item, {
 						variant: "outline",
 						children: /* @__PURE__ */ jsxs(ItemContent, { children: [/* @__PURE__ */ jsx(ItemTitle, { children: "Current Plan" }), /* @__PURE__ */ jsx(ItemDescription, {
@@ -1791,7 +1810,8 @@ const SwitchPlanModal = ({ subscription, children }) => {
 							comparison,
 							subscriptionId: subscription.id,
 							mode: "upgrade",
-							onRequestChange: setSwitchTo
+							onRequestChange: (target) => switchPlanMutation.mutate(target),
+							isSwitching: switchPlanMutation.isPending
 						}, comparison.plan.id))
 					})] }),
 					downgrades.length > 0 && /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("div", {
@@ -1812,7 +1832,8 @@ const SwitchPlanModal = ({ subscription, children }) => {
 							comparison,
 							subscriptionId: subscription.id,
 							mode: "downgrade",
-							onRequestChange: setSwitchTo
+							onRequestChange: (target) => switchPlanMutation.mutate(target),
+							isSwitching: switchPlanMutation.isPending
 						}, comparison.plan.id))
 					})] }),
 					privatePlans.length > 0 && /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("div", {
@@ -1833,13 +1854,14 @@ const SwitchPlanModal = ({ subscription, children }) => {
 							comparison,
 							subscriptionId: subscription.id,
 							mode: "private",
-							onRequestChange: setSwitchTo
+							onRequestChange: (target) => switchPlanMutation.mutate(target),
+							isSwitching: switchPlanMutation.isPending
 						}, comparison.plan.id))
 					})] })
 				]
 			})]
 		}) })]
-	})] });
+	});
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/zudoku-plugin-monetization",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/zuplo/zudoku",
@@ -31,7 +31,7 @@
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tsdown": "0.20.3",
-    "zudoku": "0.72.0"
+    "zudoku": "0.73.0"
   },
   "peerDependencies": {
     "react": ">=19.2.0",