@antelopejs/dms-saas 0.7.3 → 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":"billing.js","sourceRoot":"","sources":["../../../src/pages/tenant/billing.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAIwC;AACxC,yDASwC;AAExC,kEAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/pages/tenant/billing.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,14 +15,19 @@ function summariseCatalogue(plans, usage) {
|
|
|
15
15
|
const onSale = plans.filter((plan) => plan.isActive);
|
|
16
16
|
const legacy = plans.filter((plan) => !plan.isActive);
|
|
17
17
|
const legacyInUse = legacy.filter((plan) => usageOf(usage, plan).workspaces > 0);
|
|
18
|
+
const workspaces = sumOf(plans, usage, "workspaces");
|
|
19
|
+
const paying = sumOf(plans, usage, "paying");
|
|
20
|
+
const free = sumOf(plans, usage, "free");
|
|
21
|
+
const trialing = sumOf(plans, usage, "trialing");
|
|
18
22
|
return {
|
|
19
23
|
onSale: onSale.length,
|
|
20
24
|
publicOnSale: onSale.filter((plan) => plan.isPublic).length,
|
|
21
25
|
salesLed: onSale.filter((plan) => !plan.isPublic).length,
|
|
22
|
-
workspaces
|
|
23
|
-
paying
|
|
24
|
-
free
|
|
25
|
-
trialing
|
|
26
|
+
workspaces,
|
|
27
|
+
paying,
|
|
28
|
+
free,
|
|
29
|
+
trialing,
|
|
30
|
+
other: workspaces - paying - free - trialing,
|
|
26
31
|
mrr: [...usage.mrrByCurrency]
|
|
27
32
|
.map(([currency, mrr]) => ({ currency, mrr }))
|
|
28
33
|
.sort((left, right) => right.mrr - left.mrr),
|
|
@@ -88,6 +93,7 @@ function catalogueStatItems(summary) {
|
|
|
88
93
|
paying: summary.paying,
|
|
89
94
|
free: summary.free,
|
|
90
95
|
trialing: summary.trialing,
|
|
96
|
+
other: summary.other,
|
|
91
97
|
}),
|
|
92
98
|
},
|
|
93
99
|
mrrItem(summary),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogue-summary.js","sourceRoot":"","sources":["../../src/plans/catalogue-summary.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"catalogue-summary.js","sourceRoot":"","sources":["../../src/plans/catalogue-summary.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const db_1 = require("../db");
|
|
|
12
12
|
const normalised_mrr_1 = require("../metrics/normalised-mrr");
|
|
13
13
|
const money_1 = require("../utils/money");
|
|
14
14
|
const TRIALING_STATE = "trialing";
|
|
15
|
+
const FREE_STATE = "free";
|
|
15
16
|
const CENTS_PRECISION = 100;
|
|
16
17
|
function roundCents(amount) {
|
|
17
18
|
return Math.round(amount * CENTS_PRECISION) / CENTS_PRECISION;
|
|
@@ -54,7 +55,8 @@ function addRow(usage, plan, row) {
|
|
|
54
55
|
usage.mrr = roundCents(usage.mrr + amount);
|
|
55
56
|
return;
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
+
if (row.status === FREE_STATE)
|
|
59
|
+
usage.free += 1;
|
|
58
60
|
}
|
|
59
61
|
function summariseCatalogueUsage(plans, rows) {
|
|
60
62
|
const plansById = new Map(plans.map((plan) => [plan._id, plan]));
|
|
@@ -84,7 +86,7 @@ function planMrrShare(usage, plan) {
|
|
|
84
86
|
return total > 0 ? mrr / total : 0;
|
|
85
87
|
}
|
|
86
88
|
function toUsageRow(row) {
|
|
87
|
-
if (!row.planId || row.deletedAt)
|
|
89
|
+
if (!row.planId || row.deletedAt || row._id !== row.tenantId)
|
|
88
90
|
return undefined;
|
|
89
91
|
return {
|
|
90
92
|
tenantId: row.tenantId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogue-usage.js","sourceRoot":"","sources":["../../src/plans/catalogue-usage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"catalogue-usage.js","sourceRoot":"","sources":["../../src/plans/catalogue-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { Plan, PlanAudience } from "../db";
|
|
2
2
|
export declare const ANY_PLAN_AUDIENCE: PlanAudience;
|
|
3
3
|
export declare function isPlanOfferedTo(plan: Pick<Plan, "audience">, customerType: string | null | undefined): boolean;
|
|
4
|
+
export declare function isPlanOpenToWorkspace(plan: Pick<Plan, "audience">, customerType: string | null | undefined): boolean;
|
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ANY_PLAN_AUDIENCE = void 0;
|
|
4
4
|
exports.isPlanOfferedTo = isPlanOfferedTo;
|
|
5
|
+
exports.isPlanOpenToWorkspace = isPlanOpenToWorkspace;
|
|
5
6
|
exports.ANY_PLAN_AUDIENCE = "any";
|
|
6
7
|
function isPlanOfferedTo(plan, customerType) {
|
|
7
8
|
return plan.audience === exports.ANY_PLAN_AUDIENCE || plan.audience === customerType;
|
|
8
9
|
}
|
|
10
|
+
function isPlanOpenToWorkspace(plan, customerType) {
|
|
11
|
+
return !customerType || isPlanOfferedTo(plan, customerType);
|
|
12
|
+
}
|
|
9
13
|
//# sourceMappingURL=plan-audience.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-audience.js","sourceRoot":"","sources":["../../src/plans/plan-audience.ts"],"names":[],"mappings":";;;AAWA,0CAKC;
|
|
1
|
+
{"version":3,"file":"plan-audience.js","sourceRoot":"","sources":["../../src/plans/plan-audience.ts"],"names":[],"mappings":";;;AAWA,0CAKC;AAUD,sDAKC;AA5BY,QAAA,iBAAiB,GAAiB,KAAK,CAAC;AAQrD,SAAgB,eAAe,CAC7B,IAA4B,EAC5B,YAAuC;IAEvC,OAAO,IAAI,CAAC,QAAQ,KAAK,yBAAiB,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC;AAC/E,CAAC;AAUD,SAAgB,qBAAqB,CACnC,IAA4B,EAC5B,YAAuC;IAEvC,OAAO,CAAC,YAAY,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Feature, Plan, PlanFeatureValue } from "../db";
|
|
1
|
+
import type { Feature, Plan, PlanFeatureValue, PlanLocalizedText } from "../db";
|
|
2
2
|
export declare const FEATURE_OFF_VALUE = 0;
|
|
3
3
|
export interface PlanInheritanceInput {
|
|
4
4
|
parentPlanId: string | null;
|
|
@@ -6,12 +6,18 @@ export interface PlanInheritanceInput {
|
|
|
6
6
|
extraFeatures: Record<string, unknown>;
|
|
7
7
|
}
|
|
8
8
|
export declare const PLAN_WRITE_FIELDS: readonly ["name", "slug", "description", "audience", "price", "currency", "interval", "billingMode", "features", "permissions", "inheritsFromPlanId", "trialDays", "maxMembers", "isPublic", "borderColor", "borderLabel", "order", "isActive"];
|
|
9
|
-
|
|
9
|
+
type PlanTextField = "name" | "description" | "borderLabel";
|
|
10
|
+
export type PlanTexts = Partial<Record<PlanTextField, PlanLocalizedText>>;
|
|
11
|
+
export type PlanWrite = Omit<Partial<Plan>, PlanTextField> & PlanTexts;
|
|
12
|
+
export type PlanWriteBody = Omit<Partial<Pick<Plan, (typeof PLAN_WRITE_FIELDS)[number]>>, PlanTextField> & PlanTexts & {
|
|
10
13
|
inheritance?: PlanInheritanceInput | null;
|
|
11
14
|
};
|
|
12
15
|
export declare function expandInheritance(body: PlanWriteBody): PlanWriteBody;
|
|
13
16
|
export declare function toInheritance(plan: Plan): PlanInheritanceInput;
|
|
14
|
-
export declare function pickPlanWrite(body: PlanWriteBody):
|
|
17
|
+
export declare function pickPlanWrite(body: PlanWriteBody): PlanWrite;
|
|
18
|
+
export declare function planTexts(plan: Plan): PlanTexts;
|
|
19
|
+
export declare function toPlanRow(write: PlanWrite): Plan;
|
|
15
20
|
export declare function slugify(value: string): string;
|
|
16
21
|
export declare function invalidFeatureValues(values: PlanFeatureValue[], catalogue: Pick<Feature, "_id" | "valueType">[]): string[];
|
|
17
22
|
export declare function isValidMemberCap(value: unknown): boolean;
|
|
23
|
+
export {};
|
package/dist/plans/plan-write.js
CHANGED
|
@@ -4,6 +4,8 @@ exports.PLAN_WRITE_FIELDS = exports.FEATURE_OFF_VALUE = void 0;
|
|
|
4
4
|
exports.expandInheritance = expandInheritance;
|
|
5
5
|
exports.toInheritance = toInheritance;
|
|
6
6
|
exports.pickPlanWrite = pickPlanWrite;
|
|
7
|
+
exports.planTexts = planTexts;
|
|
8
|
+
exports.toPlanRow = toPlanRow;
|
|
7
9
|
exports.slugify = slugify;
|
|
8
10
|
exports.invalidFeatureValues = invalidFeatureValues;
|
|
9
11
|
exports.isValidMemberCap = isValidMemberCap;
|
|
@@ -15,6 +17,17 @@ const SLUG_MAX_LENGTH = 100;
|
|
|
15
17
|
const COMBINING_MARKS = /[̀-ͯ]/g;
|
|
16
18
|
const NON_SLUG_CHARACTERS = /[^a-z0-9]+/g;
|
|
17
19
|
const EDGE_DASHES = /^-+|-+$/g;
|
|
20
|
+
function trimmed(value) {
|
|
21
|
+
if (typeof value === "string")
|
|
22
|
+
return value.trim();
|
|
23
|
+
return Object.fromEntries(Object.entries(value).map(([locale, text]) => [locale, text.trim()]));
|
|
24
|
+
}
|
|
25
|
+
const TRIMMED_FIELDS = [
|
|
26
|
+
"name",
|
|
27
|
+
"slug",
|
|
28
|
+
"description",
|
|
29
|
+
"borderLabel",
|
|
30
|
+
];
|
|
18
31
|
exports.PLAN_WRITE_FIELDS = [
|
|
19
32
|
"name",
|
|
20
33
|
"slug",
|
|
@@ -65,14 +78,27 @@ function pickPlanWrite(body) {
|
|
|
65
78
|
const expanded = expandInheritance(body);
|
|
66
79
|
const out = {};
|
|
67
80
|
for (const field of exports.PLAN_WRITE_FIELDS) {
|
|
68
|
-
|
|
81
|
+
const isText = db_1.PLAN_LOCALIZED_FIELDS.includes(field);
|
|
82
|
+
if (isText ? expanded[field] != null : expanded[field] !== undefined) {
|
|
69
83
|
Object.assign(out, { [field]: expanded[field] });
|
|
70
84
|
}
|
|
71
85
|
}
|
|
86
|
+
for (const field of TRIMMED_FIELDS) {
|
|
87
|
+
const value = out[field];
|
|
88
|
+
if (value)
|
|
89
|
+
Object.assign(out, { [field]: trimmed(value) });
|
|
90
|
+
}
|
|
72
91
|
if (out.permissions)
|
|
73
92
|
out.permissions = (0, plan_permission_tree_1.withPermissionAncestors)(out.permissions);
|
|
74
93
|
return out;
|
|
75
94
|
}
|
|
95
|
+
function planTexts(plan) {
|
|
96
|
+
plan.localize("*", db_1.PLAN_LOCALIZED_FIELDS);
|
|
97
|
+
return Object.fromEntries(db_1.PLAN_LOCALIZED_FIELDS.map((field) => [field, plan[field]]).filter(([, text]) => text != null));
|
|
98
|
+
}
|
|
99
|
+
function toPlanRow(write) {
|
|
100
|
+
return db_1.PlanModel.fromPlainData(write).localize("*", db_1.PLAN_LOCALIZED_FIELDS);
|
|
101
|
+
}
|
|
76
102
|
function slugify(value) {
|
|
77
103
|
return value
|
|
78
104
|
.toLowerCase()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-write.js","sourceRoot":"","sources":["../../src/plans/plan-write.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"plan-write.js","sourceRoot":"","sources":["../../src/plans/plan-write.ts"],"names":[],"mappings":"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"}
|
package/dist/plans/seat-hooks.js
CHANGED
|
@@ -83,24 +83,33 @@ async function syncSeatsAfterRemoval(tenantId, removedUserIds, idempotencyKey) {
|
|
|
83
83
|
quantityOverride: nextOccupied,
|
|
84
84
|
});
|
|
85
85
|
}
|
|
86
|
+
const SEATLESS_CHANGE_KINDS = new Set([
|
|
87
|
+
"roles",
|
|
88
|
+
"removed",
|
|
89
|
+
]);
|
|
90
|
+
async function enforceSeatOnMemberChange(change) {
|
|
91
|
+
if (SEATLESS_CHANGE_KINDS.has(change.kind))
|
|
92
|
+
return;
|
|
93
|
+
const { tenantId, userId, deliveryId } = change;
|
|
94
|
+
const previousIsTenantOwner = change.previousIsTenantOwner ?? null;
|
|
95
|
+
const constraints = await (0, plan_changes_1.GetTenantPlanConstraints)(tenantId);
|
|
96
|
+
(0, interface_api_util_1.assert)(!constraints.admissionBlocked, 409, "Inventory preparation is in progress");
|
|
97
|
+
const nextHoldsSeat = !(await (0, platform_support_1.isPlatformSupportEntry)(userId, change.isTenantOwner === true));
|
|
98
|
+
const heldSeat = previousIsTenantOwner !== null &&
|
|
99
|
+
!(await (0, platform_support_1.isPlatformSupportEntry)(userId, previousIsTenantOwner));
|
|
100
|
+
if (!nextHoldsSeat || heldSeat)
|
|
101
|
+
return;
|
|
102
|
+
const user = deliveryId ? await (0, interface_database_decorators_1.GetModel)(db_1.UserModel).get(userId) : undefined;
|
|
103
|
+
const occupied = await (0, seat_capacity_1.countOccupiedSeats)(tenantId, user?.email);
|
|
104
|
+
for (const plan of [constraints.currentPlan, constraints.pendingPlan]) {
|
|
105
|
+
if (plan)
|
|
106
|
+
(0, interface_api_util_1.assert)((0, seat_capacity_1.fitsWithinSeatLimit)(plan.maxMembers, occupied + 1), HTTP_PAYMENT_REQUIRED, "saas.errors.plan.seat_limit_reached");
|
|
107
|
+
}
|
|
108
|
+
}
|
|
86
109
|
function registerSeatHooks() {
|
|
87
110
|
(0, invite_extensions_1.RegisterInviteAvailability)(resolveInviteSeatAvailability);
|
|
88
|
-
(0, hooks_1.RegisterHook)(hooks_1.Hook.MEMBER_BEING_CHANGED, async (
|
|
89
|
-
|
|
90
|
-
(0, interface_api_util_1.assert)(!constraints.admissionBlocked, 409, "Inventory preparation is in progress");
|
|
91
|
-
const nextHoldsSeat = !(await (0, platform_support_1.isPlatformSupportEntry)(userId, isTenantOwner));
|
|
92
|
-
const heldSeat = previousIsTenantOwner !== null &&
|
|
93
|
-
!(await (0, platform_support_1.isPlatformSupportEntry)(userId, previousIsTenantOwner));
|
|
94
|
-
if (!nextHoldsSeat || heldSeat)
|
|
95
|
-
return undefined;
|
|
96
|
-
const user = deliveryId
|
|
97
|
-
? await (0, interface_database_decorators_1.GetModel)(db_1.UserModel).get(userId)
|
|
98
|
-
: undefined;
|
|
99
|
-
const occupied = await (0, seat_capacity_1.countOccupiedSeats)(tenantId, user?.email);
|
|
100
|
-
for (const plan of [constraints.currentPlan, constraints.pendingPlan]) {
|
|
101
|
-
if (plan)
|
|
102
|
-
(0, interface_api_util_1.assert)((0, seat_capacity_1.fitsWithinSeatLimit)(plan.maxMembers, occupied + 1), HTTP_PAYMENT_REQUIRED, "saas.errors.plan.seat_limit_reached");
|
|
103
|
-
}
|
|
111
|
+
(0, hooks_1.RegisterHook)(hooks_1.Hook.MEMBER_BEING_CHANGED, async (payload) => {
|
|
112
|
+
await enforceSeatOnMemberChange(payload);
|
|
104
113
|
return undefined;
|
|
105
114
|
});
|
|
106
115
|
(0, hooks_1.RegisterHook)(hooks_1.Hook.MEMBER_BEING_ADDED, async ({ tenantId, userId, isTenantOwner, deliveryId }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seat-hooks.js","sourceRoot":"","sources":["../../src/plans/seat-hooks.ts"],"names":[],"mappings":";;AAqGA,oDAgBC;
|
|
1
|
+
{"version":3,"file":"seat-hooks.js","sourceRoot":"","sources":["../../src/plans/seat-hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ exports.archivePlanStripeProduct = archivePlanStripeProduct;
|
|
|
10
10
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
11
11
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
12
12
|
const db_1 = require("../db");
|
|
13
|
+
const plans_1 = require("@antelopejs/interface-dms-saas/plans");
|
|
13
14
|
const client_1 = require("../stripe/client");
|
|
14
15
|
const sync_plan_1 = require("../stripe/sync-plan");
|
|
15
16
|
const LOG_PREFIX = "[dms-saas:plans]";
|
|
@@ -37,6 +38,13 @@ function canSyncWithStripe(plan) {
|
|
|
37
38
|
!plan.isDeleted &&
|
|
38
39
|
SUPPORTED_INTERVALS.has(plan.interval));
|
|
39
40
|
}
|
|
41
|
+
function storedWithRefs(plan, paymentProviderRefs) {
|
|
42
|
+
const stored = db_1.PlanModel.fromDatabase({
|
|
43
|
+
...db_1.PlanModel.toDatabase(plan),
|
|
44
|
+
paymentProviderRefs,
|
|
45
|
+
});
|
|
46
|
+
return (0, plans_1.localizePlan)(stored, db_1.PLAN_FALLBACK_LOCALE);
|
|
47
|
+
}
|
|
40
48
|
async function syncAndStore(store, plan) {
|
|
41
49
|
const taxCode = await (0, sync_plan_1.resolveProductTaxCode)();
|
|
42
50
|
if ((0, sync_plan_1.isPlanStripeSyncCurrent)(plan, taxCode))
|
|
@@ -44,7 +52,7 @@ async function syncAndStore(store, plan) {
|
|
|
44
52
|
const paymentProviderRefs = await (0, sync_plan_1.syncPlanWithStripe)(plan, taxCode);
|
|
45
53
|
await store.update(plan._id, { paymentProviderRefs });
|
|
46
54
|
logging_1.Logging.Info(`${LOG_PREFIX} plan '${plan._id}' synced with Stripe price ${paymentProviderRefs.stripePriceId}`);
|
|
47
|
-
return
|
|
55
|
+
return storedWithRefs(plan, paymentProviderRefs);
|
|
48
56
|
}
|
|
49
57
|
async function syncPlanStripeRefs(plan, store = (0, interface_database_decorators_1.GetModel)(db_1.PlanModel)) {
|
|
50
58
|
if (!canSyncWithStripe(plan) || !(0, client_1.isStripeConfigured)())
|
|
@@ -86,10 +94,10 @@ function startPlanReconciliation() {
|
|
|
86
94
|
void reconcilePlansWithStripe().catch((error) => logging_1.Logging.Error(`${LOG_PREFIX} Stripe plan reconciliation failed`, error));
|
|
87
95
|
}
|
|
88
96
|
async function planStripeSyncState(plan) {
|
|
89
|
-
if (!(0, client_1.isStripeConfigured)())
|
|
90
|
-
return "not_configured";
|
|
91
97
|
if (!isStripeBilledPlan(plan))
|
|
92
98
|
return "off_stripe";
|
|
99
|
+
if (!(0, client_1.isStripeConfigured)())
|
|
100
|
+
return "not_configured";
|
|
93
101
|
const taxCode = await (0, sync_plan_1.resolveProductTaxCode)();
|
|
94
102
|
return (0, sync_plan_1.isPlanStripeSyncCurrent)(plan, taxCode) ? "synced" : "out_of_sync";
|
|
95
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stripe-sync.js","sourceRoot":"","sources":["../../src/plans/stripe-sync.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"stripe-sync.js","sourceRoot":"","sources":["../../src/plans/stripe-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,30 +21,36 @@ const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
|
21
21
|
const db_1 = require("../../db");
|
|
22
22
|
const operator_billing_1 = require("../../operator-billing");
|
|
23
23
|
const stripe_1 = require("../../stripe");
|
|
24
|
+
const availability_1 = require("../../stripe/availability");
|
|
24
25
|
const HTTP_BAD_REQUEST = 400;
|
|
25
26
|
const HTTP_CONFLICT = 409;
|
|
26
27
|
function parseBody(body) {
|
|
27
28
|
return (0, interface_api_util_1.assertValidation)(body, (value) => operator_billing_1.issueCreditNoteBodySchema.parse(value), (error) => error.issues);
|
|
28
29
|
}
|
|
30
|
+
async function issueAgainst(loaded, body, user) {
|
|
31
|
+
const { allowance } = await (0, operator_billing_1.resolveCreditAllowance)(loaded);
|
|
32
|
+
(0, interface_api_util_1.assert)(!allowance.blockReason, HTTP_CONFLICT, `saas.errors.credit_note.blocked.${allowance.blockReason}`);
|
|
33
|
+
(0, interface_api_util_1.assert)(allowance.modes.includes(body.mode), HTTP_BAD_REQUEST, "saas.errors.credit_note.mode_not_allowed");
|
|
34
|
+
(0, interface_api_util_1.assert)(body.amount <= allowance.creditable, HTTP_BAD_REQUEST, "saas.errors.credit_note.above_creditable");
|
|
35
|
+
const creditNote = await (0, stripe_1.getStripeClient)().creditNotes.create((0, operator_billing_1.buildCreditNoteParams)(loaded.invoice.stripeInvoiceId, body, user), { idempotencyKey: `saas-credit-note:${body.requestId}` });
|
|
36
|
+
return {
|
|
37
|
+
stripeCreditNoteId: creditNote.id,
|
|
38
|
+
number: creditNote.number,
|
|
39
|
+
amount: creditNote.amount,
|
|
40
|
+
currency: creditNote.currency,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
29
43
|
class SaasCreditNotesIssueController extends (0, interface_api_1.Controller)("/api/saas/credit-notes") {
|
|
30
44
|
async preview(_user, invoiceId, invoiceModel) {
|
|
45
|
+
(0, availability_1.assertStripeConfigured)();
|
|
31
46
|
const loaded = await (0, operator_billing_1.loadInvoice)(invoiceModel, invoiceId);
|
|
32
|
-
return (0, operator_billing_1.buildCreditNotePreview)(loaded);
|
|
47
|
+
return (0, availability_1.withStripeAvailability)(() => (0, operator_billing_1.buildCreditNotePreview)(loaded));
|
|
33
48
|
}
|
|
34
49
|
async issue(user, rawBody, invoiceModel) {
|
|
35
50
|
const body = parseBody(rawBody);
|
|
51
|
+
(0, availability_1.assertStripeConfigured)();
|
|
36
52
|
const loaded = await (0, operator_billing_1.loadInvoice)(invoiceModel, body.invoiceId);
|
|
37
|
-
|
|
38
|
-
(0, interface_api_util_1.assert)(!allowance.blockReason, HTTP_CONFLICT, `saas.errors.credit_note.blocked.${allowance.blockReason}`);
|
|
39
|
-
(0, interface_api_util_1.assert)(allowance.modes.includes(body.mode), HTTP_BAD_REQUEST, "saas.errors.credit_note.mode_not_allowed");
|
|
40
|
-
(0, interface_api_util_1.assert)(body.amount <= allowance.creditable, HTTP_BAD_REQUEST, "saas.errors.credit_note.above_creditable");
|
|
41
|
-
const creditNote = await (0, stripe_1.getStripeClient)().creditNotes.create((0, operator_billing_1.buildCreditNoteParams)(loaded.invoice.stripeInvoiceId, body, user), { idempotencyKey: `saas-credit-note:${body.requestId}` });
|
|
42
|
-
return {
|
|
43
|
-
stripeCreditNoteId: creditNote.id,
|
|
44
|
-
number: creditNote.number,
|
|
45
|
-
amount: creditNote.amount,
|
|
46
|
-
currency: creditNote.currency,
|
|
47
|
-
};
|
|
53
|
+
return (0, availability_1.withStripeAvailability)(() => issueAgainst(loaded, body, user));
|
|
48
54
|
}
|
|
49
55
|
}
|
|
50
56
|
exports.SaasCreditNotesIssueController = SaasCreditNotesIssueController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credit-notes-issue.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/credit-notes-issue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAMmC;AACnC,uEAA0E;AAC1E,uEAAgE;AAChE,6FAAkE;AAClE,yDAA+D;AAG/D,iCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"credit-notes-issue.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/credit-notes-issue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,15 @@
|
|
|
1
|
+
import { type RequestContext } from "@antelopejs/interface-api";
|
|
1
2
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
2
3
|
import type { ActivityFeedItem, KeyValueListItem, NavCardItem, StatGroupItem, TopListItem } from "@antelopejs/interface-dms/base";
|
|
3
|
-
import { type ChartCardPayload } from "../../metrics/revenue";
|
|
4
|
+
import { type ChartCardPayload, type KpiCardPayload } from "../../metrics/revenue";
|
|
4
5
|
import type { ItemsPayload } from "./block-payloads";
|
|
5
|
-
interface KpiPayload {
|
|
6
|
-
value: number;
|
|
7
|
-
previousValue?: number;
|
|
8
|
-
delta?: number;
|
|
9
|
-
}
|
|
10
6
|
declare const SaasDashboardController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
11
7
|
export declare class SaasDashboardController extends SaasDashboardController_base {
|
|
12
8
|
private summary;
|
|
13
9
|
headline(_user: User): Promise<ItemsPayload<StatGroupItem>>;
|
|
14
10
|
attention(_user: User): Promise<ItemsPayload<NavCardItem>>;
|
|
15
|
-
churn(_user: User,
|
|
16
|
-
paidInvoices(_user: User,
|
|
11
|
+
churn(_user: User, ctx: RequestContext): Promise<KpiCardPayload>;
|
|
12
|
+
paidInvoices(_user: User, ctx: RequestContext): Promise<ChartCardPayload>;
|
|
17
13
|
workspacesByStatus(_user: User): Promise<ItemsPayload<KeyValueListItem>>;
|
|
18
14
|
plansByMrr(_user: User): Promise<ItemsPayload<TopListItem>>;
|
|
19
15
|
activity(_user: User, kind: unknown): Promise<ItemsPayload<ActivityFeedItem>>;
|
|
@@ -31,7 +31,6 @@ const activity_sources_1 = require("../../metrics/activity-sources");
|
|
|
31
31
|
const OPEN_STATUS = "open";
|
|
32
32
|
const LATE_PAYMENT_LOOKBACK_DAYS = 90;
|
|
33
33
|
const ACTIVITY_LIMIT = 8;
|
|
34
|
-
const PERCENT = 100;
|
|
35
34
|
async function loadAttentionMigrations() {
|
|
36
35
|
const migrations = await (0, interface_database_decorators_1.GetModel)(db_1.PlanMigrationModel).findByStage("needs_attention");
|
|
37
36
|
const [first] = migrations;
|
|
@@ -97,27 +96,15 @@ class SaasDashboardController extends (0, interface_api_1.Controller)("/api/saas
|
|
|
97
96
|
}),
|
|
98
97
|
};
|
|
99
98
|
}
|
|
100
|
-
async churn(_user,
|
|
99
|
+
async churn(_user, ctx) {
|
|
101
100
|
const { rows, currency } = await this.summary();
|
|
102
101
|
const mrr = (0, directory_summary_1.summariseDirectory)(rows, new Date(), currency).mrr;
|
|
103
|
-
|
|
104
|
-
const comparison = (0, revenue_1.parseComparison)(compareFrom, compareTo);
|
|
105
|
-
if (!comparison)
|
|
106
|
-
return { value: current.rate };
|
|
107
|
-
const previous = (0, revenue_1.churnOver)(rows, comparison, mrr);
|
|
108
|
-
return {
|
|
109
|
-
value: current.rate,
|
|
110
|
-
previousValue: previous.rate,
|
|
111
|
-
delta: previous.rate === 0
|
|
112
|
-
? undefined
|
|
113
|
-
: ((current.rate - previous.rate) / previous.rate) * PERCENT,
|
|
114
|
-
};
|
|
102
|
+
return (0, revenue_1.churnKpi)(rows, (0, revenue_1.readPeriodQuery)(ctx.url.searchParams), mrr);
|
|
115
103
|
}
|
|
116
|
-
async paidInvoices(_user,
|
|
117
|
-
const range = (0, revenue_1.
|
|
118
|
-
const comparison = (0, revenue_1.parseComparison)(compareFrom, compareTo);
|
|
104
|
+
async paidInvoices(_user, ctx) {
|
|
105
|
+
const { range, comparison, comparisonMode } = (0, revenue_1.readPeriodQuery)(ctx.url.searchParams);
|
|
119
106
|
const documents = await loadSettledDocuments(earliestStart(range, comparison));
|
|
120
|
-
return (0, revenue_1.paidInvoicesChart)(documents, range, comparison, (0, config_1.getReportingCurrency)());
|
|
107
|
+
return (0, revenue_1.paidInvoicesChart)(documents, range, comparison, (0, config_1.getReportingCurrency)(), comparisonMode);
|
|
121
108
|
}
|
|
122
109
|
async workspacesByStatus(_user) {
|
|
123
110
|
const { rows, currency } = await this.summary();
|
|
@@ -159,23 +146,17 @@ __decorate([
|
|
|
159
146
|
__decorate([
|
|
160
147
|
(0, interface_api_1.Get)("/churn"),
|
|
161
148
|
__param(0, (0, auth_1.AuthOwnerOnly)()),
|
|
162
|
-
__param(1, (0, interface_api_1.
|
|
163
|
-
__param(2, (0, interface_api_1.Parameter)("to", "query")),
|
|
164
|
-
__param(3, (0, interface_api_1.Parameter)("compareFrom", "query")),
|
|
165
|
-
__param(4, (0, interface_api_1.Parameter)("compareTo", "query")),
|
|
149
|
+
__param(1, (0, interface_api_1.Context)()),
|
|
166
150
|
__metadata("design:type", Function),
|
|
167
|
-
__metadata("design:paramtypes", [Function, Object
|
|
151
|
+
__metadata("design:paramtypes", [Function, Object]),
|
|
168
152
|
__metadata("design:returntype", Promise)
|
|
169
153
|
], SaasDashboardController.prototype, "churn", null);
|
|
170
154
|
__decorate([
|
|
171
155
|
(0, interface_api_1.Get)("/paid-invoices"),
|
|
172
156
|
__param(0, (0, auth_1.AuthOwnerOnly)()),
|
|
173
|
-
__param(1, (0, interface_api_1.
|
|
174
|
-
__param(2, (0, interface_api_1.Parameter)("to", "query")),
|
|
175
|
-
__param(3, (0, interface_api_1.Parameter)("compareFrom", "query")),
|
|
176
|
-
__param(4, (0, interface_api_1.Parameter)("compareTo", "query")),
|
|
157
|
+
__param(1, (0, interface_api_1.Context)()),
|
|
177
158
|
__metadata("design:type", Function),
|
|
178
|
-
__metadata("design:paramtypes", [Function, Object
|
|
159
|
+
__metadata("design:paramtypes", [Function, Object]),
|
|
179
160
|
__metadata("design:returntype", Promise)
|
|
180
161
|
], SaasDashboardController.prototype, "paidInvoices", null);
|
|
181
162
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/dashboard.ts"],"names":[],"mappings":"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"}
|