@saasicat/ui-vue 1.0.0-rc.13 → 1.0.0-rc.14

package/dist/.build-stamp

@@ -1 +1 @@
-f878eab55ac697e5dea0742e5facb103935abe97b9d67726eba443617bd236fc
+92a69f127a3ffaf9c29fb0fbe90a6580bf95af61b32757843279254ffc81c7e7

package/dist/{chunk-HYFHYL73.js → chunk-ADKRZZDZ.js}

@@ -878,21 +878,16 @@ import { computed as computed4, ref as ref13 } from "vue";
 import {
   selectChargeableBundles
 } from "@saasicat/core";
-var DEFAULT_YEARLY_FACTOR = 10;
 function unwrap(source) {
   if (source && typeof source === "object" && "value" in source) {
     return source.value;
   }
   return source;
 }
-function priceForCycle(monthlyNet, yearlyNet, cycle, yearlyFactor) {
-  if (cycle === "YEARLY") {
-    return yearlyNet != null ? yearlyNet : monthlyNet * yearlyFactor;
-  }
-  return monthlyNet;
+function priceForCycle(item, cycle) {
+  return cycle === "YEARLY" ? item.yearlyNet : item.monthlyNet;
 }
 function useSubscriptionDraft(options) {
-  const yearlyFactor = options.yearlyFactor ?? DEFAULT_YEARLY_FACTOR;
   const plansRef = computed4(() => unwrap(options.plans) ?? []);
   const subscriptionBundlesRef = computed4(
     () => unwrap(options.subscriptionBundles ?? null) ?? []
@@ -910,7 +905,7 @@ function useSubscriptionDraft(options) {
   });
   const selectedBundles = computed4(
     () => subscriptionBundlesRef.value.filter(
-      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId)
+      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId) && priceForCycle(b, cycle.value) !== null
     )
   );
   const chargeableBundles = computed4(() => {
@@ -935,11 +930,12 @@ function useSubscriptionDraft(options) {
   const pricing = computed4(() => {
     const cyc = cycle.value;
     const planObj = selectedPlan.value;
-    const planNet = planObj ? priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, cyc, yearlyFactor) : 0;
+    const planPrice = planObj ? priceForCycle(planObj, cyc) : null;
+    const planNet = planPrice ?? 0;
     const bundleItems = [];
     let bundlesNet = 0;
     for (const b of chargeableBundles.value) {
-      const net = priceForCycle(b.monthlyNet ?? 0, b.yearlyNet, cyc, yearlyFactor);
+      const net = priceForCycle(b, cyc) ?? 0;
       bundlesNet += net;
       bundleItems.push({
         key: `subscription-bundle:${b.bundleVersionId}`,
@@ -951,30 +947,19 @@ function useSubscriptionDraft(options) {
     let discountNet = 0;
     const preview = promoState.value.preview;
     if (preview && preview.valid && promoState.value.status === "valid") {
-      const valid = preview;
-      const value = Number(valid.discount.value);
-      if (Number.isFinite(value) && value > 0) {
-        if (valid.discount.valueType === "PERCENT") {
-          discountNet = subtotalNet * value / 100;
-        } else {
-          discountNet = Math.min(value, subtotalNet);
-        }
+      const amount = Number(preview.price.discountNet);
+      if (Number.isFinite(amount) && amount > 0) {
+        discountNet = Math.min(amount, planNet);
       }
     }
     const totalNet = Math.max(0, subtotalNet - discountNet);
     let yearSavings = 0;
-    if (planObj) {
-      const monthlyTotal = priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, "MONTHLY", yearlyFactor) * 12;
-      const yearlyTotal = priceForCycle(
-        planObj.monthlyNet ?? 0,
-        planObj.yearlyNet,
-        "YEARLY",
-        yearlyFactor
-      );
-      yearSavings = Math.max(0, monthlyTotal - yearlyTotal);
+    if (planObj && planObj.monthlyNet !== null && planObj.yearlyNet !== null) {
+      yearSavings = Math.max(0, planObj.monthlyNet * 12 - planObj.yearlyNet);
     }
     return {
       cycle: cyc,
+      planPriced: planPrice !== null,
       planNet,
       bundlesNet,
       subtotalNet,
@@ -982,7 +967,9 @@ function useSubscriptionDraft(options) {
       totalNet,
       yearSavings,
       breakdown: {
-        plan: planObj ? {
+        // A plan not sold in the cycle has no line: 0.00 beside its name
+        // would read as a price.
+        plan: planObj && planPrice !== null ? {
           key: `plan:${planObj.id}`,
           label: planObj.name,
           net: planNet,
@@ -995,9 +982,15 @@ function useSubscriptionDraft(options) {
   const isDirty = computed4(() => {
     return selectedBundleVersionIds.value.size > 0 || promoState.value.status === "valid";
   });
+  function forgetPromoPreview() {
+    if (promoState.value.status !== "idle") {
+      promoState.value = { status: "idle", preview: null, message: "" };
+    }
+  }
   function setPlan(planId) {
     if (plan.value === planId) return;
     plan.value = planId;
+    forgetPromoPreview();
     const compatibleBundleVersions = /* @__PURE__ */ new Set();
     for (const bundle of subscriptionBundlesRef.value) {
       if (bundle.compatiblePlanKeys.length === 0 || bundle.compatiblePlanKeys.includes(planId)) {
@@ -1009,7 +1002,9 @@ function useSubscriptionDraft(options) {
     );
   }
   function setCycle(c) {
+    if (cycle.value === c) return;
     cycle.value = c;
+    forgetPromoPreview();
   }
   function toggleSubscriptionBundle(bundleVersionId) {
     const next = new Set(selectedBundleVersionIds.value);
@@ -1019,9 +1014,7 @@ function useSubscriptionDraft(options) {
   }
   function setPromoCode(code) {
     promoCode.value = code.toUpperCase();
-    if (promoState.value.status !== "idle") {
-      promoState.value = { status: "idle", preview: null, message: "" };
-    }
+    forgetPromoPreview();
   }
   function setPromoState(state) {
     promoState.value = state;
@@ -3102,7 +3095,6 @@ export {
   buildFeatureRouterGuard,
   useTenantBillingCatalog,
   useTenantBilling,
-  DEFAULT_YEARLY_FACTOR,
   useSubscriptionDraft,
   useBulkPublish,
   PlannedOnlyFeatureError,

package/dist/index.cjs

@@ -36,7 +36,6 @@ __export(src_exports, {
   DEFAULT_ROWS_PER_PAGE: () => DEFAULT_ROWS_PER_PAGE,
   DEFAULT_SA_LOCALE: () => DEFAULT_SA_LOCALE,
   DEFAULT_STANDARD_PAGE_ROUTES: () => DEFAULT_STANDARD_PAGE_ROUTES,
-  DEFAULT_YEARLY_FACTOR: () => DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError: () => DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY: () => ENTITLEMENT_INJECTION_KEY,
   HttpJsonError: () => HttpJsonError,
@@ -6581,21 +6580,16 @@ function useTenantBilling(options = {}) {
 // src/vue/use-subscription-draft.ts
 var import_vue19 = require("vue");
 var import_core4 = require("@saasicat/core");
-var DEFAULT_YEARLY_FACTOR = 10;
 function unwrap(source) {
   if (source && typeof source === "object" && "value" in source) {
     return source.value;
   }
   return source;
 }
-function priceForCycle(monthlyNet, yearlyNet, cycle, yearlyFactor) {
-  if (cycle === "YEARLY") {
-    return yearlyNet != null ? yearlyNet : monthlyNet * yearlyFactor;
-  }
-  return monthlyNet;
+function priceForCycle(item, cycle) {
+  return cycle === "YEARLY" ? item.yearlyNet : item.monthlyNet;
 }
 function useSubscriptionDraft(options) {
-  const yearlyFactor = options.yearlyFactor ?? DEFAULT_YEARLY_FACTOR;
   const plansRef = (0, import_vue19.computed)(() => unwrap(options.plans) ?? []);
   const subscriptionBundlesRef = (0, import_vue19.computed)(
     () => unwrap(options.subscriptionBundles ?? null) ?? []
@@ -6613,7 +6607,7 @@ function useSubscriptionDraft(options) {
   });
   const selectedBundles = (0, import_vue19.computed)(
     () => subscriptionBundlesRef.value.filter(
-      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId)
+      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId) && priceForCycle(b, cycle.value) !== null
     )
   );
   const chargeableBundles = (0, import_vue19.computed)(() => {
@@ -6638,11 +6632,12 @@ function useSubscriptionDraft(options) {
   const pricing = (0, import_vue19.computed)(() => {
     const cyc = cycle.value;
     const planObj = selectedPlan.value;
-    const planNet = planObj ? priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, cyc, yearlyFactor) : 0;
+    const planPrice = planObj ? priceForCycle(planObj, cyc) : null;
+    const planNet = planPrice ?? 0;
     const bundleItems = [];
     let bundlesNet = 0;
     for (const b of chargeableBundles.value) {
-      const net = priceForCycle(b.monthlyNet ?? 0, b.yearlyNet, cyc, yearlyFactor);
+      const net = priceForCycle(b, cyc) ?? 0;
       bundlesNet += net;
       bundleItems.push({
         key: `subscription-bundle:${b.bundleVersionId}`,
@@ -6654,30 +6649,19 @@ function useSubscriptionDraft(options) {
     let discountNet = 0;
     const preview = promoState.value.preview;
     if (preview && preview.valid && promoState.value.status === "valid") {
-      const valid = preview;
-      const value = Number(valid.discount.value);
-      if (Number.isFinite(value) && value > 0) {
-        if (valid.discount.valueType === "PERCENT") {
-          discountNet = subtotalNet * value / 100;
-        } else {
-          discountNet = Math.min(value, subtotalNet);
-        }
+      const amount = Number(preview.price.discountNet);
+      if (Number.isFinite(amount) && amount > 0) {
+        discountNet = Math.min(amount, planNet);
       }
     }
     const totalNet = Math.max(0, subtotalNet - discountNet);
     let yearSavings = 0;
-    if (planObj) {
-      const monthlyTotal = priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, "MONTHLY", yearlyFactor) * 12;
-      const yearlyTotal = priceForCycle(
-        planObj.monthlyNet ?? 0,
-        planObj.yearlyNet,
-        "YEARLY",
-        yearlyFactor
-      );
-      yearSavings = Math.max(0, monthlyTotal - yearlyTotal);
+    if (planObj && planObj.monthlyNet !== null && planObj.yearlyNet !== null) {
+      yearSavings = Math.max(0, planObj.monthlyNet * 12 - planObj.yearlyNet);
     }
     return {
       cycle: cyc,
+      planPriced: planPrice !== null,
       planNet,
       bundlesNet,
       subtotalNet,
@@ -6685,7 +6669,9 @@ function useSubscriptionDraft(options) {
       totalNet,
       yearSavings,
       breakdown: {
-        plan: planObj ? {
+        // A plan not sold in the cycle has no line: 0.00 beside its name
+        // would read as a price.
+        plan: planObj && planPrice !== null ? {
           key: `plan:${planObj.id}`,
           label: planObj.name,
           net: planNet,
@@ -6698,9 +6684,15 @@ function useSubscriptionDraft(options) {
   const isDirty = (0, import_vue19.computed)(() => {
     return selectedBundleVersionIds.value.size > 0 || promoState.value.status === "valid";
   });
+  function forgetPromoPreview() {
+    if (promoState.value.status !== "idle") {
+      promoState.value = { status: "idle", preview: null, message: "" };
+    }
+  }
   function setPlan(planId) {
     if (plan.value === planId) return;
     plan.value = planId;
+    forgetPromoPreview();
     const compatibleBundleVersions = /* @__PURE__ */ new Set();
     for (const bundle of subscriptionBundlesRef.value) {
       if (bundle.compatiblePlanKeys.length === 0 || bundle.compatiblePlanKeys.includes(planId)) {
@@ -6712,7 +6704,9 @@ function useSubscriptionDraft(options) {
     );
   }
   function setCycle(c) {
+    if (cycle.value === c) return;
     cycle.value = c;
+    forgetPromoPreview();
   }
   function toggleSubscriptionBundle(bundleVersionId) {
     const next = new Set(selectedBundleVersionIds.value);
@@ -6722,9 +6716,7 @@ function useSubscriptionDraft(options) {
   }
   function setPromoCode(code) {
     promoCode.value = code.toUpperCase();
-    if (promoState.value.status !== "idle") {
-      promoState.value = { status: "idle", preview: null, message: "" };
-    }
+    forgetPromoPreview();
   }
   function setPromoState(state) {
     promoState.value = state;
@@ -8841,7 +8833,6 @@ function buildQuotaRegistry(quotaCatalog, locale) {
   DEFAULT_ROWS_PER_PAGE,
   DEFAULT_SA_LOCALE,
   DEFAULT_STANDARD_PAGE_ROUTES,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   HttpJsonError,

package/dist/index.d.cts

@@ -2,7 +2,7 @@ export { ADMIN_UI_VERSION, AdminPromoListFilter, AdminPromoListRow, AdminResourc
 export { A as ActionDefNotInManifestError, a as ActionHandler, b as ActionRegistry, c as AppliedSettingsView, d as AuditListFilter, B as Bound, D as DEFAULT_SA_LOCALE, e as DiscoveryRead, E as EmailHistoryDetail, f as EmailHistoryFilter, g as EmailHistoryListResult, h as EmailHistoryResendResult, i as EmailHistoryRow, j as EmailHistoryStatus, H as HttpClient, k as HttpResponse, K as KpiReading, l as KvStore, L as LIST_FIRST_PAGE, m as LIST_PAGE_SIZE_DEFAULT, n as LIST_PAGE_SIZE_MAX, o as LIST_PAGINATION_PARAMS, p as ListFilterOf, q as ListOp, r as ListQuery, M as MarketingProjectionsFilter, s as MessageTree, t as MissingHandlerError, P as PartialMessages, u as PilotCreatePayload, v as PilotCreateResult, w as PilotEditPayload, x as PilotEditResult, y as PilotRow, z as PlatformEmailProvider, C as PlatformEmailTestInput, F as PlatformEmailTestResult, G as PlatformEmailWriteInput, I as PlatformResources, J as PromoCodesFilter, N as PromoDetail, O as PublishBundleVersionOptions, Q as PublishPlanVersionOptions, R as ResolvedAction, S as ResourceContext, T as ResourceDef, U as ResourceListPage, V as ResourceOp, W as ResourceOps, X as SA_INTL_LOCALES, Y as SA_LOCALES, Z as SA_LOCALE_LABELS, _ as SA_MESSAGES, $ as SaBuiltinLocale, a0 as SaCatalog, a1 as SaCatalogOptions, a2 as SaLocale, a3 as SaLocaleDefinition, a4 as SaLocaleOption, a5 as SaMessages, a6 as SaMessagesOverrides, a7 as SettingsChangeView, a8 as SettingsDifferenceView, a9 as TenantsListFilter, aa as TranslationOf, ab as auditResource, ac as bindResource, ad as bundleVersionsResource, ae as bundlesResource, af as clampListPage, ag as clampListPageSize, ah as createSaCatalog, ai as dashboardResource, aj as defaultHttpClient, ak as defaultKvStore, al as defineListOp, am as defineMessages, an as defineResource, ao as discoveryResource, ap as filterQueryString, aq as isSaBuiltinLocale, ar as isSentInQuery, as as listUrl, at as marketingResource, au as mergeMessages, av as planVersionsResource, aw as plansResource, ax as platformResources, ay as promoCodesResource, az as readListPage, aA as resolveMessages, aB as settingsResource, aC as tenantsResource } from './catalog-DUdy_YZB.cjs';
 export { A as AdminError, a as AdminErrorInit, B as BatchColumnData, b as BatchColumnDriftError, c as BatchColumnFetcher, d as BatchColumnFetcherOptions, e as BatchColumnRow, f as BatchColumnValue, g as BootLoadError, h as BootLoader, i as BootLoaderOptions, j as BuildRouteEntry, C as CachedManifestEntry, D as DEFAULT_STANDARD_PAGE_ROUTES, M as ManifestLoadError, k as ManifestLoader, l as ManifestLoaderOptions, N as NavBuilderOptions, P as ParamStyle, S as SidebarItem, m as SidebarSection, n as adminErrorMessage, o as buildRoutes, p as buildSidebar, q as defaultSectionOrder, r as httpStatusOf, s as isAdminError, t as isAxiosNoResponseError, u as isEmptyResponse, v as isPlatformError, w as isTransportFailure, x as markEmptyResponse, y as markPlatformError, z as markTransportFailure, E as readErrorCode, F as readErrorDetail, G as resolveExtension, H as toAdminError } from './batch-column-fetcher-DmoujOET.cjs';
 export { A as ActionsMap, C as CreateResourceRegistryOptions, E as ExtensionLoader, a as ExtensionsMap, I as InstallPlugin, O as OpOverride, R as ResourceMap, b as ResourceOverride, c as ResourceOverrides, d as ResourceRegistry, S as SA_COLOR_SCHEMES, e as SA_LOCALE_STORAGE_KEY, f as SA_THEME_KEY, g as SA_THEME_STORAGE_KEY, h as SUPER_ADMIN_ACTIONS_KEY, i as SUPER_ADMIN_BRAND_KEY, j as SUPER_ADMIN_CONFIRM_KEY, k as SUPER_ADMIN_ENDPOINTS_KEY, l as SUPER_ADMIN_EXTENSIONS_KEY, m as SUPER_ADMIN_HTTP_KEY, n as SUPER_ADMIN_I18N_KEY, o as SUPER_ADMIN_LOGIN_ADAPTER_KEY, p as SUPER_ADMIN_MANIFEST_CLEAR_CACHE_KEY, q as SUPER_ADMIN_MANIFEST_KEY, r as SUPER_ADMIN_NOTIFY_KEY, s as SUPER_ADMIN_RESOURCES_KEY, t as SaColorScheme, u as SaResolvedScheme, v as SaTheme, w as SaThemeOptions, x as SuperAdminAuthGuardOptions, y as SuperAdminBrand, z as SuperAdminEndpoints, B as SuperAdminGuardOptions, D as SuperAdminI18n, F as SuperAdminI18nOptions, G as SuperAdminLoginAdapter, H as SuperAdminLoginResult, J as SuperAdminManifestGuardOptions, U as UiConfirm, K as UiConfirmPrompt, L as UiConfirmRequest, M as UiConfirmResult, N as UiConfirmTone, P as UiNotify, Q as UiNotifyKind, T as UiNotifyOptions, V as bindSaThemeAttribute, W as buildNavigationGuard, X as createResourceRegistry, Y as createSaTheme, Z as createSuperAdminI18n, _ as useResource, $ as useSaMessages, a0 as useSaTheme, a1 as useSuperAdminI18n } from './resource-registry-CYmBGVPK.cjs';
-export { ALL_ROWS, ApiListResponse, AppliedSettingsResource, AppliedSettingsState, AsyncAction, AsyncActionResult, AsyncData, AsyncList, BillingCycleStr, BulkItemKind, BulkItemStatus, BulkPublishItem, BundleAddPreviewShape, BundleBookingOptions, BundleCancelPreviewShape, BundlePreviewIssueShape, BundlePreviewShape, BundlePreviewSnapshotShape, BundlesApiError, CancellationResultShape, CatalogBundle, CatalogEntriesApiError, CatalogPlan, ConfirmDialogState, CreateAdminRoutesOptions, CreateManifestStoreOptions, CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, DEFAULT_YEARLY_FACTOR, Dialog, DiscoveryLoadError, DraftPricing, ENTITLEMENT_INJECTION_KEY, EntitlementSnapshotShape, FeatureRouterGuardOptions, FeatureRowMarkers, ListOpNames, ListResourceKey, ManifestStoreActions, ManifestStoreDefinition, ManifestStoreState, MarketingProjectionsApiError, MfaDialogState, MfaOutcome, MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, PackageSnapshotShape, PillTone, PlanChangePreviewIssueShape, PlanChangePreviewShape, PlanDraftEditing, PlanDraftForm, PlanSnapshotShape, PlanWizardState, PlannedOnlyFeatureError, PlansApiError, PlatformLoaders, PlatformTenantActionRow, PlatformTenantActionTone, PlatformTenantActionsOptions, PlatformTenantActionsResult, PriceLineItem, ProjectPageHost, PromoState, PromoStatus, PromotionsApiError, RedundantFeatureHintShape, ResolvedBundlePrice, ResolvedTenantAction, RowOf, RowReorder, SERVER_PAGE_SIZE_OPTIONS, StepStatus, Steps, SubscriptionBundleShape, SubscriptionDraft, TenantActionFlowProviders, TenantActionInput, TenantManifestNavItem, TenantManifestShape, TenantRowLike, TenantSubscriptionBundlesApiError, UsageSnapshotShape, UseActionsResult, UseApiListOptions, UseApiListResult, UseAsyncActionOptions, UseAsyncDataOptions, UseAuditEntriesOptions, UseAuditEntriesResult, UseBatchColumnsResult, UseBulkPublishOptions, UseBulkPublishResult, UseBundleVersionsMapOptions, UseBundleVersionsMapResult, UseBundleVersionsOptions, UseBundleVersionsResult, UseBundlesOptions, UseBundlesResult, UseCatalogEntriesOptions, UseCatalogEntriesResult, UseDialogOptions, UseDiscoveryOptions, UseDiscoveryResult, UseEntitlementOptions, UseEntitlementResult, UseLivePlanVersionsOptions, UseLivePlanVersionsResult, UseManifestResult, UseMarketingProjectionsOptions, UseMarketingProjectionsResult, UseNavResult, UsePaginationResult, UsePlanEditorOptions, UsePlanEditorResult, UsePlanVersionsOptions, UsePlanVersionsResult, UsePlansOptions, UsePlansResult, UsePromotionsOptions, UsePromotionsResult, UsePublicBootResult, UseResourceListOptions, UseSignOutOptions, UseStepsOptions, UseSubscriptionDraftOptions, UseTenantActionFlowResult, UseTenantBillingCatalogOptions, UseTenantBillingCatalogResult, UseTenantBillingOptions, UseTenantBillingResult, UseTenantManifestOptions, UseTenantManifestResult, UseTenantSubscriptionBundlesOptions, UseTenantSubscriptionBundlesResult, UseTenantsOptions, UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants } from './vue/index.cjs';
+export { ALL_ROWS, ApiListResponse, AppliedSettingsResource, AppliedSettingsState, AsyncAction, AsyncActionResult, AsyncData, AsyncList, BillingCycleStr, BulkItemKind, BulkItemStatus, BulkPublishItem, BundleAddPreviewShape, BundleBookingOptions, BundleCancelPreviewShape, BundlePreviewIssueShape, BundlePreviewShape, BundlePreviewSnapshotShape, BundlesApiError, CancellationResultShape, CatalogBundle, CatalogEntriesApiError, CatalogPlan, ConfirmDialogState, CreateAdminRoutesOptions, CreateManifestStoreOptions, CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, Dialog, DiscoveryLoadError, DraftPricing, ENTITLEMENT_INJECTION_KEY, EntitlementSnapshotShape, FeatureRouterGuardOptions, FeatureRowMarkers, ListOpNames, ListResourceKey, ManifestStoreActions, ManifestStoreDefinition, ManifestStoreState, MarketingProjectionsApiError, MfaDialogState, MfaOutcome, MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, PackageSnapshotShape, PillTone, PlanChangePreviewIssueShape, PlanChangePreviewShape, PlanDraftEditing, PlanDraftForm, PlanSnapshotShape, PlanWizardState, PlannedOnlyFeatureError, PlansApiError, PlatformLoaders, PlatformTenantActionRow, PlatformTenantActionTone, PlatformTenantActionsOptions, PlatformTenantActionsResult, PriceLineItem, ProjectPageHost, PromoState, PromoStatus, PromotionsApiError, RedundantFeatureHintShape, ResolvedBundlePrice, ResolvedTenantAction, RowOf, RowReorder, SERVER_PAGE_SIZE_OPTIONS, StepStatus, Steps, SubscriptionBundleShape, SubscriptionDraft, TenantActionFlowProviders, TenantActionInput, TenantManifestNavItem, TenantManifestShape, TenantRowLike, TenantSubscriptionBundlesApiError, UsageSnapshotShape, UseActionsResult, UseApiListOptions, UseApiListResult, UseAsyncActionOptions, UseAsyncDataOptions, UseAuditEntriesOptions, UseAuditEntriesResult, UseBatchColumnsResult, UseBulkPublishOptions, UseBulkPublishResult, UseBundleVersionsMapOptions, UseBundleVersionsMapResult, UseBundleVersionsOptions, UseBundleVersionsResult, UseBundlesOptions, UseBundlesResult, UseCatalogEntriesOptions, UseCatalogEntriesResult, UseDialogOptions, UseDiscoveryOptions, UseDiscoveryResult, UseEntitlementOptions, UseEntitlementResult, UseLivePlanVersionsOptions, UseLivePlanVersionsResult, UseManifestResult, UseMarketingProjectionsOptions, UseMarketingProjectionsResult, UseNavResult, UsePaginationResult, UsePlanEditorOptions, UsePlanEditorResult, UsePlanVersionsOptions, UsePlanVersionsResult, UsePlansOptions, UsePlansResult, UsePromotionsOptions, UsePromotionsResult, UsePublicBootResult, UseResourceListOptions, UseSignOutOptions, UseStepsOptions, UseSubscriptionDraftOptions, UseTenantActionFlowResult, UseTenantBillingCatalogOptions, UseTenantBillingCatalogResult, UseTenantBillingOptions, UseTenantBillingResult, UseTenantManifestOptions, UseTenantManifestResult, UseTenantSubscriptionBundlesOptions, UseTenantSubscriptionBundlesResult, UseTenantsOptions, UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants } from './vue/index.cjs';
 import { FeatureCatalogEntryRow, QuotaCatalogEntryRow } from '@saasicat/core';
 import 'vue';
 import 'vue-router';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { ADMIN_UI_VERSION, AdminPromoListFilter, AdminPromoListRow, AdminResourc
 export { A as ActionDefNotInManifestError, a as ActionHandler, b as ActionRegistry, c as AppliedSettingsView, d as AuditListFilter, B as Bound, D as DEFAULT_SA_LOCALE, e as DiscoveryRead, E as EmailHistoryDetail, f as EmailHistoryFilter, g as EmailHistoryListResult, h as EmailHistoryResendResult, i as EmailHistoryRow, j as EmailHistoryStatus, H as HttpClient, k as HttpResponse, K as KpiReading, l as KvStore, L as LIST_FIRST_PAGE, m as LIST_PAGE_SIZE_DEFAULT, n as LIST_PAGE_SIZE_MAX, o as LIST_PAGINATION_PARAMS, p as ListFilterOf, q as ListOp, r as ListQuery, M as MarketingProjectionsFilter, s as MessageTree, t as MissingHandlerError, P as PartialMessages, u as PilotCreatePayload, v as PilotCreateResult, w as PilotEditPayload, x as PilotEditResult, y as PilotRow, z as PlatformEmailProvider, C as PlatformEmailTestInput, F as PlatformEmailTestResult, G as PlatformEmailWriteInput, I as PlatformResources, J as PromoCodesFilter, N as PromoDetail, O as PublishBundleVersionOptions, Q as PublishPlanVersionOptions, R as ResolvedAction, S as ResourceContext, T as ResourceDef, U as ResourceListPage, V as ResourceOp, W as ResourceOps, X as SA_INTL_LOCALES, Y as SA_LOCALES, Z as SA_LOCALE_LABELS, _ as SA_MESSAGES, $ as SaBuiltinLocale, a0 as SaCatalog, a1 as SaCatalogOptions, a2 as SaLocale, a3 as SaLocaleDefinition, a4 as SaLocaleOption, a5 as SaMessages, a6 as SaMessagesOverrides, a7 as SettingsChangeView, a8 as SettingsDifferenceView, a9 as TenantsListFilter, aa as TranslationOf, ab as auditResource, ac as bindResource, ad as bundleVersionsResource, ae as bundlesResource, af as clampListPage, ag as clampListPageSize, ah as createSaCatalog, ai as dashboardResource, aj as defaultHttpClient, ak as defaultKvStore, al as defineListOp, am as defineMessages, an as defineResource, ao as discoveryResource, ap as filterQueryString, aq as isSaBuiltinLocale, ar as isSentInQuery, as as listUrl, at as marketingResource, au as mergeMessages, av as planVersionsResource, aw as plansResource, ax as platformResources, ay as promoCodesResource, az as readListPage, aA as resolveMessages, aB as settingsResource, aC as tenantsResource } from './catalog-DUdy_YZB.js';
 export { A as AdminError, a as AdminErrorInit, B as BatchColumnData, b as BatchColumnDriftError, c as BatchColumnFetcher, d as BatchColumnFetcherOptions, e as BatchColumnRow, f as BatchColumnValue, g as BootLoadError, h as BootLoader, i as BootLoaderOptions, j as BuildRouteEntry, C as CachedManifestEntry, D as DEFAULT_STANDARD_PAGE_ROUTES, M as ManifestLoadError, k as ManifestLoader, l as ManifestLoaderOptions, N as NavBuilderOptions, P as ParamStyle, S as SidebarItem, m as SidebarSection, n as adminErrorMessage, o as buildRoutes, p as buildSidebar, q as defaultSectionOrder, r as httpStatusOf, s as isAdminError, t as isAxiosNoResponseError, u as isEmptyResponse, v as isPlatformError, w as isTransportFailure, x as markEmptyResponse, y as markPlatformError, z as markTransportFailure, E as readErrorCode, F as readErrorDetail, G as resolveExtension, H as toAdminError } from './batch-column-fetcher-CFnqFxQU.js';
 export { A as ActionsMap, C as CreateResourceRegistryOptions, E as ExtensionLoader, a as ExtensionsMap, I as InstallPlugin, O as OpOverride, R as ResourceMap, b as ResourceOverride, c as ResourceOverrides, d as ResourceRegistry, S as SA_COLOR_SCHEMES, e as SA_LOCALE_STORAGE_KEY, f as SA_THEME_KEY, g as SA_THEME_STORAGE_KEY, h as SUPER_ADMIN_ACTIONS_KEY, i as SUPER_ADMIN_BRAND_KEY, j as SUPER_ADMIN_CONFIRM_KEY, k as SUPER_ADMIN_ENDPOINTS_KEY, l as SUPER_ADMIN_EXTENSIONS_KEY, m as SUPER_ADMIN_HTTP_KEY, n as SUPER_ADMIN_I18N_KEY, o as SUPER_ADMIN_LOGIN_ADAPTER_KEY, p as SUPER_ADMIN_MANIFEST_CLEAR_CACHE_KEY, q as SUPER_ADMIN_MANIFEST_KEY, r as SUPER_ADMIN_NOTIFY_KEY, s as SUPER_ADMIN_RESOURCES_KEY, t as SaColorScheme, u as SaResolvedScheme, v as SaTheme, w as SaThemeOptions, x as SuperAdminAuthGuardOptions, y as SuperAdminBrand, z as SuperAdminEndpoints, B as SuperAdminGuardOptions, D as SuperAdminI18n, F as SuperAdminI18nOptions, G as SuperAdminLoginAdapter, H as SuperAdminLoginResult, J as SuperAdminManifestGuardOptions, U as UiConfirm, K as UiConfirmPrompt, L as UiConfirmRequest, M as UiConfirmResult, N as UiConfirmTone, P as UiNotify, Q as UiNotifyKind, T as UiNotifyOptions, V as bindSaThemeAttribute, W as buildNavigationGuard, X as createResourceRegistry, Y as createSaTheme, Z as createSuperAdminI18n, _ as useResource, $ as useSaMessages, a0 as useSaTheme, a1 as useSuperAdminI18n } from './resource-registry-bG2PxbM0.js';
-export { ALL_ROWS, ApiListResponse, AppliedSettingsResource, AppliedSettingsState, AsyncAction, AsyncActionResult, AsyncData, AsyncList, BillingCycleStr, BulkItemKind, BulkItemStatus, BulkPublishItem, BundleAddPreviewShape, BundleBookingOptions, BundleCancelPreviewShape, BundlePreviewIssueShape, BundlePreviewShape, BundlePreviewSnapshotShape, BundlesApiError, CancellationResultShape, CatalogBundle, CatalogEntriesApiError, CatalogPlan, ConfirmDialogState, CreateAdminRoutesOptions, CreateManifestStoreOptions, CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, DEFAULT_YEARLY_FACTOR, Dialog, DiscoveryLoadError, DraftPricing, ENTITLEMENT_INJECTION_KEY, EntitlementSnapshotShape, FeatureRouterGuardOptions, FeatureRowMarkers, ListOpNames, ListResourceKey, ManifestStoreActions, ManifestStoreDefinition, ManifestStoreState, MarketingProjectionsApiError, MfaDialogState, MfaOutcome, MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, PackageSnapshotShape, PillTone, PlanChangePreviewIssueShape, PlanChangePreviewShape, PlanDraftEditing, PlanDraftForm, PlanSnapshotShape, PlanWizardState, PlannedOnlyFeatureError, PlansApiError, PlatformLoaders, PlatformTenantActionRow, PlatformTenantActionTone, PlatformTenantActionsOptions, PlatformTenantActionsResult, PriceLineItem, ProjectPageHost, PromoState, PromoStatus, PromotionsApiError, RedundantFeatureHintShape, ResolvedBundlePrice, ResolvedTenantAction, RowOf, RowReorder, SERVER_PAGE_SIZE_OPTIONS, StepStatus, Steps, SubscriptionBundleShape, SubscriptionDraft, TenantActionFlowProviders, TenantActionInput, TenantManifestNavItem, TenantManifestShape, TenantRowLike, TenantSubscriptionBundlesApiError, UsageSnapshotShape, UseActionsResult, UseApiListOptions, UseApiListResult, UseAsyncActionOptions, UseAsyncDataOptions, UseAuditEntriesOptions, UseAuditEntriesResult, UseBatchColumnsResult, UseBulkPublishOptions, UseBulkPublishResult, UseBundleVersionsMapOptions, UseBundleVersionsMapResult, UseBundleVersionsOptions, UseBundleVersionsResult, UseBundlesOptions, UseBundlesResult, UseCatalogEntriesOptions, UseCatalogEntriesResult, UseDialogOptions, UseDiscoveryOptions, UseDiscoveryResult, UseEntitlementOptions, UseEntitlementResult, UseLivePlanVersionsOptions, UseLivePlanVersionsResult, UseManifestResult, UseMarketingProjectionsOptions, UseMarketingProjectionsResult, UseNavResult, UsePaginationResult, UsePlanEditorOptions, UsePlanEditorResult, UsePlanVersionsOptions, UsePlanVersionsResult, UsePlansOptions, UsePlansResult, UsePromotionsOptions, UsePromotionsResult, UsePublicBootResult, UseResourceListOptions, UseSignOutOptions, UseStepsOptions, UseSubscriptionDraftOptions, UseTenantActionFlowResult, UseTenantBillingCatalogOptions, UseTenantBillingCatalogResult, UseTenantBillingOptions, UseTenantBillingResult, UseTenantManifestOptions, UseTenantManifestResult, UseTenantSubscriptionBundlesOptions, UseTenantSubscriptionBundlesResult, UseTenantsOptions, UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants } from './vue/index.js';
+export { ALL_ROWS, ApiListResponse, AppliedSettingsResource, AppliedSettingsState, AsyncAction, AsyncActionResult, AsyncData, AsyncList, BillingCycleStr, BulkItemKind, BulkItemStatus, BulkPublishItem, BundleAddPreviewShape, BundleBookingOptions, BundleCancelPreviewShape, BundlePreviewIssueShape, BundlePreviewShape, BundlePreviewSnapshotShape, BundlesApiError, CancellationResultShape, CatalogBundle, CatalogEntriesApiError, CatalogPlan, ConfirmDialogState, CreateAdminRoutesOptions, CreateManifestStoreOptions, CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, Dialog, DiscoveryLoadError, DraftPricing, ENTITLEMENT_INJECTION_KEY, EntitlementSnapshotShape, FeatureRouterGuardOptions, FeatureRowMarkers, ListOpNames, ListResourceKey, ManifestStoreActions, ManifestStoreDefinition, ManifestStoreState, MarketingProjectionsApiError, MfaDialogState, MfaOutcome, MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, PackageSnapshotShape, PillTone, PlanChangePreviewIssueShape, PlanChangePreviewShape, PlanDraftEditing, PlanDraftForm, PlanSnapshotShape, PlanWizardState, PlannedOnlyFeatureError, PlansApiError, PlatformLoaders, PlatformTenantActionRow, PlatformTenantActionTone, PlatformTenantActionsOptions, PlatformTenantActionsResult, PriceLineItem, ProjectPageHost, PromoState, PromoStatus, PromotionsApiError, RedundantFeatureHintShape, ResolvedBundlePrice, ResolvedTenantAction, RowOf, RowReorder, SERVER_PAGE_SIZE_OPTIONS, StepStatus, Steps, SubscriptionBundleShape, SubscriptionDraft, TenantActionFlowProviders, TenantActionInput, TenantManifestNavItem, TenantManifestShape, TenantRowLike, TenantSubscriptionBundlesApiError, UsageSnapshotShape, UseActionsResult, UseApiListOptions, UseApiListResult, UseAsyncActionOptions, UseAsyncDataOptions, UseAuditEntriesOptions, UseAuditEntriesResult, UseBatchColumnsResult, UseBulkPublishOptions, UseBulkPublishResult, UseBundleVersionsMapOptions, UseBundleVersionsMapResult, UseBundleVersionsOptions, UseBundleVersionsResult, UseBundlesOptions, UseBundlesResult, UseCatalogEntriesOptions, UseCatalogEntriesResult, UseDialogOptions, UseDiscoveryOptions, UseDiscoveryResult, UseEntitlementOptions, UseEntitlementResult, UseLivePlanVersionsOptions, UseLivePlanVersionsResult, UseManifestResult, UseMarketingProjectionsOptions, UseMarketingProjectionsResult, UseNavResult, UsePaginationResult, UsePlanEditorOptions, UsePlanEditorResult, UsePlanVersionsOptions, UsePlanVersionsResult, UsePlansOptions, UsePlansResult, UsePromotionsOptions, UsePromotionsResult, UsePublicBootResult, UseResourceListOptions, UseSignOutOptions, UseStepsOptions, UseSubscriptionDraftOptions, UseTenantActionFlowResult, UseTenantBillingCatalogOptions, UseTenantBillingCatalogResult, UseTenantBillingOptions, UseTenantBillingResult, UseTenantManifestOptions, UseTenantManifestResult, UseTenantSubscriptionBundlesOptions, UseTenantSubscriptionBundlesResult, UseTenantsOptions, UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants } from './vue/index.js';
 import { FeatureCatalogEntryRow, QuotaCatalogEntryRow } from '@saasicat/core';
 import 'vue';
 import 'vue-router';

package/dist/index.js

@@ -30,7 +30,6 @@ import {
   CatalogEntriesApiError,
   DEFAULT_LOGIN_PATH,
   DEFAULT_ROWS_PER_PAGE,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   MarketingProjectionsApiError,
@@ -100,7 +99,7 @@ import {
   useTenantManifest,
   useTenantSubscriptionBundles,
   useTenants
-} from "./chunk-HYFHYL73.js";
+} from "./chunk-ADKRZZDZ.js";
 import {
   ActionDefNotInManifestError,
   ActionRegistry,
@@ -268,7 +267,6 @@ export {
   DEFAULT_ROWS_PER_PAGE,
   DEFAULT_SA_LOCALE,
   DEFAULT_STANDARD_PAGE_ROUTES,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   HttpJsonError,

package/dist/vue/index.cjs

@@ -25,7 +25,6 @@ __export(vue_exports, {
   CatalogEntriesApiError: () => CatalogEntriesApiError,
   DEFAULT_LOGIN_PATH: () => DEFAULT_LOGIN_PATH,
   DEFAULT_ROWS_PER_PAGE: () => DEFAULT_ROWS_PER_PAGE,
-  DEFAULT_YEARLY_FACTOR: () => DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError: () => DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY: () => ENTITLEMENT_INJECTION_KEY,
   MarketingProjectionsApiError: () => MarketingProjectionsApiError,
@@ -5507,21 +5506,16 @@ function useTenantBilling(options = {}) {
 // src/vue/use-subscription-draft.ts
 var import_vue19 = require("vue");
 var import_core3 = require("@saasicat/core");
-var DEFAULT_YEARLY_FACTOR = 10;
 function unwrap(source) {
   if (source && typeof source === "object" && "value" in source) {
     return source.value;
   }
   return source;
 }
-function priceForCycle(monthlyNet, yearlyNet, cycle, yearlyFactor) {
-  if (cycle === "YEARLY") {
-    return yearlyNet != null ? yearlyNet : monthlyNet * yearlyFactor;
-  }
-  return monthlyNet;
+function priceForCycle(item, cycle) {
+  return cycle === "YEARLY" ? item.yearlyNet : item.monthlyNet;
 }
 function useSubscriptionDraft(options) {
-  const yearlyFactor = options.yearlyFactor ?? DEFAULT_YEARLY_FACTOR;
   const plansRef = (0, import_vue19.computed)(() => unwrap(options.plans) ?? []);
   const subscriptionBundlesRef = (0, import_vue19.computed)(
     () => unwrap(options.subscriptionBundles ?? null) ?? []
@@ -5539,7 +5533,7 @@ function useSubscriptionDraft(options) {
   });
   const selectedBundles = (0, import_vue19.computed)(
     () => subscriptionBundlesRef.value.filter(
-      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId)
+      (b) => selectedBundleVersionIds.value.has(b.bundleVersionId) && priceForCycle(b, cycle.value) !== null
     )
   );
   const chargeableBundles = (0, import_vue19.computed)(() => {
@@ -5564,11 +5558,12 @@ function useSubscriptionDraft(options) {
   const pricing = (0, import_vue19.computed)(() => {
     const cyc = cycle.value;
     const planObj = selectedPlan.value;
-    const planNet = planObj ? priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, cyc, yearlyFactor) : 0;
+    const planPrice = planObj ? priceForCycle(planObj, cyc) : null;
+    const planNet = planPrice ?? 0;
     const bundleItems = [];
     let bundlesNet = 0;
     for (const b of chargeableBundles.value) {
-      const net = priceForCycle(b.monthlyNet ?? 0, b.yearlyNet, cyc, yearlyFactor);
+      const net = priceForCycle(b, cyc) ?? 0;
       bundlesNet += net;
       bundleItems.push({
         key: `subscription-bundle:${b.bundleVersionId}`,
@@ -5580,30 +5575,19 @@ function useSubscriptionDraft(options) {
     let discountNet = 0;
     const preview = promoState.value.preview;
     if (preview && preview.valid && promoState.value.status === "valid") {
-      const valid = preview;
-      const value = Number(valid.discount.value);
-      if (Number.isFinite(value) && value > 0) {
-        if (valid.discount.valueType === "PERCENT") {
-          discountNet = subtotalNet * value / 100;
-        } else {
-          discountNet = Math.min(value, subtotalNet);
-        }
+      const amount = Number(preview.price.discountNet);
+      if (Number.isFinite(amount) && amount > 0) {
+        discountNet = Math.min(amount, planNet);
       }
     }
     const totalNet = Math.max(0, subtotalNet - discountNet);
     let yearSavings = 0;
-    if (planObj) {
-      const monthlyTotal = priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, "MONTHLY", yearlyFactor) * 12;
-      const yearlyTotal = priceForCycle(
-        planObj.monthlyNet ?? 0,
-        planObj.yearlyNet,
-        "YEARLY",
-        yearlyFactor
-      );
-      yearSavings = Math.max(0, monthlyTotal - yearlyTotal);
+    if (planObj && planObj.monthlyNet !== null && planObj.yearlyNet !== null) {
+      yearSavings = Math.max(0, planObj.monthlyNet * 12 - planObj.yearlyNet);
     }
     return {
       cycle: cyc,
+      planPriced: planPrice !== null,
       planNet,
       bundlesNet,
       subtotalNet,
@@ -5611,7 +5595,9 @@ function useSubscriptionDraft(options) {
       totalNet,
       yearSavings,
       breakdown: {
-        plan: planObj ? {
+        // A plan not sold in the cycle has no line: 0.00 beside its name
+        // would read as a price.
+        plan: planObj && planPrice !== null ? {
           key: `plan:${planObj.id}`,
           label: planObj.name,
           net: planNet,
@@ -5624,9 +5610,15 @@ function useSubscriptionDraft(options) {
   const isDirty = (0, import_vue19.computed)(() => {
     return selectedBundleVersionIds.value.size > 0 || promoState.value.status === "valid";
   });
+  function forgetPromoPreview() {
+    if (promoState.value.status !== "idle") {
+      promoState.value = { status: "idle", preview: null, message: "" };
+    }
+  }
   function setPlan(planId) {
     if (plan.value === planId) return;
     plan.value = planId;
+    forgetPromoPreview();
     const compatibleBundleVersions = /* @__PURE__ */ new Set();
     for (const bundle of subscriptionBundlesRef.value) {
       if (bundle.compatiblePlanKeys.length === 0 || bundle.compatiblePlanKeys.includes(planId)) {
@@ -5638,7 +5630,9 @@ function useSubscriptionDraft(options) {
     );
   }
   function setCycle(c) {
+    if (cycle.value === c) return;
     cycle.value = c;
+    forgetPromoPreview();
   }
   function toggleSubscriptionBundle(bundleVersionId) {
     const next = new Set(selectedBundleVersionIds.value);
@@ -5648,9 +5642,7 @@ function useSubscriptionDraft(options) {
   }
   function setPromoCode(code) {
     promoCode.value = code.toUpperCase();
-    if (promoState.value.status !== "idle") {
-      promoState.value = { status: "idle", preview: null, message: "" };
-    }
+    forgetPromoPreview();
   }
   function setPromoState(state) {
     promoState.value = state;
@@ -8188,7 +8180,6 @@ function createManifestStore(options) {
   CatalogEntriesApiError,
   DEFAULT_LOGIN_PATH,
   DEFAULT_ROWS_PER_PAGE,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   MarketingProjectionsApiError,

package/dist/vue/index.d.cts

@@ -886,7 +886,6 @@ interface UseTenantBillingResult {
 }
 declare function useTenantBilling(options?: UseTenantBillingOptions): UseTenantBillingResult;
 
-declare const DEFAULT_YEARLY_FACTOR = 10;
 type PromoStatus = 'idle' | 'checking' | 'valid' | 'invalid' | 'restricted';
 interface PromoState {
     status: PromoStatus;
@@ -901,8 +900,6 @@ interface UseSubscriptionDraftOptions {
     initialPlan?: string | null;
     initialCycle?: BillingCycleStr;
     initialBundleVersionIds?: ReadonlyArray<string>;
-    /** Override for the `yearlyNet` fallback if the catalog provides no yearlyNet. */
-    yearlyFactor?: number;
 }
 interface PriceLineItem {
     /** Stable key for UI `v-for`. */
@@ -915,13 +912,22 @@ interface PriceLineItem {
 }
 interface DraftPricing {
     cycle: BillingCycleStr;
+    /**
+     * Whether the selected plan carries a price for the cycle. A plan without
+     * one is not sold in it — a plan without a yearly price is a monthly plan —
+     * so `planNet` is 0 and there is nothing to submit.
+     */
+    planPriced: boolean;
     /** Plan base without bundles. */
     planNet: number;
     /** Sum of all selected catalog bundles. */
     bundlesNet: number;
     /** Plan + Bundles. */
     subtotalNet: number;
-    /** Discount derived from the promo preview (on subtotalNet, not plan-only). */
+    /**
+     * The promo preview's discount in net. A code discounts the plan price, not
+     * the bundles, so it never exceeds `planNet`.
+     */
     discountNet: number;
     /** subtotalNet - discountNet. */
     totalNet: number;
@@ -1979,4 +1985,4 @@ type ManifestStoreDefinition = StoreDefinition<string, ManifestStoreState, Recor
  */
 declare function createManifestStore(options: CreateManifestStoreOptions): ManifestStoreDefinition;
 
-export { ALL_ROWS, ActionsMap, type ApiListResponse, type AppliedSettingsResource, type AppliedSettingsState, type AsyncAction, type AsyncActionResult, type AsyncData, type AsyncList, type BillingCycleStr, type BulkItemKind, type BulkItemStatus, type BulkPublishItem, type BundleAddPreviewShape, type BundleBookingOptions, type BundleCancelPreviewShape, type BundlePreviewIssueShape, type BundlePreviewShape, type BundlePreviewSnapshotShape, BundlesApiError, type CancellationResultShape, type CatalogBundle, CatalogEntriesApiError, type CatalogPlan, type ConfirmDialogState, type CreateAdminRoutesOptions, type CreateManifestStoreOptions, type CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, DEFAULT_YEARLY_FACTOR, type Dialog, DiscoveryLoadError, type DraftPricing, ENTITLEMENT_INJECTION_KEY, type EntitlementSnapshotShape, ExtensionsMap, type FeatureRouterGuardOptions, type FeatureRowMarkers, type ListOpNames, type ListResourceKey, type ManifestStoreActions, type ManifestStoreDefinition, type ManifestStoreState, MarketingProjectionsApiError, type MfaDialogState, type MfaOutcome, type MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, type PackageSnapshotShape, type PillTone, type PlanChangePreviewIssueShape, type PlanChangePreviewShape, type PlanDraftEditing, type PlanDraftForm, type PlanSnapshotShape, type PlanWizardState, PlannedOnlyFeatureError, PlansApiError, type PlatformLoaders, type PlatformTenantActionRow, type PlatformTenantActionTone, type PlatformTenantActionsOptions, type PlatformTenantActionsResult, type PriceLineItem, ProjectPageHost, type PromoState, type PromoStatus, PromotionsApiError, type RedundantFeatureHintShape, type ResolvedBundlePrice, type ResolvedTenantAction, ResourceMap, ResourceOverride, type RowOf, type RowReorder, SERVER_PAGE_SIZE_OPTIONS, type StepStatus, type Steps, type SubscriptionBundleShape, type SubscriptionDraft, SuperAdminBrand, SuperAdminEndpoints, SuperAdminLoginAdapter, type TenantActionFlowProviders, type TenantActionInput, type TenantManifestNavItem, type TenantManifestShape, type TenantRowLike, TenantSubscriptionBundlesApiError, UiNotify, type UsageSnapshotShape, type UseActionsResult, type UseApiListOptions, type UseApiListResult, type UseAsyncActionOptions, type UseAsyncDataOptions, type UseAuditEntriesOptions, type UseAuditEntriesResult, type UseBatchColumnsResult, type UseBulkPublishOptions, type UseBulkPublishResult, type UseBundleVersionsMapOptions, type UseBundleVersionsMapResult, type UseBundleVersionsOptions, type UseBundleVersionsResult, type UseBundlesOptions, type UseBundlesResult, type UseCatalogEntriesOptions, type UseCatalogEntriesResult, type UseDialogOptions, type UseDiscoveryOptions, type UseDiscoveryResult, type UseEntitlementOptions, type UseEntitlementResult, type UseLivePlanVersionsOptions, type UseLivePlanVersionsResult, type UseManifestResult, type UseMarketingProjectionsOptions, type UseMarketingProjectionsResult, type UseNavResult, type UsePaginationResult, type UsePlanEditorOptions, type UsePlanEditorResult, type UsePlanVersionsOptions, type UsePlanVersionsResult, type UsePlansOptions, type UsePlansResult, type UsePromotionsOptions, type UsePromotionsResult, type UsePublicBootResult, type UseResourceListOptions, type UseSignOutOptions, type UseStepsOptions, type UseSubscriptionDraftOptions, type UseTenantActionFlowResult, type UseTenantBillingCatalogOptions, type UseTenantBillingCatalogResult, type UseTenantBillingOptions, type UseTenantBillingResult, type UseTenantManifestOptions, type UseTenantManifestResult, type UseTenantSubscriptionBundlesOptions, type UseTenantSubscriptionBundlesResult, type UseTenantsOptions, type UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants };
+export { ALL_ROWS, ActionsMap, type ApiListResponse, type AppliedSettingsResource, type AppliedSettingsState, type AsyncAction, type AsyncActionResult, type AsyncData, type AsyncList, type BillingCycleStr, type BulkItemKind, type BulkItemStatus, type BulkPublishItem, type BundleAddPreviewShape, type BundleBookingOptions, type BundleCancelPreviewShape, type BundlePreviewIssueShape, type BundlePreviewShape, type BundlePreviewSnapshotShape, BundlesApiError, type CancellationResultShape, type CatalogBundle, CatalogEntriesApiError, type CatalogPlan, type ConfirmDialogState, type CreateAdminRoutesOptions, type CreateManifestStoreOptions, type CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, type Dialog, DiscoveryLoadError, type DraftPricing, ENTITLEMENT_INJECTION_KEY, type EntitlementSnapshotShape, ExtensionsMap, type FeatureRouterGuardOptions, type FeatureRowMarkers, type ListOpNames, type ListResourceKey, type ManifestStoreActions, type ManifestStoreDefinition, type ManifestStoreState, MarketingProjectionsApiError, type MfaDialogState, type MfaOutcome, type MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, type PackageSnapshotShape, type PillTone, type PlanChangePreviewIssueShape, type PlanChangePreviewShape, type PlanDraftEditing, type PlanDraftForm, type PlanSnapshotShape, type PlanWizardState, PlannedOnlyFeatureError, PlansApiError, type PlatformLoaders, type PlatformTenantActionRow, type PlatformTenantActionTone, type PlatformTenantActionsOptions, type PlatformTenantActionsResult, type PriceLineItem, ProjectPageHost, type PromoState, type PromoStatus, PromotionsApiError, type RedundantFeatureHintShape, type ResolvedBundlePrice, type ResolvedTenantAction, ResourceMap, ResourceOverride, type RowOf, type RowReorder, SERVER_PAGE_SIZE_OPTIONS, type StepStatus, type Steps, type SubscriptionBundleShape, type SubscriptionDraft, SuperAdminBrand, SuperAdminEndpoints, SuperAdminLoginAdapter, type TenantActionFlowProviders, type TenantActionInput, type TenantManifestNavItem, type TenantManifestShape, type TenantRowLike, TenantSubscriptionBundlesApiError, UiNotify, type UsageSnapshotShape, type UseActionsResult, type UseApiListOptions, type UseApiListResult, type UseAsyncActionOptions, type UseAsyncDataOptions, type UseAuditEntriesOptions, type UseAuditEntriesResult, type UseBatchColumnsResult, type UseBulkPublishOptions, type UseBulkPublishResult, type UseBundleVersionsMapOptions, type UseBundleVersionsMapResult, type UseBundleVersionsOptions, type UseBundleVersionsResult, type UseBundlesOptions, type UseBundlesResult, type UseCatalogEntriesOptions, type UseCatalogEntriesResult, type UseDialogOptions, type UseDiscoveryOptions, type UseDiscoveryResult, type UseEntitlementOptions, type UseEntitlementResult, type UseLivePlanVersionsOptions, type UseLivePlanVersionsResult, type UseManifestResult, type UseMarketingProjectionsOptions, type UseMarketingProjectionsResult, type UseNavResult, type UsePaginationResult, type UsePlanEditorOptions, type UsePlanEditorResult, type UsePlanVersionsOptions, type UsePlanVersionsResult, type UsePlansOptions, type UsePlansResult, type UsePromotionsOptions, type UsePromotionsResult, type UsePublicBootResult, type UseResourceListOptions, type UseSignOutOptions, type UseStepsOptions, type UseSubscriptionDraftOptions, type UseTenantActionFlowResult, type UseTenantBillingCatalogOptions, type UseTenantBillingCatalogResult, type UseTenantBillingOptions, type UseTenantBillingResult, type UseTenantManifestOptions, type UseTenantManifestResult, type UseTenantSubscriptionBundlesOptions, type UseTenantSubscriptionBundlesResult, type UseTenantsOptions, type UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants };

package/dist/vue/index.d.ts

@@ -886,7 +886,6 @@ interface UseTenantBillingResult {
 }
 declare function useTenantBilling(options?: UseTenantBillingOptions): UseTenantBillingResult;
 
-declare const DEFAULT_YEARLY_FACTOR = 10;
 type PromoStatus = 'idle' | 'checking' | 'valid' | 'invalid' | 'restricted';
 interface PromoState {
     status: PromoStatus;
@@ -901,8 +900,6 @@ interface UseSubscriptionDraftOptions {
     initialPlan?: string | null;
     initialCycle?: BillingCycleStr;
     initialBundleVersionIds?: ReadonlyArray<string>;
-    /** Override for the `yearlyNet` fallback if the catalog provides no yearlyNet. */
-    yearlyFactor?: number;
 }
 interface PriceLineItem {
     /** Stable key for UI `v-for`. */
@@ -915,13 +912,22 @@ interface PriceLineItem {
 }
 interface DraftPricing {
     cycle: BillingCycleStr;
+    /**
+     * Whether the selected plan carries a price for the cycle. A plan without
+     * one is not sold in it — a plan without a yearly price is a monthly plan —
+     * so `planNet` is 0 and there is nothing to submit.
+     */
+    planPriced: boolean;
     /** Plan base without bundles. */
     planNet: number;
     /** Sum of all selected catalog bundles. */
     bundlesNet: number;
     /** Plan + Bundles. */
     subtotalNet: number;
-    /** Discount derived from the promo preview (on subtotalNet, not plan-only). */
+    /**
+     * The promo preview's discount in net. A code discounts the plan price, not
+     * the bundles, so it never exceeds `planNet`.
+     */
     discountNet: number;
     /** subtotalNet - discountNet. */
     totalNet: number;
@@ -1979,4 +1985,4 @@ type ManifestStoreDefinition = StoreDefinition<string, ManifestStoreState, Recor
  */
 declare function createManifestStore(options: CreateManifestStoreOptions): ManifestStoreDefinition;
 
-export { ALL_ROWS, ActionsMap, type ApiListResponse, type AppliedSettingsResource, type AppliedSettingsState, type AsyncAction, type AsyncActionResult, type AsyncData, type AsyncList, type BillingCycleStr, type BulkItemKind, type BulkItemStatus, type BulkPublishItem, type BundleAddPreviewShape, type BundleBookingOptions, type BundleCancelPreviewShape, type BundlePreviewIssueShape, type BundlePreviewShape, type BundlePreviewSnapshotShape, BundlesApiError, type CancellationResultShape, type CatalogBundle, CatalogEntriesApiError, type CatalogPlan, type ConfirmDialogState, type CreateAdminRoutesOptions, type CreateManifestStoreOptions, type CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, DEFAULT_YEARLY_FACTOR, type Dialog, DiscoveryLoadError, type DraftPricing, ENTITLEMENT_INJECTION_KEY, type EntitlementSnapshotShape, ExtensionsMap, type FeatureRouterGuardOptions, type FeatureRowMarkers, type ListOpNames, type ListResourceKey, type ManifestStoreActions, type ManifestStoreDefinition, type ManifestStoreState, MarketingProjectionsApiError, type MfaDialogState, type MfaOutcome, type MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, type PackageSnapshotShape, type PillTone, type PlanChangePreviewIssueShape, type PlanChangePreviewShape, type PlanDraftEditing, type PlanDraftForm, type PlanSnapshotShape, type PlanWizardState, PlannedOnlyFeatureError, PlansApiError, type PlatformLoaders, type PlatformTenantActionRow, type PlatformTenantActionTone, type PlatformTenantActionsOptions, type PlatformTenantActionsResult, type PriceLineItem, ProjectPageHost, type PromoState, type PromoStatus, PromotionsApiError, type RedundantFeatureHintShape, type ResolvedBundlePrice, type ResolvedTenantAction, ResourceMap, ResourceOverride, type RowOf, type RowReorder, SERVER_PAGE_SIZE_OPTIONS, type StepStatus, type Steps, type SubscriptionBundleShape, type SubscriptionDraft, SuperAdminBrand, SuperAdminEndpoints, SuperAdminLoginAdapter, type TenantActionFlowProviders, type TenantActionInput, type TenantManifestNavItem, type TenantManifestShape, type TenantRowLike, TenantSubscriptionBundlesApiError, UiNotify, type UsageSnapshotShape, type UseActionsResult, type UseApiListOptions, type UseApiListResult, type UseAsyncActionOptions, type UseAsyncDataOptions, type UseAuditEntriesOptions, type UseAuditEntriesResult, type UseBatchColumnsResult, type UseBulkPublishOptions, type UseBulkPublishResult, type UseBundleVersionsMapOptions, type UseBundleVersionsMapResult, type UseBundleVersionsOptions, type UseBundleVersionsResult, type UseBundlesOptions, type UseBundlesResult, type UseCatalogEntriesOptions, type UseCatalogEntriesResult, type UseDialogOptions, type UseDiscoveryOptions, type UseDiscoveryResult, type UseEntitlementOptions, type UseEntitlementResult, type UseLivePlanVersionsOptions, type UseLivePlanVersionsResult, type UseManifestResult, type UseMarketingProjectionsOptions, type UseMarketingProjectionsResult, type UseNavResult, type UsePaginationResult, type UsePlanEditorOptions, type UsePlanEditorResult, type UsePlanVersionsOptions, type UsePlanVersionsResult, type UsePlansOptions, type UsePlansResult, type UsePromotionsOptions, type UsePromotionsResult, type UsePublicBootResult, type UseResourceListOptions, type UseSignOutOptions, type UseStepsOptions, type UseSubscriptionDraftOptions, type UseTenantActionFlowResult, type UseTenantBillingCatalogOptions, type UseTenantBillingCatalogResult, type UseTenantBillingOptions, type UseTenantBillingResult, type UseTenantManifestOptions, type UseTenantManifestResult, type UseTenantSubscriptionBundlesOptions, type UseTenantSubscriptionBundlesResult, type UseTenantsOptions, type UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants };
+export { ALL_ROWS, ActionsMap, type ApiListResponse, type AppliedSettingsResource, type AppliedSettingsState, type AsyncAction, type AsyncActionResult, type AsyncData, type AsyncList, type BillingCycleStr, type BulkItemKind, type BulkItemStatus, type BulkPublishItem, type BundleAddPreviewShape, type BundleBookingOptions, type BundleCancelPreviewShape, type BundlePreviewIssueShape, type BundlePreviewShape, type BundlePreviewSnapshotShape, BundlesApiError, type CancellationResultShape, type CatalogBundle, CatalogEntriesApiError, type CatalogPlan, type ConfirmDialogState, type CreateAdminRoutesOptions, type CreateManifestStoreOptions, type CreatePlatformLoadersOptions, DEFAULT_LOGIN_PATH, DEFAULT_ROWS_PER_PAGE, type Dialog, DiscoveryLoadError, type DraftPricing, ENTITLEMENT_INJECTION_KEY, type EntitlementSnapshotShape, ExtensionsMap, type FeatureRouterGuardOptions, type FeatureRowMarkers, type ListOpNames, type ListResourceKey, type ManifestStoreActions, type ManifestStoreDefinition, type ManifestStoreState, MarketingProjectionsApiError, type MfaDialogState, type MfaOutcome, type MfaPrompt, PAGE_SIZE_OPTIONS, PLAN_WIZARD_KEY, PROMO_STATUS_TONE, type PackageSnapshotShape, type PillTone, type PlanChangePreviewIssueShape, type PlanChangePreviewShape, type PlanDraftEditing, type PlanDraftForm, type PlanSnapshotShape, type PlanWizardState, PlannedOnlyFeatureError, PlansApiError, type PlatformLoaders, type PlatformTenantActionRow, type PlatformTenantActionTone, type PlatformTenantActionsOptions, type PlatformTenantActionsResult, type PriceLineItem, ProjectPageHost, type PromoState, type PromoStatus, PromotionsApiError, type RedundantFeatureHintShape, type ResolvedBundlePrice, type ResolvedTenantAction, ResourceMap, ResourceOverride, type RowOf, type RowReorder, SERVER_PAGE_SIZE_OPTIONS, type StepStatus, type Steps, type SubscriptionBundleShape, type SubscriptionDraft, SuperAdminBrand, SuperAdminEndpoints, SuperAdminLoginAdapter, type TenantActionFlowProviders, type TenantActionInput, type TenantManifestNavItem, type TenantManifestShape, type TenantRowLike, TenantSubscriptionBundlesApiError, UiNotify, type UsageSnapshotShape, type UseActionsResult, type UseApiListOptions, type UseApiListResult, type UseAsyncActionOptions, type UseAsyncDataOptions, type UseAuditEntriesOptions, type UseAuditEntriesResult, type UseBatchColumnsResult, type UseBulkPublishOptions, type UseBulkPublishResult, type UseBundleVersionsMapOptions, type UseBundleVersionsMapResult, type UseBundleVersionsOptions, type UseBundleVersionsResult, type UseBundlesOptions, type UseBundlesResult, type UseCatalogEntriesOptions, type UseCatalogEntriesResult, type UseDialogOptions, type UseDiscoveryOptions, type UseDiscoveryResult, type UseEntitlementOptions, type UseEntitlementResult, type UseLivePlanVersionsOptions, type UseLivePlanVersionsResult, type UseManifestResult, type UseMarketingProjectionsOptions, type UseMarketingProjectionsResult, type UseNavResult, type UsePaginationResult, type UsePlanEditorOptions, type UsePlanEditorResult, type UsePlanVersionsOptions, type UsePlanVersionsResult, type UsePlansOptions, type UsePlansResult, type UsePromotionsOptions, type UsePromotionsResult, type UsePublicBootResult, type UseResourceListOptions, type UseSignOutOptions, type UseStepsOptions, type UseSubscriptionDraftOptions, type UseTenantActionFlowResult, type UseTenantBillingCatalogOptions, type UseTenantBillingCatalogResult, type UseTenantBillingOptions, type UseTenantBillingResult, type UseTenantManifestOptions, type UseTenantManifestResult, type UseTenantSubscriptionBundlesOptions, type UseTenantSubscriptionBundlesResult, type UseTenantsOptions, type UseTenantsResult, buildFeatureRouterGuard, createAdminRoutes, createManifestStore, createPlatformLoaders, createProjectPageHostRoute, defaultIconForActionKey, defaultToneForActionKey, findLatestLive, promoStatusTone, provideEntitlement, providePlanWizard, resolveSuperAdminEndpoints, useActions, useApiList, useAppliedSettings, useAsyncAction, useAsyncData, useAuditEntries, useBatchColumns, useBulkPublish, useBundleVersions, useBundleVersionsMap, useBundles, useCatalogEntries, useDialog, useDiscovery, useEntitlement, useInjectedEntitlement, useLivePlanVersions, useManifest, useMarketingProjections, useMfaPrompt, useNav, usePagination, usePlanEditor, usePlanVersions, usePlanWizard, usePlans, usePlatformTenantActions, usePromotions, usePublicBoot, useResourceList, useRowReorder, useSignOut, useSteps, useSubscriptionDraft, useSuperAdminActions, useSuperAdminBrand, useSuperAdminEndpoints, useSuperAdminExtensions, useSuperAdminHttp, useSuperAdminLoginAdapter, useSuperAdminManifest, useTenantActionFlow, useTenantBilling, useTenantBillingCatalog, useTenantManifest, useTenantSubscriptionBundles, useTenants };

package/dist/vue/index.js

@@ -4,7 +4,6 @@ import {
   CatalogEntriesApiError,
   DEFAULT_LOGIN_PATH,
   DEFAULT_ROWS_PER_PAGE,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   MarketingProjectionsApiError,
@@ -74,7 +73,7 @@ import {
   useTenantManifest,
   useTenantSubscriptionBundles,
   useTenants
-} from "../chunk-HYFHYL73.js";
+} from "../chunk-ADKRZZDZ.js";
 import "../chunk-MPVQBEM6.js";
 import {
   SA_COLOR_SCHEMES,
@@ -112,7 +111,6 @@ export {
   CatalogEntriesApiError,
   DEFAULT_LOGIN_PATH,
   DEFAULT_ROWS_PER_PAGE,
-  DEFAULT_YEARLY_FACTOR,
   DiscoveryLoadError,
   ENTITLEMENT_INJECTION_KEY,
   MarketingProjectionsApiError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasicat/ui-vue",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.14",
   "description": "Vue 3 components, resource clients and composables for the SuperAdmin UI shell. Provides boot and manifest loaders, navigation, actions and standard pages.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -91,7 +91,7 @@
   ],
   "dependencies": {
     "quasar": "^2.24.0",
-    "@saasicat/core": "^1.0.0-rc.13"
+    "@saasicat/core": "^1.0.0-rc.14"
   },
   "peerDependencies": {
     "pinia": "^2.0.0 || ^3.0.0",
@@ -124,7 +124,7 @@
     "vue": "^3.5.0",
     "vue-router": "^5.0.0",
     "vue-tsc": "^3.3.3",
-    "@saasicat/ui-vue-tenant": "1.0.0-rc.13"
+    "@saasicat/ui-vue-tenant": "1.0.0-rc.14"
   },
   "license": "PolyForm-Shield-1.0.0",
   "author": "Taci Uelker",

package/src/vue/use-subscription-draft.ts

@@ -21,11 +21,6 @@ import {
     type PublicMarketingBundle,
 } from '@saasicat/core';
 
-// For yearly payment, the mockup applies 10x the monthly price (= 2 months free).
-// If the catalog already provides a `yearlyNet`, that one is used;
-// if it is missing, the composable falls back to `monthly * 10`.
-export const DEFAULT_YEARLY_FACTOR = 10;
-
 export type PromoStatus = 'idle' | 'checking' | 'valid' | 'invalid' | 'restricted';
 
 export interface PromoState {
@@ -43,8 +38,6 @@ export interface UseSubscriptionDraftOptions {
     initialPlan?: string | null;
     initialCycle?: BillingCycleStr;
     initialBundleVersionIds?: ReadonlyArray<string>;
-    /** Override for the `yearlyNet` fallback if the catalog provides no yearlyNet. */
-    yearlyFactor?: number;
 }
 
 export interface PriceLineItem {
@@ -59,13 +52,22 @@ export interface PriceLineItem {
 
 export interface DraftPricing {
     cycle: BillingCycleStr;
+    /**
+     * Whether the selected plan carries a price for the cycle. A plan without
+     * one is not sold in it — a plan without a yearly price is a monthly plan —
+     * so `planNet` is 0 and there is nothing to submit.
+     */
+    planPriced: boolean;
     /** Plan base without bundles. */
     planNet: number;
     /** Sum of all selected catalog bundles. */
     bundlesNet: number;
     /** Plan + Bundles. */
     subtotalNet: number;
-    /** Discount derived from the promo preview (on subtotalNet, not plan-only). */
+    /**
+     * The promo preview's discount in net. A code discounts the plan price, not
+     * the bundles, so it never exceeds `planNet`.
+     */
     discountNet: number;
     /** subtotalNet - discountNet. */
     totalNet: number;
@@ -112,21 +114,20 @@ function unwrap<T>(source: Ref<T> | ComputedRef<T> | T): T {
     return source as T;
 }
 
+/**
+ * The price the catalogue carries for the cycle, or `null` when it carries none.
+ *
+ * Never derived from the other cycle: a yearly price is what the operator set
+ * for a year, and the offer and the contract charge that figure or refuse.
+ */
 function priceForCycle(
-    monthlyNet: number,
-    yearlyNet: number | null | undefined,
+    item: { monthlyNet: number | null; yearlyNet: number | null },
     cycle: BillingCycleStr,
-    yearlyFactor: number,
-): number {
-    if (cycle === 'YEARLY') {
-        return yearlyNet != null ? yearlyNet : monthlyNet * yearlyFactor;
-    }
-    return monthlyNet;
+): number | null {
+    return cycle === 'YEARLY' ? item.yearlyNet : item.monthlyNet;
 }
 
 export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): SubscriptionDraft {
-    const yearlyFactor = options.yearlyFactor ?? DEFAULT_YEARLY_FACTOR;
-
     const plansRef = computed<CatalogPlan[]>(() => unwrap(options.plans) ?? []);
     const subscriptionBundlesRef = computed<PublicMarketingBundle[]>(
         () => unwrap(options.subscriptionBundles ?? null) ?? [],
@@ -145,9 +146,14 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
         return plansRef.value.find((p) => p.id === plan.value) ?? null;
     });
 
+    // A selected bundle without a price for the cycle is not sold in it, so it
+    // is neither charged nor sent, and covers nothing. It stays selected, so
+    // switching back to the cycle it is priced for books it again.
     const selectedBundles = computed<PublicMarketingBundle[]>(() =>
-        subscriptionBundlesRef.value.filter((b) =>
-            selectedBundleVersionIds.value.has(b.bundleVersionId),
+        subscriptionBundlesRef.value.filter(
+            (b) =>
+                selectedBundleVersionIds.value.has(b.bundleVersionId) &&
+                priceForCycle(b, cycle.value) !== null,
         ),
     );
 
@@ -184,17 +190,15 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
         const cyc = cycle.value;
         const planObj = selectedPlan.value;
 
-        // Plan
-        const planNet = planObj
-            ? priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, cyc, yearlyFactor)
-            : 0;
+        const planPrice = planObj ? priceForCycle(planObj, cyc) : null;
+        const planNet = planPrice ?? 0;
 
         // Independently bookable catalog bundles from the public marketing catalog.
         // Redundant (fully covered) bundles are excluded here.
         const bundleItems: PriceLineItem[] = [];
         let bundlesNet = 0;
         for (const b of chargeableBundles.value) {
-            const net = priceForCycle(b.monthlyNet ?? 0, b.yearlyNet, cyc, yearlyFactor);
+            const net = priceForCycle(b, cyc) ?? 0;
             bundlesNet += net;
             bundleItems.push({
                 key: `subscription-bundle:${b.bundleVersionId}`,
@@ -205,43 +209,32 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
 
         const subtotalNet = planNet + bundlesNet;
 
-        // Derive discount from the promo preview (PERCENT logic is mirrored on the
-        // frontend; ABSOLUTE is deducted absolutely). The backend recomputes the
-        // final truth at redeem time — the sidebar shows only the preview value.
+        // The discount is the one the server previewed. The promo module reckons
+        // it on the plan price in gross, and only the server knows the VAT rate
+        // that turns it into the net figure this summary adds up. A preview
+        // answers for one plan and cycle, which is why changing either sets the
+        // promo state back to idle for the caller to ask again.
         let discountNet = 0;
         const preview = promoState.value.preview;
         if (preview && preview.valid && promoState.value.status === 'valid') {
-            const valid = preview as PromoPreviewValidResponse;
-            const value = Number(valid.discount.value);
-            if (Number.isFinite(value) && value > 0) {
-                if (valid.discount.valueType === 'PERCENT') {
-                    discountNet = (subtotalNet * value) / 100;
-                } else {
-                    discountNet = Math.min(value, subtotalNet);
-                }
+            const amount = Number((preview as PromoPreviewValidResponse).price.discountNet);
+            if (Number.isFinite(amount) && amount > 0) {
+                discountNet = Math.min(amount, planNet);
             }
         }
 
         const totalNet = Math.max(0, subtotalNet - discountNet);
 
-        // yearSavings: 12 × monthly — yearly. Only meaningful when the catalog
+        // yearSavings: 12 × monthly − yearly. Only meaningful when the catalog
         // knows both prices; otherwise 0.
         let yearSavings = 0;
-        if (planObj) {
-            const monthlyTotal =
-                priceForCycle(planObj.monthlyNet ?? 0, planObj.yearlyNet, 'MONTHLY', yearlyFactor) *
-                12;
-            const yearlyTotal = priceForCycle(
-                planObj.monthlyNet ?? 0,
-                planObj.yearlyNet,
-                'YEARLY',
-                yearlyFactor,
-            );
-            yearSavings = Math.max(0, monthlyTotal - yearlyTotal);
+        if (planObj && planObj.monthlyNet !== null && planObj.yearlyNet !== null) {
+            yearSavings = Math.max(0, planObj.monthlyNet * 12 - planObj.yearlyNet);
         }
 
         return {
             cycle: cyc,
+            planPriced: planPrice !== null,
             planNet,
             bundlesNet,
             subtotalNet,
@@ -249,14 +242,17 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
             totalNet,
             yearSavings,
             breakdown: {
-                plan: planObj
-                    ? {
-                          key: `plan:${planObj.id}`,
-                          label: planObj.name,
-                          net: planNet,
-                          sublabel: `${planObj.features.length} Basis-Module`,
-                      }
-                    : null,
+                // A plan not sold in the cycle has no line: 0.00 beside its name
+                // would read as a price.
+                plan:
+                    planObj && planPrice !== null
+                        ? {
+                              key: `plan:${planObj.id}`,
+                              label: planObj.name,
+                              net: planNet,
+                              sublabel: `${planObj.features.length} Basis-Module`,
+                          }
+                        : null,
                 bundles: bundleItems,
             },
         };
@@ -266,9 +262,17 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
         return selectedBundleVersionIds.value.size > 0 || promoState.value.status === 'valid';
     });
 
+    // A promo preview answers for the plan and cycle it was asked about.
+    function forgetPromoPreview(): void {
+        if (promoState.value.status !== 'idle') {
+            promoState.value = { status: 'idle', preview: null, message: '' };
+        }
+    }
+
     function setPlan(planId: string): void {
         if (plan.value === planId) return;
         plan.value = planId;
+        forgetPromoPreview();
         // Reduce the bundle selection to those compatible with the new plan.
         const compatibleBundleVersions = new Set<string>();
         for (const bundle of subscriptionBundlesRef.value) {
@@ -285,8 +289,9 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
     }
 
     function setCycle(c: BillingCycleStr): void {
+        if (cycle.value === c) return;
         cycle.value = c;
-        // Promo restrictions may change — the caller re-runs preview if needed.
+        forgetPromoPreview();
     }
 
     function toggleSubscriptionBundle(bundleVersionId: string): void {
@@ -299,9 +304,7 @@ export function useSubscriptionDraft(options: UseSubscriptionDraftOptions): Subs
     function setPromoCode(code: string): void {
         promoCode.value = code.toUpperCase();
         // Reset status — the caller re-validates via preview().
-        if (promoState.value.status !== 'idle') {
-            promoState.value = { status: 'idle', preview: null, message: '' };
-        }
+        forgetPromoPreview();
     }
 
     function setPromoState(state: PromoState): void {