@antelopejs/dms-saas 0.7.4 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/auth/owner-only-permissions-resolver.js +3 -2
- package/dist/auth/owner-only-permissions-resolver.js.map +1 -1
- package/dist/auth/plan-permissions-resolver.js +6 -3
- package/dist/auth/plan-permissions-resolver.js.map +1 -1
- package/dist/billing-state/directory.d.ts +2 -0
- package/dist/billing-state/directory.js +48 -3
- package/dist/billing-state/directory.js.map +1 -1
- package/dist/billing-state/past-due-banner.js +2 -0
- package/dist/billing-state/past-due-banner.js.map +1 -1
- package/dist/billing-state/recovery.js +4 -0
- package/dist/billing-state/recovery.js.map +1 -1
- package/dist/billing-state/trial-ending-banner.js +1 -0
- package/dist/billing-state/trial-ending-banner.js.map +1 -1
- package/dist/config/runtime.d.ts +2 -2
- package/dist/config/runtime.js +12 -4
- package/dist/config/runtime.js.map +1 -1
- package/dist/data-api/platformOwner/plans.d.ts +2 -0
- package/dist/data-api/platformOwner/plans.js +16 -0
- package/dist/data-api/platformOwner/plans.js.map +1 -1
- package/dist/frontend-module.d.ts +3 -0
- package/dist/frontend-module.js +29 -0
- package/dist/frontend-module.js.map +1 -0
- package/dist/implementations/dms-saas/billing.d.ts +2 -1
- package/dist/implementations/dms-saas/billing.js +15 -0
- package/dist/implementations/dms-saas/billing.js.map +1 -1
- package/dist/implementations/dms-saas/invoice-line-items.d.ts +2 -2
- package/dist/implementations/dms-saas/invoice-line-items.js +6 -6
- package/dist/implementations/dms-saas/invoice-line-items.js.map +1 -1
- package/dist/index.js +2 -19
- package/dist/index.js.map +1 -1
- package/dist/invoice-line-items/billing-window.d.ts +6 -2
- package/dist/invoice-line-items/billing-window.js.map +1 -1
- package/dist/invoice-line-items/recovery/admission.js +2 -5
- package/dist/invoice-line-items/recovery/admission.js.map +1 -1
- package/dist/invoice-line-items/recovery/process.d.ts +1 -0
- package/dist/invoice-line-items/recovery/process.js +119 -47
- package/dist/invoice-line-items/recovery/process.js.map +1 -1
- package/dist/invoice-line-items/recovery/task.model.js +1 -1
- package/dist/invoice-line-items/recovery/task.model.js.map +1 -1
- package/dist/invoice-line-items/recovery/task.table.d.ts +2 -2
- package/dist/invoice-line-items/recovery/task.table.js +3 -4
- package/dist/invoice-line-items/recovery/task.table.js.map +1 -1
- package/dist/metrics/revenue.d.ts +15 -3
- package/dist/metrics/revenue.js +58 -12
- package/dist/metrics/revenue.js.map +1 -1
- package/dist/operator-actions/previews.d.ts +1 -1
- package/dist/operator-actions/previews.js +13 -6
- package/dist/operator-actions/previews.js.map +1 -1
- package/dist/pages/platform/dashboard.d.ts +1 -1
- package/dist/pages/platform/dashboard.js +13 -10
- package/dist/pages/platform/dashboard.js.map +1 -1
- package/dist/pages/platform/plans/edit.js +4 -0
- package/dist/pages/platform/plans/edit.js.map +1 -1
- package/dist/pages/platform/plans/index.js +4 -0
- package/dist/pages/platform/plans/index.js.map +1 -1
- package/dist/pages/platform/plans/migrations.d.ts +1 -0
- package/dist/pages/platform/plans/migrations.js +3 -0
- package/dist/pages/platform/plans/migrations.js.map +1 -1
- package/dist/pages/platform/segments/edit.js +1 -0
- package/dist/pages/platform/segments/edit.js.map +1 -1
- package/dist/pages/platform/workspaces/index.js +1 -4
- package/dist/pages/platform/workspaces/index.js.map +1 -1
- package/dist/pages/tenant/billing.js +1 -2
- package/dist/pages/tenant/billing.js.map +1 -1
- package/dist/plans/catalogue-summary.d.ts +1 -0
- package/dist/plans/catalogue-summary.js +10 -4
- package/dist/plans/catalogue-summary.js.map +1 -1
- package/dist/plans/catalogue-usage.js +4 -2
- package/dist/plans/catalogue-usage.js.map +1 -1
- package/dist/plans/plan-audience.d.ts +1 -0
- package/dist/plans/plan-audience.js +4 -0
- package/dist/plans/plan-audience.js.map +1 -1
- package/dist/plans/plan-write.d.ts +9 -3
- package/dist/plans/plan-write.js +27 -1
- package/dist/plans/plan-write.js.map +1 -1
- package/dist/plans/seat-hooks.js +25 -16
- package/dist/plans/seat-hooks.js.map +1 -1
- package/dist/plans/stripe-sync.js +11 -3
- package/dist/plans/stripe-sync.js.map +1 -1
- package/dist/routes/platformOwner/credit-notes-issue.js +18 -12
- package/dist/routes/platformOwner/credit-notes-issue.js.map +1 -1
- package/dist/routes/platformOwner/dashboard.d.ts +4 -8
- package/dist/routes/platformOwner/dashboard.js +9 -28
- package/dist/routes/platformOwner/dashboard.js.map +1 -1
- package/dist/routes/platformOwner/plan-dialogs.js +2 -1
- package/dist/routes/platformOwner/plan-dialogs.js.map +1 -1
- package/dist/routes/platformOwner/plans.d.ts +5 -26
- package/dist/routes/platformOwner/plans.js +48 -18
- package/dist/routes/platformOwner/plans.js.map +1 -1
- package/dist/routes/platformOwner/workspace-detail.js +4 -2
- package/dist/routes/platformOwner/workspace-detail.js.map +1 -1
- package/dist/routes/platformOwner/workspace-operator-actions.js +6 -1
- package/dist/routes/platformOwner/workspace-operator-actions.js.map +1 -1
- package/dist/routes/platformOwner/workspaces-admin.d.ts +1 -1
- package/dist/routes/platformOwner/workspaces-admin.js +15 -7
- package/dist/routes/platformOwner/workspaces-admin.js.map +1 -1
- package/dist/routes/public/public-plan-catalog.js +3 -2
- package/dist/routes/public/public-plan-catalog.js.map +1 -1
- package/dist/routes/public/register.js +6 -5
- package/dist/routes/public/register.js.map +1 -1
- package/dist/routes/tenant/billing-portal.js +1 -1
- package/dist/routes/tenant/billing-portal.js.map +1 -1
- package/dist/routes/tenant/tenant-plan-checkout.js +4 -4
- package/dist/routes/tenant/tenant-plan-checkout.js.map +1 -1
- package/dist/routes/tenant/tenant-plan-resubscription.js +2 -1
- package/dist/routes/tenant/tenant-plan-resubscription.js.map +1 -1
- package/dist/routes/tenant/tenant-plan.d.ts +0 -1
- package/dist/routes/tenant/tenant-plan.js +20 -20
- package/dist/routes/tenant/tenant-plan.js.map +1 -1
- package/dist/routes/tenant/workspaces.d.ts +1 -1
- package/dist/routes/tenant/workspaces.js +13 -8
- package/dist/routes/tenant/workspaces.js.map +1 -1
- package/dist/stripe/availability.d.ts +5 -0
- package/dist/stripe/availability.js +43 -0
- package/dist/stripe/availability.js.map +1 -0
- package/dist/stripe/customer-billing.js +2 -0
- package/dist/stripe/customer-billing.js.map +1 -1
- package/dist/stripe/customer-locale.d.ts +3 -0
- package/dist/stripe/customer-locale.js +11 -0
- package/dist/stripe/customer-locale.js.map +1 -1
- package/dist/stripe/index.d.ts +1 -0
- package/dist/stripe/index.js +1 -0
- package/dist/stripe/index.js.map +1 -1
- package/dist/stripe/payload-shapes.d.ts +6 -0
- package/dist/stripe/payload-shapes.js +13 -0
- package/dist/stripe/payload-shapes.js.map +1 -1
- package/dist/stripe/subscription-cancellation.js +2 -0
- package/dist/stripe/subscription-cancellation.js.map +1 -1
- package/dist/stripe/sync-plan.js +8 -7
- package/dist/stripe/sync-plan.js.map +1 -1
- package/dist/stripe/webhook-checkout.js +1 -1
- package/dist/stripe/webhook-checkout.js.map +1 -1
- package/dist/stripe/webhook-handlers.js +5 -3
- package/dist/stripe/webhook-handlers.js.map +1 -1
- package/dist/utils/segment-matching.d.ts +4 -3
- package/dist/utils/segment-matching.js +29 -13
- package/dist/utils/segment-matching.js.map +1 -1
- package/dist/workspaces/provisioning.d.ts +0 -1
- package/dist/workspaces/provisioning.js +3 -6
- package/dist/workspaces/provisioning.js.map +1 -1
- package/dist/workspaces/self-serve-creation.d.ts +2 -2
- package/dist/workspaces/self-serve-creation.js +12 -6
- package/dist/workspaces/self-serve-creation.js.map +1 -1
- package/frontend-vue/app/build/period-range.ts +57 -0
- package/frontend-vue/app/build/plan-catalog.ts +2 -0
- package/frontend-vue/app/build/public/RegistrationPlanCard.vue +1 -2
- package/frontend-vue/app/components/BillingIdentityFields.vue +64 -76
- package/frontend-vue/app/components/PlanCard.vue +14 -2
- package/frontend-vue/app/components/PlanCardPublic.vue +1 -2
- package/frontend-vue/app/components/PlanEditorPreview.vue +26 -12
- package/frontend-vue/app/components/PlanUpgradeModal.vue +45 -3
- package/frontend-vue/app/components/TenantBillingForm.vue +2 -0
- package/frontend-vue/app/components/TenantPlanCard.vue +1 -2
- package/frontend-vue/app/components/WorkspaceCreateModal.vue +1 -2
- package/frontend-vue/app/composables/useBillingAddress.ts +108 -0
- package/frontend-vue/app/composables/useBillingCountries.ts +3 -69
- package/frontend-vue/app/composables/useBillingIdentity.ts +7 -5
- package/frontend-vue/app/composables/usePlanChangeReview.ts +21 -0
- package/frontend-vue/app/plugins/billing-data-types.ts +6 -13
- package/frontend-vue/i18n/locales/saas-en-GB.json +4 -0
- package/frontend-vue/i18n/locales/saas-fr-FR.json +4 -0
- package/frontend-vue/i18n/locales/saas-operator-catalog-en-GB.json +9 -2
- package/frontend-vue/i18n/locales/saas-operator-catalog-fr-FR.json +9 -2
- package/frontend-vue/i18n/locales/saas-operator-workspaces-en-GB.json +7 -2
- package/frontend-vue/i18n/locales/saas-operator-workspaces-fr-FR.json +7 -2
- package/frontend-vue/i18n/locales/saas-tenant-billing-en-GB.json +5 -7
- package/frontend-vue/i18n/locales/saas-tenant-billing-fr-FR.json +5 -7
- package/frontend-vue/package.json +1 -1
- package/package.json +7 -6
- package/skills/dms-saas/SKILL.md +22 -2
- package/frontend-vue/app/composables/usePlanDescription.ts +0 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-serve-creation.js","sourceRoot":"","sources":["../../src/workspaces/self-serve-creation.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"self-serve-creation.js","sourceRoot":"","sources":["../../src/workspaces/self-serve-creation.ts"],"names":[],"mappings":";;AAuFA,8CASC;AA6ED,kEAqBC;AA4DD,0DAIC;AAlQD,uEAAwD;AACxD,uEAAgE;AAChE,6FAAqE;AACrE,qDAA8E;AAE9E,8BAOe;AACf,6CAAsD;AACtD,oCAAqC;AACrC,uDAAyE;AACzE,2CAAyC;AACzC,yEAIoC;AAMpC,0DAAyD;AACzD,gEAAoE;AAEpE,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,SAAS,oBAAoB,CAC3B,OAA0C;IAE1C,IAAA,2BAAM,EACJ,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAChB,sCAAsC,CACvC,CAAC;AACJ,CAAC;AACD,MAAM,gBAAgB,GAAG,WAAW,CAAC;AACrC,MAAM,OAAO,GAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;AA4C9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,qBAA6B;IAE7B,IAAI,CAAC,IAAA,sBAAU,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,IAAA,2BAAkB,GAAE;QACzB,IAAA,oDAAyB,EAAC,qBAAqB,CAAC;QAChD,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,MAAM,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CACnB,UAAgB,EAChB,qBAA6B,EAC7B,YAAqB,EACrB,MAAc;IAEd,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC9C,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;QACxD,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,eAAe,EAAE,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,CAAC;KAChE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,MAAc;IAC9C,MAAM,WAAW,GAAG,MAAM,IAAA,wCAAQ,EAChC,sBAAiB,EACjB,mCAAc,CACf,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,WAAW;SACf,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC;SACvD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,QAAgB;IACvD,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAQ,EACjC,4BAAuB,EACvB,QAAQ,CACT,CAAC,OAAO,EAAE,CAAC;IACZ,IAAI,CAAC,YAAY,EAAE,eAAe,IAAI,CAAC,YAAY,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,YAAY,CAAC,MAAM,KAAK,gBAAgB;QAAE,OAAO,KAAK,CAAC;IAC3D,IAAI,YAAY,CAAC,eAAe;QAAE,OAAO,KAAK,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAChE,OAAO,CAAC,CAAC,IAAI,IAAI,IAAA,sBAAU,EAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAOD,KAAK,UAAU,gCAAgC,CAC7C,MAAc;IAEd,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,MAAM,IAAA,wCAAQ,EAAC,gBAAW,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,MAAc,EACd,KAAa;IAEb,IAAI,CAAC,IAAA,oDAAyB,EAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC,MAAM,CAAC,EAAE,CAAC;AAC3E,CAAC;AAWM,KAAK,UAAU,2BAA2B,CAC/C,IAAU,EACV,MAAc,EACd,iBAA0B;IAE1B,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9D,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,mBAAmB,EAAE;QACzC,IAAA,sDAAoC,EAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,iBAAiB,CAAC;QAC1E,IAAA,uDAA4B,GAAE;QAC9B,IAAA,wCAAQ,EAAC,0BAAqB,CAAC,CAAC,iBAAiB,CAC/C,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,EACrB,IAAI,CACL;KACF,CAAC,CAAC;IACH,OAAO;QACL,KAAK,EAAE,KAAK;aACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,+BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QACjE,WAAW,EAAE,MAAM,sBAAsB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC;KAC3D,CAAC;AACJ,CAAC;AAqBD,SAAS,cAAc,CAAC,KAAgC;IACtD,IAAA,2BAAM,EACJ,KAAK,EACL,gBAAgB,EAChB,+CAA+C,CAChD,CAAC;AACJ,CAAC;AAED,MAAM,SAAS,GAGX;IACF,OAAO,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE;QAC3D,cAAc,CAAC,eAAe,CAAC,CAAC;QAChC,oBAAoB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;IACD,YAAY,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,EAAE;QACvE,cAAc,CAAC,eAAe,CAAC,CAAC;QAChC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,MAAM,IAAA,yDAA8B,EAClC,IAAI,CAAC,WAAqB,EAC1B,qBAAqB,CACtB,CAAC;QACF,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC9C,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;CAClE,CAAC;AAYF,SAAgB,uBAAuB,CACrC,KAAyB;IAEzB,OAAO,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/** Builds the `Intl.DateTimeFormat` a period is written with. */
|
|
2
|
+
export type DateFormatFactory = (
|
|
3
|
+
locale: string,
|
|
4
|
+
options: Intl.DateTimeFormatOptions,
|
|
5
|
+
) => Intl.DateTimeFormat
|
|
6
|
+
|
|
7
|
+
const RANGE_FORMAT: Intl.DateTimeFormatOptions = {
|
|
8
|
+
day: 'numeric',
|
|
9
|
+
month: 'short',
|
|
10
|
+
}
|
|
11
|
+
const RANGE_FORMAT_WITH_YEAR: Intl.DateTimeFormatOptions = {
|
|
12
|
+
...RANGE_FORMAT,
|
|
13
|
+
year: 'numeric',
|
|
14
|
+
}
|
|
15
|
+
const YEAR_FORMAT: Intl.DateTimeFormatOptions = { year: 'numeric' }
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Thin and narrow no-break spaces. Recent ICU data (Node 24) puts thin spaces
|
|
19
|
+
* around a range's dash ("15 oct. – 15 nov.") where a browser's
|
|
20
|
+
* older data puts plain ones, so a server-rendered period would not hydrate.
|
|
21
|
+
*/
|
|
22
|
+
const ICU_SPACES = /[ ]/g
|
|
23
|
+
|
|
24
|
+
const intlFormat: DateFormatFactory = (locale, options) =>
|
|
25
|
+
new Intl.DateTimeFormat(locale, options)
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* "Sep 29 – Oct 28", with the years once the period spans two; a lone start
|
|
29
|
+
* when the end is unknown. Written the same by every ICU version, so a server
|
|
30
|
+
* render and the browser agree.
|
|
31
|
+
*
|
|
32
|
+
* @param createFormat Builds the formatters; the console passes the one that
|
|
33
|
+
* applies the reader's time zone, so the year test runs in that zone too
|
|
34
|
+
*/
|
|
35
|
+
export function formatPeriodRange(
|
|
36
|
+
from: Date,
|
|
37
|
+
to: Date | null,
|
|
38
|
+
locale: string,
|
|
39
|
+
createFormat: DateFormatFactory = intlFormat,
|
|
40
|
+
): string {
|
|
41
|
+
const text = to
|
|
42
|
+
? formatRange(from, to, locale, createFormat)
|
|
43
|
+
: createFormat(locale, RANGE_FORMAT).format(from)
|
|
44
|
+
return text.replace(ICU_SPACES, ' ')
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function formatRange(
|
|
48
|
+
from: Date,
|
|
49
|
+
to: Date,
|
|
50
|
+
locale: string,
|
|
51
|
+
createFormat: DateFormatFactory,
|
|
52
|
+
): string {
|
|
53
|
+
const year = createFormat(locale, YEAR_FORMAT)
|
|
54
|
+
const isSameYear = year.format(from) === year.format(to)
|
|
55
|
+
const format = isSameYear ? RANGE_FORMAT : RANGE_FORMAT_WITH_YEAR
|
|
56
|
+
return createFormat(locale, format).formatRange(from, to)
|
|
57
|
+
}
|
|
@@ -27,6 +27,8 @@ export interface CatalogPlanRow {
|
|
|
27
27
|
resolvedFeatures: CatalogFeatureValue[]
|
|
28
28
|
stripeProductId: string | null
|
|
29
29
|
stripeProductUrl: string | null
|
|
30
|
+
/** Priced, but holding no Stripe price: it cannot be subscribed to. */
|
|
31
|
+
isMissingStripePrice: boolean
|
|
30
32
|
updatedAt: string | null
|
|
31
33
|
}
|
|
32
34
|
|
|
@@ -33,7 +33,6 @@ const MAX_HIGHLIGHTS = 4
|
|
|
33
33
|
const { priceLabel } = usePublicPlanFormat()
|
|
34
34
|
const { formatFeatureValue } = usePlanFeatureFormat()
|
|
35
35
|
const { processI18n } = useTranslation()
|
|
36
|
-
const planDescription = usePlanDescription()
|
|
37
36
|
|
|
38
37
|
const highlights = computed(() => {
|
|
39
38
|
const summary = props.summary
|
|
@@ -89,7 +88,7 @@ const highlights = computed(() => {
|
|
|
89
88
|
v-if="isDetailed && summary.plan.description"
|
|
90
89
|
class="text-muted text-xs"
|
|
91
90
|
>
|
|
92
|
-
{{
|
|
91
|
+
{{ summary.plan.description }}
|
|
93
92
|
</p>
|
|
94
93
|
<ul
|
|
95
94
|
v-if="highlights.length"
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
type FunctionalComponent,
|
|
4
|
+
computed,
|
|
5
|
+
ref,
|
|
6
|
+
resolveComponent,
|
|
7
|
+
watch,
|
|
8
|
+
} from 'vue'
|
|
3
9
|
import FormFieldRow from '../build/components/FormFieldRow.vue'
|
|
4
10
|
import FormRows from '../build/components/FormRows.vue'
|
|
5
11
|
|
|
6
|
-
type AddressField = Extract<
|
|
7
|
-
BillingIdentityField,
|
|
8
|
-
'line1' | 'postalCode' | 'city'
|
|
9
|
-
>
|
|
10
|
-
|
|
11
|
-
interface AddressFieldRow {
|
|
12
|
-
id: AddressField
|
|
13
|
-
/** Key of the label, under the billing info texts. */
|
|
14
|
-
label: string
|
|
15
|
-
autocomplete: string
|
|
16
|
-
}
|
|
17
|
-
|
|
18
12
|
/** The props of a group: a titled row of the card, or a stretch of rows. */
|
|
19
13
|
interface GroupBindings {
|
|
20
14
|
label?: string
|
|
@@ -55,25 +49,23 @@ const VAT_BADGE_TONES: Record<VatVerificationStatus, VatBadgeTone> = {
|
|
|
55
49
|
unverified: 'warning',
|
|
56
50
|
}
|
|
57
51
|
const KEY_PREFIX = 'saas.tenant_billing.billing_info'
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
{ id: 'postalCode', label: 'postal_code', autocomplete: 'postal-code' },
|
|
65
|
-
{ id: 'city', label: 'city', autocomplete: 'address-level2' },
|
|
52
|
+
/** The required fields the address input holds, in its order. */
|
|
53
|
+
const ADDRESS_FIELDS: BillingIdentityField[] = [
|
|
54
|
+
'line1',
|
|
55
|
+
'postalCode',
|
|
56
|
+
'city',
|
|
57
|
+
'country',
|
|
66
58
|
]
|
|
59
|
+
/** The DMS address input's street search (its default geocoder). */
|
|
60
|
+
const ADDRESS_AUTOCOMPLETE = { enabled: true }
|
|
67
61
|
// Compact, the groups follow each other as one list of rows: a hairline
|
|
68
62
|
// above each group but the first, as between its rows.
|
|
69
63
|
const COMPACT_GROUP_CLASS = 'border-muted border-t first:border-t-0'
|
|
70
64
|
|
|
71
65
|
// Side by side once the row has room, as the settings design pairs fields
|
|
72
|
-
// (company name and VAT number
|
|
66
|
+
// (company name and VAT number).
|
|
73
67
|
const CLUSTER_CLASS = '@container'
|
|
74
68
|
const PAIR_GRID_CLASS = 'grid gap-3 @min-[420px]:grid-cols-2'
|
|
75
|
-
const TRIPLE_GRID_CLASS =
|
|
76
|
-
'grid gap-3 @min-[420px]:grid-cols-[minmax(0,1fr)_minmax(0,1.4fr)_minmax(0,1.4fr)]'
|
|
77
69
|
|
|
78
70
|
// Literal, so the build resolves the DMS field row at compile time.
|
|
79
71
|
const DmsFieldRowComponent = resolveComponent('DmsFieldRow')
|
|
@@ -90,22 +82,55 @@ const clusterWrapper = computed(() =>
|
|
|
90
82
|
props.sectioned ? 'div' : SlotPassthrough,
|
|
91
83
|
)
|
|
92
84
|
|
|
93
|
-
const {
|
|
94
|
-
const { t } = useI18n()
|
|
85
|
+
const { t, locale } = useI18n()
|
|
95
86
|
|
|
96
87
|
const isBusiness = computed(() => draft.value.customerType === 'business')
|
|
97
|
-
const countryLabel = computed(
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
88
|
+
const countryLabel = computed(() =>
|
|
89
|
+
draft.value.country
|
|
90
|
+
? formatBillingCountry(draft.value.country, locale.value)
|
|
91
|
+
: '',
|
|
101
92
|
)
|
|
102
93
|
|
|
94
|
+
// The address input edits its own value, the street split in parts; the
|
|
95
|
+
// draft keeps the stored street line. Its value is read back from the draft
|
|
96
|
+
// only when the draft changed from elsewhere (loaded, discarded): re-split
|
|
97
|
+
// as the user types, a number typed in the street box would jump to the
|
|
98
|
+
// number box under the cursor.
|
|
99
|
+
const address = ref<AddressInputValue>(toAddressInputValue(draft.value))
|
|
100
|
+
|
|
101
|
+
function hasDraftAddress(next: BillingAddressDraft): boolean {
|
|
102
|
+
return (Object.keys(next) as (keyof BillingAddressDraft)[]).every(
|
|
103
|
+
(field) => next[field] === draft.value[field],
|
|
104
|
+
)
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function updateAddress(value: AddressInputValue | null | undefined): void {
|
|
108
|
+
if (!value) return
|
|
109
|
+
address.value = value
|
|
110
|
+
draft.value = {
|
|
111
|
+
...draft.value,
|
|
112
|
+
...fromAddressInputValue(value, draft.value),
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
watch(draft, () => {
|
|
117
|
+
if (hasDraftAddress(fromAddressInputValue(address.value, draft.value)))
|
|
118
|
+
return
|
|
119
|
+
address.value = toAddressInputValue(draft.value)
|
|
120
|
+
})
|
|
121
|
+
|
|
103
122
|
function fieldError(field: BillingIdentityField): string | undefined {
|
|
104
123
|
return props.invalidFields?.includes(field)
|
|
105
124
|
? t(`${KEY_PREFIX}.errors.${field}`)
|
|
106
125
|
: undefined
|
|
107
126
|
}
|
|
108
127
|
|
|
128
|
+
/** Every missing part of the address, one message each. */
|
|
129
|
+
const addressError = computed(() => {
|
|
130
|
+
const messages = ADDRESS_FIELDS.map(fieldError).filter(Boolean)
|
|
131
|
+
return messages.length > 0 ? messages.join(' ') : undefined
|
|
132
|
+
})
|
|
133
|
+
|
|
109
134
|
function selectCustomerType(customerType: CustomerType): void {
|
|
110
135
|
if (props.isLocked) return
|
|
111
136
|
draft.value = { ...draft.value, customerType }
|
|
@@ -228,61 +253,24 @@ function cluster(className: string): ClusterBindings {
|
|
|
228
253
|
|
|
229
254
|
<component :is="groupWrapper" v-bind="group('address')">
|
|
230
255
|
<FormFieldRow
|
|
231
|
-
:label="$t(`${KEY_PREFIX}
|
|
232
|
-
:
|
|
256
|
+
:label="sectioned ? undefined : $t(`${KEY_PREFIX}.sections.address.title`)"
|
|
257
|
+
:description="
|
|
258
|
+
sectioned ? undefined : $t(`${KEY_PREFIX}.sections.address.description`)
|
|
259
|
+
"
|
|
260
|
+
:error="addressError"
|
|
233
261
|
:stacked="sectioned"
|
|
234
262
|
required
|
|
235
263
|
>
|
|
236
264
|
<template #default="{ id }">
|
|
237
|
-
<
|
|
265
|
+
<DmsInputAddress
|
|
238
266
|
:id="id"
|
|
239
|
-
|
|
240
|
-
:autocomplete="
|
|
267
|
+
:model-value="address"
|
|
268
|
+
:autocomplete="ADDRESS_AUTOCOMPLETE"
|
|
241
269
|
:disabled="isLocked"
|
|
242
|
-
|
|
270
|
+
@update:model-value="updateAddress"
|
|
243
271
|
/>
|
|
244
272
|
</template>
|
|
245
273
|
</FormFieldRow>
|
|
246
|
-
<component :is="clusterWrapper" v-bind="cluster(CLUSTER_CLASS)">
|
|
247
|
-
<component :is="clusterWrapper" v-bind="cluster(TRIPLE_GRID_CLASS)">
|
|
248
|
-
<FormFieldRow
|
|
249
|
-
v-for="field in LOCALITY_FIELDS"
|
|
250
|
-
:key="field.id"
|
|
251
|
-
:label="$t(`${KEY_PREFIX}.${field.label}`)"
|
|
252
|
-
:error="fieldError(field.id)"
|
|
253
|
-
:stacked="sectioned"
|
|
254
|
-
required
|
|
255
|
-
>
|
|
256
|
-
<template #default="{ id }">
|
|
257
|
-
<DmsInputText
|
|
258
|
-
:id="id"
|
|
259
|
-
v-model="draft[field.id]"
|
|
260
|
-
:autocomplete="field.autocomplete"
|
|
261
|
-
:disabled="isLocked"
|
|
262
|
-
class="w-full"
|
|
263
|
-
/>
|
|
264
|
-
</template>
|
|
265
|
-
</FormFieldRow>
|
|
266
|
-
<FormFieldRow
|
|
267
|
-
:label="$t(`${KEY_PREFIX}.country`)"
|
|
268
|
-
:error="fieldError('country')"
|
|
269
|
-
:stacked="sectioned"
|
|
270
|
-
required
|
|
271
|
-
>
|
|
272
|
-
<template #default="{ id }">
|
|
273
|
-
<USelectMenu
|
|
274
|
-
:id="id"
|
|
275
|
-
v-model="draft.country"
|
|
276
|
-
:items="countryItems"
|
|
277
|
-
value-key="value"
|
|
278
|
-
:disabled="isLocked"
|
|
279
|
-
:placeholder="$t(`${KEY_PREFIX}.country_placeholder`)"
|
|
280
|
-
class="w-full"
|
|
281
|
-
/>
|
|
282
|
-
</template>
|
|
283
|
-
</FormFieldRow>
|
|
284
|
-
</component>
|
|
285
|
-
</component>
|
|
286
274
|
</component>
|
|
287
275
|
|
|
288
276
|
<component :is="groupWrapper" v-bind="group('email')">
|
|
@@ -42,7 +42,6 @@ const props = withDefaults(
|
|
|
42
42
|
|
|
43
43
|
const { t, locale } = useI18n()
|
|
44
44
|
const { processI18n } = useTranslation()
|
|
45
|
-
const planDescription = usePlanDescription()
|
|
46
45
|
const { formatFeatureValue } = usePlanFeatureFormat()
|
|
47
46
|
const catalog = usePlanCatalog()
|
|
48
47
|
|
|
@@ -263,6 +262,19 @@ function toggleSale(): void {
|
|
|
263
262
|
>
|
|
264
263
|
{{ plan.borderLabel }}
|
|
265
264
|
</UBadge>
|
|
265
|
+
<UTooltip
|
|
266
|
+
v-if="plan.isMissingStripePrice"
|
|
267
|
+
:text="$t('saas.catalog.plans.card.not_on_stripe_hint')"
|
|
268
|
+
>
|
|
269
|
+
<UBadge
|
|
270
|
+
size="sm"
|
|
271
|
+
variant="soft"
|
|
272
|
+
color="warning"
|
|
273
|
+
icon="i-ph-warning"
|
|
274
|
+
>
|
|
275
|
+
{{ $t('saas.catalog.plans.card.not_on_stripe') }}
|
|
276
|
+
</UBadge>
|
|
277
|
+
</UTooltip>
|
|
266
278
|
</div>
|
|
267
279
|
<p class="text-muted text-xs">{{ subtitle }}</p>
|
|
268
280
|
</div>
|
|
@@ -275,7 +287,7 @@ function toggleSale(): void {
|
|
|
275
287
|
</div>
|
|
276
288
|
|
|
277
289
|
<p v-if="plan.description" class="text-muted line-clamp-2 text-sm">
|
|
278
|
-
{{
|
|
290
|
+
{{ plan.description }}
|
|
279
291
|
</p>
|
|
280
292
|
|
|
281
293
|
<div>
|
|
@@ -26,7 +26,6 @@ const props = withDefaults(defineProps<PlanCardPublicProps>(), {
|
|
|
26
26
|
|
|
27
27
|
const { t } = useI18n()
|
|
28
28
|
const { priceLabel, seatExampleLabel, termsLabel } = usePublicPlanFormat()
|
|
29
|
-
const planDescription = usePlanDescription()
|
|
30
29
|
const { formatFeatureValue } = usePlanFeatureFormat()
|
|
31
30
|
const { processI18n } = useTranslation()
|
|
32
31
|
|
|
@@ -86,7 +85,7 @@ const accentStyle = computed(() =>
|
|
|
86
85
|
<header class="pr-16">
|
|
87
86
|
<h2 class="text-highlighted text-base font-semibold">{{ plan.name }}</h2>
|
|
88
87
|
<p v-if="plan.description" class="text-muted mt-1 text-[13px]">
|
|
89
|
-
{{
|
|
88
|
+
{{ plan.description }}
|
|
90
89
|
</p>
|
|
91
90
|
</header>
|
|
92
91
|
|
|
@@ -16,17 +16,20 @@ interface PlanAccess {
|
|
|
16
16
|
extraFeatures: Record<string, unknown>
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
+
/** A plan text as the editor holds it: one value per locale. */
|
|
20
|
+
type PlanText = Record<string, string>
|
|
21
|
+
|
|
19
22
|
/** The plan fields the preview reads, saved or as typed. */
|
|
20
23
|
interface PlanDraft {
|
|
21
|
-
name?:
|
|
22
|
-
description?:
|
|
24
|
+
name?: PlanText | null
|
|
25
|
+
description?: PlanText | null
|
|
23
26
|
price?: number
|
|
24
27
|
currency?: string
|
|
25
28
|
interval?: 'month' | 'year'
|
|
26
29
|
billingMode?: 'flat' | 'seat'
|
|
27
30
|
trialDays?: number
|
|
28
31
|
maxMembers?: number
|
|
29
|
-
borderLabel?:
|
|
32
|
+
borderLabel?: PlanText | null
|
|
30
33
|
borderColor?: string | null
|
|
31
34
|
inheritance?: PlanAccess | null
|
|
32
35
|
}
|
|
@@ -51,7 +54,7 @@ const SYNC_TONES: Record<SyncState, 'success' | 'warning' | 'neutral'> = {
|
|
|
51
54
|
synced: 'success',
|
|
52
55
|
out_of_sync: 'warning',
|
|
53
56
|
off_stripe: 'neutral',
|
|
54
|
-
not_configured: '
|
|
57
|
+
not_configured: 'warning',
|
|
55
58
|
}
|
|
56
59
|
|
|
57
60
|
const props = defineProps<{
|
|
@@ -66,8 +69,10 @@ const EMPTY_CATALOG: PlanCatalog = {
|
|
|
66
69
|
newPlanPermissions: [],
|
|
67
70
|
}
|
|
68
71
|
|
|
72
|
+
// Locale the server reads a plan text in when the reader's has none.
|
|
73
|
+
const PLAN_FALLBACK_LOCALE = 'en'
|
|
74
|
+
|
|
69
75
|
const { t, locale } = useI18n()
|
|
70
|
-
const planDescription = usePlanDescription()
|
|
71
76
|
const { formatFeatureValue } = usePlanFeatureFormat()
|
|
72
77
|
|
|
73
78
|
const planId = computed(() => props.routeParams?.id)
|
|
@@ -99,6 +104,15 @@ const isLoading = computed(
|
|
|
99
104
|
(!planCatalog.data.value || reads.some((read) => read.pending.value)),
|
|
100
105
|
)
|
|
101
106
|
const draft = computed<PlanDraft>(() => live.value ?? saved.value ?? {})
|
|
107
|
+
|
|
108
|
+
/** A plan text as the cards show it: the reader's locale, else the fallback one. */
|
|
109
|
+
function textOf(value: PlanText | null | undefined): string {
|
|
110
|
+
return value?.[locale.value] || value?.[PLAN_FALLBACK_LOCALE] || ''
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
const name = computed(() => textOf(draft.value.name))
|
|
114
|
+
const description = computed(() => textOf(draft.value.description))
|
|
115
|
+
const badge = computed(() => textOf(draft.value.borderLabel))
|
|
102
116
|
const currency = computed(() => draft.value.currency ?? 'EUR')
|
|
103
117
|
const price = computed(() => Number(draft.value.price ?? 0))
|
|
104
118
|
const interval = computed(() => draft.value.interval ?? 'month')
|
|
@@ -132,7 +146,7 @@ const terms = computed(() => {
|
|
|
132
146
|
const cta = computed(() =>
|
|
133
147
|
trialDays.value > 0
|
|
134
148
|
? t('saas.catalog.editor.preview.start_trial')
|
|
135
|
-
: t('saas.catalog.editor.preview.choose', { name:
|
|
149
|
+
: t('saas.catalog.editor.preview.choose', { name: name.value }),
|
|
136
150
|
)
|
|
137
151
|
|
|
138
152
|
const resolvedFeatures = computed(() => {
|
|
@@ -232,13 +246,13 @@ async function load(): Promise<void> {
|
|
|
232
246
|
v-else
|
|
233
247
|
class="border-default relative flex flex-col gap-3 rounded-xl border p-4"
|
|
234
248
|
:style="
|
|
235
|
-
|
|
249
|
+
badge
|
|
236
250
|
? { borderColor: draft.borderColor || undefined }
|
|
237
251
|
: undefined
|
|
238
252
|
"
|
|
239
253
|
>
|
|
240
254
|
<UBadge
|
|
241
|
-
v-if="
|
|
255
|
+
v-if="badge"
|
|
242
256
|
class="absolute -top-2.5 left-4"
|
|
243
257
|
size="sm"
|
|
244
258
|
icon="i-ph-star"
|
|
@@ -248,14 +262,14 @@ async function load(): Promise<void> {
|
|
|
248
262
|
: undefined
|
|
249
263
|
"
|
|
250
264
|
>
|
|
251
|
-
{{
|
|
265
|
+
{{ badge }}
|
|
252
266
|
</UBadge>
|
|
253
267
|
<div>
|
|
254
268
|
<p class="text-highlighted text-lg font-semibold">
|
|
255
|
-
{{
|
|
269
|
+
{{ name || $t('saas.catalog.editor.preview.unnamed') }}
|
|
256
270
|
</p>
|
|
257
|
-
<p v-if="
|
|
258
|
-
{{
|
|
271
|
+
<p v-if="description" class="text-muted line-clamp-2 text-sm">
|
|
272
|
+
{{ description }}
|
|
259
273
|
</p>
|
|
260
274
|
</div>
|
|
261
275
|
<div>
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { computed, ref, watch } from 'vue'
|
|
3
3
|
import { SENTENCE_DAY_FORMAT } from '../build/day-formats'
|
|
4
4
|
import { checkoutHeadingCase } from '../build/plan-change-heading'
|
|
5
|
+
import { canContinueToCheckout } from '../composables/usePlanChangeReview'
|
|
5
6
|
|
|
6
7
|
const props = defineProps<{
|
|
7
8
|
plan: OfferedPlanView | null
|
|
@@ -38,6 +39,9 @@ const loadFailed = ref(false)
|
|
|
38
39
|
const isSubmitting = ref(false)
|
|
39
40
|
const preview = ref<PlanChangePreview | null>(null)
|
|
40
41
|
const isPricing = ref(false)
|
|
42
|
+
// A refused preview (a plan Stripe does not bill yet, Stripe unreachable)
|
|
43
|
+
// would be refused again at checkout: say why, and offer no payment.
|
|
44
|
+
const previewFailure = ref<string | null>(null)
|
|
41
45
|
let pricingTimer: ReturnType<typeof setTimeout> | null = null
|
|
42
46
|
|
|
43
47
|
const currency = computed(() => preview.value?.currency ?? props.plan?.currency)
|
|
@@ -72,6 +76,14 @@ const headingParams = computed(() => ({
|
|
|
72
76
|
date: firstChargeOn.value ?? '',
|
|
73
77
|
}))
|
|
74
78
|
|
|
79
|
+
const canContinue = computed(() =>
|
|
80
|
+
canContinueToCheckout({
|
|
81
|
+
isLoading: isLoading.value,
|
|
82
|
+
hasLoadFailed: loadFailed.value,
|
|
83
|
+
previewFailure: previewFailure.value,
|
|
84
|
+
}),
|
|
85
|
+
)
|
|
86
|
+
|
|
75
87
|
const dueToday = computed(() => {
|
|
76
88
|
if (isTrial.value) return formatMinorUnits(0, currency.value)
|
|
77
89
|
return charge.value
|
|
@@ -98,8 +110,13 @@ async function price(): Promise<void> {
|
|
|
98
110
|
isPricing.value = true
|
|
99
111
|
try {
|
|
100
112
|
preview.value = await previewChange(plan._id, draft.value.country || null)
|
|
101
|
-
|
|
113
|
+
previewFailure.value = null
|
|
114
|
+
} catch (error) {
|
|
102
115
|
preview.value = null
|
|
116
|
+
previewFailure.value = resolveApiError(
|
|
117
|
+
error,
|
|
118
|
+
`${KEY_PREFIX}.preview_failed`,
|
|
119
|
+
)
|
|
103
120
|
} finally {
|
|
104
121
|
isPricing.value = false
|
|
105
122
|
}
|
|
@@ -118,6 +135,7 @@ watch(
|
|
|
118
135
|
async (isOpen) => {
|
|
119
136
|
if (!isOpen) return
|
|
120
137
|
preview.value = null
|
|
138
|
+
previewFailure.value = null
|
|
121
139
|
await loadIdentity()
|
|
122
140
|
void price()
|
|
123
141
|
},
|
|
@@ -261,12 +279,36 @@ async function confirm(): Promise<void> {
|
|
|
261
279
|
})
|
|
262
280
|
}}
|
|
263
281
|
</p>
|
|
264
|
-
<p
|
|
282
|
+
<p
|
|
283
|
+
v-else-if="!charge && !isPricing && !previewFailure"
|
|
284
|
+
class="text-muted"
|
|
285
|
+
>
|
|
265
286
|
{{ $t(`${KEY_PREFIX}.tax_on_stripe`) }}
|
|
266
287
|
</p>
|
|
267
288
|
</div>
|
|
268
289
|
</DmsCard>
|
|
269
290
|
|
|
291
|
+
<UAlert
|
|
292
|
+
v-if="previewFailure"
|
|
293
|
+
color="error"
|
|
294
|
+
variant="subtle"
|
|
295
|
+
icon="i-ph-warning-circle"
|
|
296
|
+
:title="previewFailure"
|
|
297
|
+
>
|
|
298
|
+
<template #actions>
|
|
299
|
+
<UButton
|
|
300
|
+
color="error"
|
|
301
|
+
variant="soft"
|
|
302
|
+
size="xs"
|
|
303
|
+
icon="i-ph-arrow-clockwise"
|
|
304
|
+
:loading="isPricing"
|
|
305
|
+
@click="price"
|
|
306
|
+
>
|
|
307
|
+
{{ $t('saas.common.retry') }}
|
|
308
|
+
</UButton>
|
|
309
|
+
</template>
|
|
310
|
+
</UAlert>
|
|
311
|
+
|
|
270
312
|
<p class="text-muted flex items-center gap-2 text-sm">
|
|
271
313
|
<UIcon name="i-ph-lock-simple" />
|
|
272
314
|
{{ $t(`${KEY_PREFIX}.card_note`) }}
|
|
@@ -285,7 +327,7 @@ async function confirm(): Promise<void> {
|
|
|
285
327
|
color="primary"
|
|
286
328
|
icon="i-ph-lock-simple"
|
|
287
329
|
:loading="isSubmitting"
|
|
288
|
-
:disabled="
|
|
330
|
+
:disabled="!canContinue"
|
|
289
331
|
>
|
|
290
332
|
{{ $t(`${KEY_PREFIX}.confirm`) }}
|
|
291
333
|
</UButton>
|
|
@@ -29,7 +29,6 @@ const billingStatus = useBillingStatus()
|
|
|
29
29
|
const nextInvoice = useNextInvoice()
|
|
30
30
|
const { formatMajorUnits, formatMinorUnits } = useMoneyFormat()
|
|
31
31
|
const { statusView } = useSaasStatus()
|
|
32
|
-
const planDescription = usePlanDescription()
|
|
33
32
|
const { formatFeatureValue } = usePlanFeatureFormat()
|
|
34
33
|
const comparison = usePlanComparison()
|
|
35
34
|
const { consumeCancelledCheckout } = usePendingCheckout()
|
|
@@ -98,7 +97,7 @@ const pill = computed(() => {
|
|
|
98
97
|
|
|
99
98
|
const summary = computed(() => {
|
|
100
99
|
if (current.value?.description)
|
|
101
|
-
return
|
|
100
|
+
return current.value.description
|
|
102
101
|
const view = data.value?.available.find(
|
|
103
102
|
(plan) => plan._id === current.value?._id,
|
|
104
103
|
)
|
|
@@ -69,7 +69,6 @@ const { resolveApiError } = useApiErrorMessage()
|
|
|
69
69
|
const { formatMajorUnits } = useMoneyFormat()
|
|
70
70
|
const planPriceLabel = usePlanPriceLabel()
|
|
71
71
|
const planIntervalLabel = usePlanIntervalLabel(`${KEYS}.interval`)
|
|
72
|
-
const planDescription = usePlanDescription()
|
|
73
72
|
const config = useDmsRuntimeConfig()
|
|
74
73
|
const { user } = useCurrentUser()
|
|
75
74
|
|
|
@@ -141,7 +140,7 @@ function planMeta(plan: CreatePlanOption): string {
|
|
|
141
140
|
rule.limit,
|
|
142
141
|
)
|
|
143
142
|
}
|
|
144
|
-
const parts = [
|
|
143
|
+
const parts = [plan.description].filter(Boolean)
|
|
145
144
|
if (plan.trialDays > 0 && plan.cardRequirement === 'payment') {
|
|
146
145
|
parts.push(t(`${KEYS}.trial`, { days: plan.trialDays }))
|
|
147
146
|
}
|