@antelopejs/dms-saas 0.7.2 → 0.7.3

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.
@@ -10,6 +10,12 @@ export interface NextInvoiceRows {
10
10
  currency: string | null;
11
11
  billingDate: string | null;
12
12
  }
13
+ export interface PlanSwitch {
14
+ currentPlanName: string;
15
+ nextPlanName: string;
16
+ isNextPlanFree: boolean;
17
+ at: Date;
18
+ }
13
19
  interface NextInvoiceContext {
14
20
  paymentMethod: PaymentMethodSummary | null;
15
21
  billingEmail: string | null;
@@ -17,6 +23,7 @@ interface NextInvoiceContext {
17
23
  planNames: ReadonlyMap<string, string>;
18
24
  }
19
25
  export declare function toNextInvoiceRows(preview: AvailableUpcomingInvoicePreview, context: NextInvoiceContext): NextInvoiceRows;
26
+ export declare function withPlanSwitch(rows: NextInvoiceRows, planSwitch: PlanSwitch, context: NextInvoiceContext): NextInvoiceRows;
20
27
  export declare function latestPaidInvoice(invoices: Invoice[]): Invoice | null;
21
28
  export declare function planNamesByProduct(plans: Plan[]): Map<string, string>;
22
29
  declare const SaasTenantUpcomingInvoiceController_base: import("@antelopejs/interface-api").ControllerClass<object>;
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.SaasTenantUpcomingInvoiceController = void 0;
16
16
  exports.toNextInvoiceRows = toNextInvoiceRows;
17
+ exports.withPlanSwitch = withPlanSwitch;
17
18
  exports.latestPaidInvoice = latestPaidInvoice;
18
19
  exports.planNamesByProduct = planNamesByProduct;
19
20
  const interface_api_1 = require("@antelopejs/interface-api");
@@ -22,6 +23,7 @@ const guards_1 = require("@antelopejs/interface-dms/guards");
22
23
  const request_tenant_1 = require("@antelopejs/interface-dms/request-tenant");
23
24
  const billing_state_1 = require("../../billing-state");
24
25
  const db_1 = require("../../db");
26
+ const free_plan_1 = require("../../workspaces/free-plan");
25
27
  const billing_1 = require("../../pages/tenant/billing");
26
28
  const composed_text_1 = require("../../i18n/composed-text");
27
29
  const preview_1 = require("../../upcoming-invoice/preview");
@@ -33,6 +35,9 @@ const PERCENT = 100;
33
35
  const MASKED_DIGITS = "••••";
34
36
  const PAID_ON_KEY = "saas.tenant_billing.next_invoice.paid_on";
35
37
  const SUBSCRIPTION_LINE_KEY = "saas.tenant_billing.next_invoice.subscription_line";
38
+ const PAID_UNTIL_KEY = "saas.tenant_billing.next_invoice.paid_until";
39
+ const SWITCH_ON_KEY = "saas.tenant_billing.next_invoice.switch_on";
40
+ const SWITCH_FREE_DETAIL_KEY = "saas.tenant_billing.next_invoice.switch_free_detail";
36
41
  const NOTHING_TO_INVOICE = {
37
42
  items: [],
38
43
  totalMinorUnits: null,
@@ -142,6 +147,47 @@ function toNextInvoiceRows(preview, context) {
142
147
  billingDate: preview.billingDate,
143
148
  };
144
149
  }
150
+ function switchRow(planSwitch) {
151
+ const plan = planSwitch.nextPlanName;
152
+ return {
153
+ label: (0, composed_text_1.composed)(SWITCH_ON_KEY, { plan }),
154
+ value: planSwitch.at.toISOString(),
155
+ type: "date",
156
+ tone: "warning",
157
+ detail: planSwitch.isNextPlanFree
158
+ ? (0, composed_text_1.composed)(SWITCH_FREE_DETAIL_KEY, { plan })
159
+ : undefined,
160
+ };
161
+ }
162
+ function withPlanSwitch(rows, planSwitch, context) {
163
+ if (rows.items.length > 0) {
164
+ const contextStart = rows.items.findIndex((row) => row.label === `${KEY_PREFIX}.total`);
165
+ const at = contextStart < 0 ? rows.items.length : contextStart + 1;
166
+ return {
167
+ ...rows,
168
+ items: [
169
+ ...rows.items.slice(0, at),
170
+ switchRow(planSwitch),
171
+ ...rows.items.slice(at),
172
+ ],
173
+ };
174
+ }
175
+ const at = planSwitch.at.toISOString();
176
+ return {
177
+ items: [
178
+ {
179
+ label: (0, composed_text_1.composed)(PAID_UNTIL_KEY, { plan: planSwitch.currentPlanName }),
180
+ value: at,
181
+ type: "date",
182
+ },
183
+ switchRow(planSwitch),
184
+ ...contextRows(context),
185
+ ],
186
+ totalMinorUnits: null,
187
+ currency: null,
188
+ billingDate: at,
189
+ };
190
+ }
145
191
  function latestPaidInvoice(invoices) {
146
192
  return invoices
147
193
  .filter((invoice) => invoice.status === PAID_STATUS && invoice.paidAt)
@@ -156,6 +202,21 @@ function planNamesByProduct(plans) {
156
202
  return productId ? [[productId, plan.name]] : [];
157
203
  }));
158
204
  }
205
+ function scheduledSwitch(subscription, plans) {
206
+ const { planId, pendingPlanId, pendingPlanChangeAt } = subscription ?? {};
207
+ if (!pendingPlanId || !pendingPlanChangeAt)
208
+ return null;
209
+ const current = plans.find((plan) => plan._id === planId);
210
+ const next = plans.find((plan) => plan._id === pendingPlanId);
211
+ if (!current || !next)
212
+ return null;
213
+ return {
214
+ currentPlanName: current.name,
215
+ nextPlanName: next.name,
216
+ isNextPlanFree: (0, free_plan_1.isFreePlan)(next),
217
+ at: new Date(pendingPlanChangeAt),
218
+ };
219
+ }
159
220
  async function loadContext(tenantId) {
160
221
  const [subscription, billingInfo, invoices, plans] = await Promise.all([
161
222
  (0, interface_database_decorators_1.GetModel)(db_1.TenantSubscriptionModel, tenantId).findOne(),
@@ -167,23 +228,27 @@ async function loadContext(tenantId) {
167
228
  ? await (0, billing_state_1.fetchDefaultPaymentMethod)(subscription.stripeCustomerId)
168
229
  : null;
169
230
  return {
170
- paymentMethod,
171
- billingEmail: billingInfo?.billingEmail ?? null,
172
- lastPayment: latestPaidInvoice(invoices),
173
- planNames: planNamesByProduct(plans),
231
+ context: {
232
+ paymentMethod,
233
+ billingEmail: billingInfo?.billingEmail ?? null,
234
+ lastPayment: latestPaidInvoice(invoices),
235
+ planNames: planNamesByProduct(plans),
236
+ },
237
+ planSwitch: scheduledSwitch(subscription, plans),
174
238
  };
175
239
  }
176
240
  class SaasTenantUpcomingInvoiceController extends (0, interface_api_1.Controller)("/api/saas/tenant/upcoming-invoice") {
177
241
  async getNextInvoice(_user, ctx) {
178
242
  const tenantId = (0, request_tenant_1.getRequestTenantId)(ctx);
179
243
  const preview = await (0, preview_1.getUpcomingInvoicePreview)(tenantId);
180
- if (preview.status === "absent")
181
- return NOTHING_TO_INVOICE;
182
244
  if (preview.status === "unavailable") {
183
245
  throw new interface_api_1.HTTPResult(HTTP_SERVICE_UNAVAILABLE, "saas.errors.billing.preview_unavailable");
184
246
  }
185
- const context = await loadContext(tenantId);
186
- return toNextInvoiceRows(preview, context);
247
+ const { context, planSwitch } = await loadContext(tenantId);
248
+ const rows = preview.status === "absent"
249
+ ? NOTHING_TO_INVOICE
250
+ : toNextInvoiceRows(preview, context);
251
+ return planSwitch ? withPlanSwitch(rows, planSwitch, context) : rows;
187
252
  }
188
253
  }
189
254
  exports.SaasTenantUpcomingInvoiceController = SaasTenantUpcomingInvoiceController;
@@ -1 +1 @@
1
- {"version":3,"file":"tenant-upcoming-invoice.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-upcoming-invoice.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tenant-upcoming-invoice.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-upcoming-invoice.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  <script setup lang="ts">
2
2
  import { computed, onMounted, ref } from 'vue'
3
3
  import { LABEL_DAY_FORMAT, SENTENCE_DAY_FORMAT } from './day-formats'
4
- import { planChangeHeadingCase } from './plan-change-heading'
4
+ import { planChangeHeadingCase, targetPlanEyebrow } from './plan-change-heading'
5
5
 
6
6
  interface SummaryRow {
7
7
  key: string
@@ -94,6 +94,15 @@ const headingCase = computed(() =>
94
94
  ),
95
95
  )
96
96
 
97
+ const targetEyebrow = computed(() => {
98
+ const eyebrow = targetPlanEyebrow(preview.value, !!incompatibilities.value)
99
+ if (eyebrow === 'from_date')
100
+ return t(`${KEY_PREFIX}.from_date`, {
101
+ date: day(preview.value?.effectiveAt),
102
+ })
103
+ return eyebrow ? t(`${KEY_PREFIX}.${eyebrow}`) : null
104
+ })
105
+
97
106
  const heading = computed(() => {
98
107
  const params = {
99
108
  plan: props.plan.name,
@@ -255,14 +264,8 @@ onMounted(() => void loadPreview())
255
264
  <p class="text-muted text-sm">{{ priceOf(currentPlan) }}</p>
256
265
  </DmsCard>
257
266
  <DmsCard :padded="true" selected>
258
- <p class="text-muted text-xs">
259
- {{
260
- isDowngrade
261
- ? $t(`${KEY_PREFIX}.from_date`, {
262
- date: day(preview?.effectiveAt),
263
- })
264
- : $t(`${KEY_PREFIX}.from_today`)
265
- }}
267
+ <p v-if="targetEyebrow" class="text-muted text-xs">
268
+ {{ targetEyebrow }}
266
269
  </p>
267
270
  <p class="font-semibold">{{ plan.name }}</p>
268
271
  <p class="text-muted text-sm">{{ priceOf(plan) }}</p>
@@ -79,3 +79,22 @@ export function checkoutHeadingCase(
79
79
  if (isResubscription) return 'resubscribe'
80
80
  return isTrial ? 'trial' : 'upgrade'
81
81
  }
82
+
83
+ /** When the chosen plan starts, as its card in the review says it. */
84
+ export type TargetPlanEyebrow = 'from_today' | 'from_date'
85
+
86
+ /**
87
+ * The eyebrow of the chosen plan's card: from today, or from the renewal for
88
+ * a downgrade; none until the change is priced, and none for a change the
89
+ * workspace does not fit, which starts on no date at all.
90
+ *
91
+ * @param change The priced change, null while it is priced or once refused
92
+ * @param isRefused The workspace holds more than the chosen plan allows
93
+ */
94
+ export function targetPlanEyebrow(
95
+ change: PricedChange | null,
96
+ isRefused: boolean,
97
+ ): TargetPlanEyebrow | null {
98
+ if (isRefused || !change) return null
99
+ return change.kind === 'downgrade' ? 'from_date' : 'from_today'
100
+ }
@@ -18,7 +18,10 @@
18
18
  "sent_to": "Sent to",
19
19
  "last_payment": "Last payment",
20
20
  "paid_on": "Paid {date}",
21
- "subscription_line": "{quantity} × {plan}"
21
+ "subscription_line": "{quantity} × {plan}",
22
+ "paid_until": "{plan} paid until",
23
+ "switch_on": "Switch to {plan}",
24
+ "switch_free_detail": "No renewal: {plan} is not billed"
22
25
  },
23
26
  "invoices": {
24
27
  "caption": "Invoices & credit notes",
@@ -18,7 +18,10 @@
18
18
  "sent_to": "Envoyée à",
19
19
  "last_payment": "Dernier paiement",
20
20
  "paid_on": "Payé le {date}",
21
- "subscription_line": "{quantity} × {plan}"
21
+ "subscription_line": "{quantity} × {plan}",
22
+ "paid_until": "{plan} payé jusqu'au",
23
+ "switch_on": "Passage à {plan}",
24
+ "switch_free_detail": "Pas de renouvellement : {plan} n'est pas facturé"
22
25
  },
23
26
  "invoices": {
24
27
  "caption": "Factures et avoirs",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antelopejs/dms-saas",
3
- "version": "0.7.2",
3
+ "version": "0.7.3",
4
4
  "description": "SaaS module for the AntelopeJS DMS: self-service sign-up and pricing, plans that gate features, Stripe billing, workspace settings and a back office.",
5
5
  "keywords": [
6
6
  "antelopejs",