@funnelsgrove/payments 0.1.53 → 0.1.55

package/dist/components/ManageSubscriptionScreen.js

@@ -80,7 +80,7 @@ const resolveSubscriptionStatusLabel = (subscription) => {
 };
 export function ManageSubscriptionScreen({ stepId, content, homeStepId, nodeId, plans, }) {
     var _a, _b;
-    const { attributes, completeStep, goToStep, setAnswer, setUser, user } = useFunnel();
+    const { attributes, goToStep, setAnswer, setUser, user } = useFunnel();
     const supportEmail = runtimePublicConfig.supportEmail;
     const planList = useMemo(() => getFallbackBillingPlans(plans), [plans]);
     const [stage, setStage] = useState('subscriptions');
@@ -184,20 +184,12 @@ export function ManageSubscriptionScreen({ stepId, content, homeStepId, nodeId,
             setData(payload);
             const refreshedSubscription = toManageSubscriptions(payload.subscriptions).find((subscription) => subscription.id === selectedSubscription.id);
             setCancelledActiveUntilDate(formatDate((refreshedSubscription === null || refreshedSubscription === void 0 ? void 0 : refreshedSubscription.currentPeriodEnd) || selectedSubscription.currentPeriodEnd));
-            const finalAnswers = {
-                manageSubscriptionHasActive: true,
-                manageSubscriptionReason: selectedReason.id,
-                manageSubscriptionReasonLabel: selectedReason.label,
-                manageSubscriptionCancelled: true,
-                manageSubscriptionCancelledId: selectedSubscription.id,
-            };
             await persistCancellationAnswers({
                 cancelled: true,
                 reasonId: selectedReason.id,
                 reasonLabel: selectedReason.label,
                 subscriptionId: selectedSubscription.id,
             });
-            completeStep(stepId, finalAnswers);
             setStage('done');
         }
         catch (nextError) {
@@ -213,7 +205,7 @@ export function ManageSubscriptionScreen({ stepId, content, homeStepId, nodeId,
                                     ? content.confirmStage.cancellingLabel
                                     : content.confirmStage.cancelLabel })] })) : null, stage === 'done' ? (_jsxs("div", { className: 'manage-subscription-inner is-short', children: [_jsx("h1", { className: 'manage-subscription-title', children: content.doneStage.title }), _jsx("p", { className: 'manage-subscription-done-status', children: "Cancelled" }), _jsx("p", { className: 'manage-subscription-done-copy', children: content.doneStage.cancelledMessage }), cancelledActiveUntilDate ? (_jsxs("p", { className: 'manage-subscription-done-copy is-active-until', children: ["Active until: ", cancelledActiveUntilDate] })) : null, _jsx("button", { type: 'button', className: 'manage-subscription-primary', onClick: () => {
                                     if (homeStepId) {
-                                        goToStep(homeStepId);
+                                        goToStep(homeStepId, { type: 'exit', reason: 'cancel' });
                                         return;
                                     }
                                     setStage('subscriptions');

package/dist/config/billing.config.d.ts

@@ -16,6 +16,11 @@ export type BillingPlanConfig = {
     amountCents: number;
     analyticsPurchaseValue?: number;
     checkoutSummaryLabel?: string;
+    followUpProviderPlanId?: string;
+    followUpPlanTitle?: string;
+    followUpBillingInterval?: BillingPlanInterval;
+    followUpBillingIntervalCount?: number;
+    introIterations?: number;
 };
 export type BillingFallbackPlanConfig = BillingPlanConfig & {
     id?: string;

package/dist/services/checkoutCompletionAnalytics.service.d.ts

@@ -1,13 +1,14 @@
-import type { RuntimeMode } from '@funnelsgrove/runtime';
+import type { FunnelStepType, RuntimeMode } from '@funnelsgrove/runtime';
 import { type StripeRuntimeConfigOverrides } from './stripe.service.js';
 export type StripeSubscriptionCheckoutAnalyticsContext = {
     environment?: RuntimeMode;
     featureFlags?: Record<string, string | null | undefined>;
     metadata?: Record<string, unknown> | null;
     runtimeConfig?: StripeRuntimeConfigOverrides;
-    stepId?: string;
-    stepName?: string;
-    stepType?: string;
+    stepId: string;
+    stepName: string;
+    stepType: Extract<FunnelStepType, 'checkout' | 'paywall_offer' | 'upsell_offer'>;
+    stepContractVersion: number;
 };
 export type TrackStripeSubscriptionCheckoutStartedInput = StripeSubscriptionCheckoutAnalyticsContext & {
     checkoutSessionId?: string | null;
@@ -15,7 +16,7 @@ export type TrackStripeSubscriptionCheckoutStartedInput = StripeSubscriptionChec
 export type TrackPaidStripeSubscriptionCheckoutCompletedInput = StripeSubscriptionCheckoutAnalyticsContext & {
     checkoutSessionId?: string | null;
 };
-export type TrackStripeSubscriptionCheckoutStartedResult = 'already_tracked' | 'missing_checkout_session' | 'tracked';
-export type TrackPaidStripeSubscriptionCheckoutCompletedResult = 'already_tracked' | 'missing_checkout_session' | 'tracked' | 'unpaid';
+export type TrackStripeSubscriptionCheckoutStartedResult = 'already_tracked' | 'analytics_rejected' | 'missing_checkout_session' | 'tracked';
+export type TrackPaidStripeSubscriptionCheckoutCompletedResult = 'already_tracked' | 'analytics_rejected' | 'missing_checkout_session' | 'tracked' | 'unpaid';
 export declare function trackStripeSubscriptionCheckoutStarted(input: TrackStripeSubscriptionCheckoutStartedInput): Promise<TrackStripeSubscriptionCheckoutStartedResult>;
 export declare function trackPaidStripeSubscriptionCheckoutCompleted(input: TrackPaidStripeSubscriptionCheckoutCompletedInput): Promise<TrackPaidStripeSubscriptionCheckoutCompletedResult>;

package/dist/services/checkoutCompletionAnalytics.service.js

@@ -56,9 +56,13 @@ export async function trackStripeSubscriptionCheckoutStarted(input) {
             stepId: input.stepId,
             stepName: input.stepName,
             stepType: input.stepType,
+            stepContractVersion: input.stepContractVersion,
             metadata: Object.assign(Object.assign({}, metadata), { checkoutSessionId, checkout_session_id: checkoutSessionId, environment: input.environment || metadata.environment }),
         };
-        publicAnalyticsSdk.trackCheckoutStarted(conversionInput);
+        const eventId = publicAnalyticsSdk.trackCheckoutStarted(conversionInput);
+        if (!eventId) {
+            return 'analytics_rejected';
+        }
         markCheckoutSessionTracked('checkout_started', checkoutSessionId, input.runtimeConfig);
         await publicAnalyticsSdk.flush().catch(() => 0);
         return 'tracked';
@@ -95,9 +99,13 @@ export async function trackPaidStripeSubscriptionCheckoutCompleted(input) {
             stepId: input.stepId,
             stepName: input.stepName,
             stepType: input.stepType,
+            stepContractVersion: input.stepContractVersion,
             metadata: Object.assign(Object.assign(Object.assign({}, asRecord(input.metadata)), analyticsMetadata), { checkoutSessionId, checkout_session_id: checkoutSessionId, checkout_session_status: checkoutStatus.status || undefined, payment_status: checkoutStatus.paymentStatus || undefined, environment: checkoutStatus.environment || input.environment || analyticsMetadata.environment }),
         };
-        publicAnalyticsSdk.trackCheckoutCompleted(conversionInput);
+        const eventId = publicAnalyticsSdk.trackCheckoutCompleted(conversionInput);
+        if (!eventId) {
+            return 'analytics_rejected';
+        }
         markCheckoutSessionTracked('checkout_completed', checkoutSessionId, input.runtimeConfig);
         await publicAnalyticsSdk.flush().catch(() => 0);
         return 'tracked';

package/dist/services/paywallOffer.service.js

@@ -35,6 +35,10 @@ const BILLING_INTERVAL_DAYS = {
     month: 30,
     year: 365,
 };
+const PAYWALL_DISCOUNT_COOLDOWN_MS = 30 * 60 * 1000;
+const hasDiscountCooldownElapsed = (nowMs, expiresAtMs) => {
+    return nowMs >= expiresAtMs + PAYWALL_DISCOUNT_COOLDOWN_MS;
+};
 const clampRemainingSeconds = (value) => {
     if (!Number.isFinite(value) || value <= 0) {
         return 0;
@@ -142,6 +146,9 @@ const createDiscountStateFromStarts = (input) => {
         const expiresAtMs = input.secondStartedAtMs + getDiscountDurationMs(input.discounts, 'second');
         const remainingSeconds = clampRemainingSeconds((expiresAtMs - input.nowMs) / 1000);
         if (remainingSeconds <= 0) {
+            if (hasDiscountCooldownElapsed(input.nowMs, expiresAtMs)) {
+                return createDiscountStateFromStarts(Object.assign(Object.assign({}, input), { firstStartedAtMs: input.nowMs, secondStartedAtMs: null }));
+            }
             return createExpiredDiscountState({
                 stage: 'completed',
                 firstStartedAtMs: input.firstStartedAtMs,
@@ -167,6 +174,9 @@ const createDiscountStateFromStarts = (input) => {
     const expiresAtMs = input.firstStartedAtMs + getDiscountDurationMs(input.discounts, 'first');
     const remainingSeconds = clampRemainingSeconds((expiresAtMs - input.nowMs) / 1000);
     if (remainingSeconds <= 0) {
+        if (hasDiscountCooldownElapsed(input.nowMs, expiresAtMs)) {
+            return createDiscountStateFromStarts(Object.assign(Object.assign({}, input), { firstStartedAtMs: input.nowMs, secondStartedAtMs: null }));
+        }
         return createExpiredDiscountState({
             stage: 'first',
             firstStartedAtMs: input.firstStartedAtMs,
@@ -227,7 +237,8 @@ export const advancePaywallDiscountState = (input) => {
 };
 export const activateSecondPaywallDiscount = (input) => {
     var _a;
-    if (typeof input.state.secondStartedAtMs === 'number' ||
+    if (input.state.status !== 'active' ||
+        typeof input.state.secondStartedAtMs === 'number' ||
         input.state.stage === 'completed') {
         return input.state;
     }

package/dist/services/stripe.service.d.ts

@@ -20,6 +20,11 @@ export type PaywallPlan = {
     checkoutSummaryLabel?: string;
     billingInterval?: BillingPlanInterval;
     billingIntervalCount?: number;
+    followUpProviderPlanId?: string;
+    followUpPlanTitle?: string;
+    followUpBillingInterval?: BillingPlanInterval;
+    followUpBillingIntervalCount?: number;
+    introIterations?: number;
     source: 'stripe' | 'config';
 };
 export type StripeRuntimeConfigOverrides = FunnelSdkRuntimeConfigOverrides;
@@ -40,7 +45,7 @@ export declare function resolvePaywallPlansFromProjectPlans(projectPlans: readon
 export declare function getPaywallPlans(mode: RuntimeMode, planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[], options?: PaywallPlanResolutionOptions): Promise<readonly PaywallPlan[]>;
 export declare function isStripeConfigured(mode: RuntimeMode): boolean;
 export declare function getStripePromise(mode: RuntimeMode, runtimePublishableKey?: string | null): Promise<Stripe | null> | null;
-type CheckoutSessionPlanInput = Pick<PaywallPlan, 'amountCents' | 'analyticsPurchaseValue' | 'billingInterval' | 'billingIntervalCount' | 'description' | 'id' | 'providerPlanId' | 'title'>;
+type CheckoutSessionPlanInput = Pick<PaywallPlan, 'amountCents' | 'analyticsPurchaseValue' | 'billingInterval' | 'billingIntervalCount' | 'description' | 'id' | 'providerPlanId' | 'title' | 'followUpProviderPlanId' | 'followUpPlanTitle' | 'followUpBillingInterval' | 'followUpBillingIntervalCount' | 'introIterations'>;
 type CheckoutPlanRecurringConfig = {
     interval: BillingPlanInterval;
     intervalCount: number;

package/dist/services/stripe.service.js

@@ -268,6 +268,11 @@ const toPlanFromRemoteProjectPlan = (rawPlan, options, planIdOverride) => {
         checkoutSummaryLabel: asTrimmedStringOrNull(metadata.checkoutSummaryLabel) || undefined,
         billingInterval: asBillingPlanIntervalOrNull(interval) || undefined,
         billingIntervalCount: intervalCount || undefined,
+        followUpProviderPlanId: asTrimmedStringOrNull(metadata.followUpProviderPlanId) || undefined,
+        followUpPlanTitle: asTrimmedStringOrNull(metadata.followUpPlanTitle) || undefined,
+        followUpBillingInterval: asBillingPlanIntervalOrNull(metadata.followUpBillingInterval) || undefined,
+        followUpBillingIntervalCount: asPositiveIntOrNull(metadata.followUpBillingIntervalCount) || undefined,
+        introIterations: asPositiveIntOrNull(metadata.introIterations) || undefined,
         source: 'stripe',
     };
 };
@@ -579,7 +584,7 @@ export async function chargeStripeOneClickPayment(input) {
     });
 }
 export async function createStripeSubscriptionCheckout(input) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const recurring = resolveCheckoutPlanRecurringConfig(input.plan);
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
@@ -592,17 +597,22 @@ export async function createStripeSubscriptionCheckout(input) {
         amountCents: input.plan.amountCents,
         billingInterval: recurring.interval,
         billingIntervalCount: recurring.intervalCount,
-        couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        followUpProviderPlanId: ((_c = input.plan.followUpProviderPlanId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        followUpPlanTitle: ((_d = input.plan.followUpPlanTitle) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        followUpBillingInterval: input.plan.followUpBillingInterval,
+        followUpBillingIntervalCount: input.plan.followUpBillingIntervalCount,
+        introIterations: input.plan.introIterations,
+        couponId: ((_e = input.couponId) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
         analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-        customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        customerEmail: ((_f = input.customerEmail) === null || _f === void 0 ? void 0 : _f.trim()) || undefined,
         returnUrl: input.returnUrl,
-        userId: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        userId: ((_g = input.user_id) === null || _g === void 0 ? void 0 : _g.trim()) || undefined,
         environment: input.environment,
         runtimeConfig: input.runtimeConfig,
     });
 }
 export async function updateStripeSubscriptionCheckoutPlan(input) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const recurring = resolveCheckoutPlanRecurringConfig(input.plan);
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
@@ -616,10 +626,15 @@ export async function updateStripeSubscriptionCheckoutPlan(input) {
         amountCents: input.plan.amountCents,
         billingInterval: recurring.interval,
         billingIntervalCount: recurring.intervalCount,
-        couponId: ((_c = input.couponId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        followUpProviderPlanId: ((_c = input.plan.followUpProviderPlanId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        followUpPlanTitle: ((_d = input.plan.followUpPlanTitle) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        followUpBillingInterval: input.plan.followUpBillingInterval,
+        followUpBillingIntervalCount: input.plan.followUpBillingIntervalCount,
+        introIterations: input.plan.introIterations,
+        couponId: ((_e = input.couponId) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
         analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-        customerEmail: ((_d = input.customerEmail) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
-        userId: ((_e = input.user_id) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        customerEmail: ((_f = input.customerEmail) === null || _f === void 0 ? void 0 : _f.trim()) || undefined,
+        userId: ((_g = input.user_id) === null || _g === void 0 ? void 0 : _g.trim()) || undefined,
         environment: input.environment,
         runtimeConfig: input.runtimeConfig,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "type": "module",
   "private": false,
   "main": "./dist/index.js",