@vrplatform/hyperline-client 1.0.30 → 1.0.32

package/src/client.ts

@@ -1,5 +1,5 @@
-import { utc } from '@vrplatform/utils';
-import type { operations, paths } from './_types.generated';
+import type { paths } from './_types.generated';
+import { HyperlineError } from './hyperlineError';
 import { BillableEvents, CreateBillableEvent } from './types';
 import { arrayBufferToBase64 } from './utils';
 
@@ -64,20 +64,13 @@ export class HyperlineAPI {
         (content ? JSON.stringify(content) : null) ||
         'Unknown error';
 
-      if (status === 429) {
-        // get difference between rate limit reset and now
-        const rateLimitReset = utc(result?.headers.get('x-ratelimit-reset'));
-        const diff = rateLimitReset.diff(utc(), 'milliseconds');
-
-        // wait until rate limit resets
-        await new Promise((resolve) => setTimeout(resolve, diff));
-
-        return await this.fetchBasic<T>(path, options, data);
-      } else if (status === 404 && method === 'GET') {
+      if (status === 404 && method === 'GET') {
         return null;
       } else {
-        throw new Error(
-          `Hyperline Error ${status} (${statusText}) in ${path} for ${method}: ${message}`
+        throw new HyperlineError(
+          `Hyperline Error ${status} (${statusText}) in ${path} for ${method}: ${message}`,
+          status,
+          result.headers.get('Retry-After')
         );
       }
     } else if (result.headers.get('content-type')?.includes('application/pdf'))
@@ -125,6 +118,25 @@ export class HyperlineAPI {
 
   // CUSTOMER
 
+  async getOrganisation(id: string) {
+    if (!id) throw new Error('Missing organisation ID');
+    return await this.fetch<
+      paths['/v1/organisations/{id}']['get']['responses'][200]['content']['application/json']
+    >(`/v1/organisations/${id}`);
+  }
+
+  async updateOrganisation(
+    id: string,
+    data: NonNullable<
+      paths['/v1/organisations/{id}']['patch']['requestBody']
+    >['content']['application/json']
+  ) {
+    if (!id) throw new Error('Missing organisation ID');
+    return await this.fetch<
+      paths['/v1/organisations/{id}']['patch']['responses'][200]['content']['application/json']
+    >(`/v1/organisations/${id}`, { method: 'PATCH' }, data);
+  }
+
   async getCustomer(id?: string) {
     if (!id) {
       this.logger.error('Missing customer ID', { id });
@@ -132,8 +144,8 @@ export class HyperlineAPI {
     }
 
     return await this.fetch<
-      paths['/v1/customers/{id}']['get']['responses'][200]['content']['application/json']
-    >(`/v1/customers/${id}`);
+      paths['/v2/customers/{id}']['get']['responses'][200]['content']['application/json']
+    >(`/v2/customers/${id}`);
   }
 
   async getCustomerById(id?: string) {
@@ -142,48 +154,51 @@ export class HyperlineAPI {
       throw new Error('Missing tenant ID');
     }
 
-    const results = await this.fetch<
-      paths['/v1/customers']['get']['responses'][200]['content']['application/json']
-    >(`/v1/customers?external_id__equals=${id}`);
+    const results = await this.getCustomers({
+      external_id__equals: id,
+      status: 'all',
+      limit: 1,
+    });
 
     return results?.data[0];
   }
 
   async getCustomers(
-    skip = 0,
-    take = 100,
-    query: operations['getCustomers']['parameters']['query'] = {}
+    query: paths['/v2/customers']['get']['parameters']['query'] = {}
   ) {
     const queryParams = new URLSearchParams();
-    queryParams.set('take', take.toString());
-    queryParams.set('skip', skip.toString());
 
-    for (const [key, value] of Object.entries(query)) {
+    for (const [key, value] of Object.entries({ limit: 100, ...query })) {
       if (value === undefined || value === null) continue;
       queryParams.set(key, value.toString());
     }
 
     return await this.fetch<
-      paths['/v1/customers']['get']['responses'][200]['content']['application/json']
-    >(`/v1/customers?${queryParams.toString()}`);
+      paths['/v2/customers']['get']['responses'][200]['content']['application/json']
+    >(`/v2/customers?${queryParams.toString()}`);
   }
 
   async getAllCustomers(
-    items: paths['/v1/customers']['get']['responses'][200]['content']['application/json']['data'] = [],
-    query: operations['getCustomers']['parameters']['query'] = {}
+    items: paths['/v2/customers']['get']['responses'][200]['content']['application/json']['data'] = [],
+    query: paths['/v2/customers']['get']['parameters']['query'] = {}
   ): Promise<
-    paths['/v1/customers']['get']['responses'][200]['content']['application/json']['data']
+    paths['/v2/customers']['get']['responses'][200]['content']['application/json']['data']
   > {
-    const { data } = (await this.getCustomers(items.length, 100, {
+    await new Promise((resolve) => setTimeout(resolve, 300));
+    const page = await this.getCustomers({
       status: 'all',
       ...query,
-    })) || {
-      data: [],
-    };
+    });
+    if (!page) throw new Error('Customer list not found');
+    if (page.has_more && !page.next_cursor)
+      throw new Error('Incomplete customer list');
 
-    return data.length
-      ? this.getAllCustomers([...items, ...data], { status: 'all', ...query })
-      : [...items, ...data];
+    return page.next_cursor
+      ? this.getAllCustomers([...items, ...page.data], {
+          ...query,
+          cursor: page.next_cursor,
+        })
+      : [...items, ...page.data];
   }
 
   async createCustomer(
@@ -249,6 +264,39 @@ export class HyperlineAPI {
     >(`/v1/customers/${id}/portal`);
   }
 
+  // SUBSCRIPTION TEMPLATES
+
+  async getSubscriptionTemplate(id: string) {
+    if (!id) {
+      this.logger.error('Missing subscription template ID', { id });
+      throw new Error('Missing subscription template ID');
+    }
+
+    return await this.fetch<
+      paths['/v1/subscriptions/templates/{id}']['get']['responses'][200]['content']['application/json']
+    >(`/v1/subscriptions/templates/${id}`);
+  }
+
+  async previewSubscriptionTransition(
+    data: NonNullable<
+      paths['/v2/subscriptions/transitions/preview']['post']['requestBody']
+    >['content']['application/json']
+  ) {
+    return await this.fetch<
+      paths['/v2/subscriptions/transitions/preview']['post']['responses'][200]['content']['application/json']
+    >('/v2/subscriptions/transitions/preview', { method: 'POST' }, data);
+  }
+
+  async createSubscriptionTransition(
+    data: NonNullable<
+      paths['/v2/subscriptions/transitions']['post']['requestBody']
+    >['content']['application/json']
+  ) {
+    return await this.fetch<
+      paths['/v2/subscriptions/transitions']['post']['responses'][200]['content']['application/json']
+    >('/v2/subscriptions/transitions', { method: 'POST' }, data);
+  }
+
   // SUBSCRIPTION
 
   async getSubscription(id: string, liveBilling = false) {
@@ -267,7 +315,7 @@ export class HyperlineAPI {
   async getSubscriptions(
     skip = 0,
     take = 100,
-    query: operations['getSubscriptions']['parameters']['query'] = {
+    query: paths['/v2/subscriptions']['get']['parameters']['query'] = {
       status: 'all',
     }
   ) {
@@ -287,7 +335,7 @@ export class HyperlineAPI {
 
   async getAllSubscriptions(
     items: paths['/v2/subscriptions']['get']['responses'][200]['content']['application/json']['data'] = [],
-    query: operations['getSubscriptions']['parameters']['query'] = {}
+    query: paths['/v2/subscriptions']['get']['parameters']['query'] = {}
   ): Promise<
     paths['/v2/subscriptions']['get']['responses'][200]['content']['application/json']['data']
   > {
@@ -312,6 +360,12 @@ export class HyperlineAPI {
     >('/v2/subscriptions', { method: 'POST' }, data);
   }
 
+  async activateSubscription(id: string) {
+    return await this.fetch<
+      paths['/v1/subscriptions/{id}/activate']['post']['responses'][200]['content']['application/json']
+    >(`/v1/subscriptions/${id}/activate`, { method: 'POST' });
+  }
+
   async updateSubscription(
     id: string,
     data: NonNullable<
@@ -334,6 +388,17 @@ export class HyperlineAPI {
     >(`/v1/subscriptions/${id}/update`, { method: 'POST' }, data);
   }
 
+  async createSubscriptionUpdates(
+    id: string,
+    data: NonNullable<
+      paths['/v1/subscriptions/{id}/update-many']['post']['requestBody']
+    >['content']['application/json']
+  ) {
+    return await this.fetch<
+      paths['/v1/subscriptions/{id}/update-many']['post']['responses'][201]['content']['application/json']
+    >(`/v1/subscriptions/${id}/update-many`, { method: 'POST' }, data);
+  }
+
   async cancelSubscription(
     id: string,
     data: NonNullable<
@@ -359,27 +424,30 @@ export class HyperlineAPI {
     });
   }
 
-  // PLAN
-
-  async getPlan(id: string) {
-    if (!id) {
-      this.logger.error('Missing plan ID', { id });
-      throw new Error('Missing plan ID');
-    }
+  // INVOICE
 
+  async createInvoice(
+    data: NonNullable<
+      paths['/v1/invoices']['post']['requestBody']
+    >['content']['application/json']
+  ) {
     return await this.fetch<
-      paths['/v1/plans/{id}']['get']['responses'][200]['content']['application/json']
-    >(`/v1/plans/${id}`);
+      paths['/v1/invoices']['post']['responses'][201]['content']['application/json']
+    >('/v1/invoices', { method: 'POST' }, data);
   }
 
-  async getPlans(skip = 0, take = 100) {
+  async updateInvoice(
+    id: string,
+    data: NonNullable<
+      paths['/v1/invoices/{id}']['patch']['requestBody']
+    >['content']['application/json']
+  ) {
+    if (!id) throw new Error('Missing invoice ID');
     return await this.fetch<
-      paths['/v1/plans']['get']['responses'][200]['content']['application/json']
-    >(`/v1/plans?take=${take}&skip=${skip}`);
+      paths['/v1/invoices/{id}']['patch']['responses'][200]['content']['application/json']
+    >(`/v1/invoices/${id}`, { method: 'PATCH' }, data);
   }
 
-  // INVOICE
-
   async getInvoice(id: string) {
     if (!id) {
       this.logger.error('Missing invoice ID', { id });
@@ -387,47 +455,40 @@ export class HyperlineAPI {
     }
 
     return await this.fetch<
-      paths['/v1/invoices/{id}']['get']['responses'][200]['content']['application/json']
-    >(`/v1/invoices/${id}`);
+      paths['/v2/invoices/{id}']['get']['responses'][200]['content']['application/json']
+    >(`/v2/invoices/${id}`);
+  }
+
+  async validateInvoice(id: string) {
+    if (!id) throw new Error('Missing invoice ID');
+    return await this.fetch<
+      paths['/v1/invoices/{id}/validate']['post']['responses'][200]['content']['application/json']
+    >(`/v1/invoices/${id}/validate`, { method: 'POST' });
   }
 
   async getInvoices(
-    skip = 0,
-    take = 100,
-    query: operations['getInvoices']['parameters']['query'] = { status: 'all' }
+    query: paths['/v2/invoices']['get']['parameters']['query'] = {}
   ) {
     const queryParams = new URLSearchParams();
-    queryParams.set('take', take.toString());
-    queryParams.set('skip', skip.toString());
-
-    for (const [key, value] of Object.entries(query)) {
+    for (const [key, value] of Object.entries({
+      limit: 100,
+      status: 'all',
+      ...query,
+    })) {
       if (value === undefined || value === null) continue;
       queryParams.set(key, value.toString());
     }
 
     return await this.fetch<
-      paths['/v1/invoices']['get']['responses'][200]['content']['application/json']
-    >(`/v1/invoices?${queryParams.toString()}`);
+      paths['/v2/invoices']['get']['responses'][200]['content']['application/json']
+    >(`/v2/invoices?${queryParams.toString()}`);
   }
 
   async getInvoicesByCustomerId(
     id: string,
-    filters?: Partial<operations['getInvoices']['parameters']['query']>
+    filters?: paths['/v2/invoices']['get']['parameters']['query']
   ) {
-    const queryParams = new URLSearchParams();
-    queryParams.append('customerId__equals', id);
-
-    if (filters) {
-      Object.entries(filters).forEach(([key, value]) => {
-        if (value !== undefined && value !== null) {
-          queryParams.append(key, value.toString());
-        }
-      });
-    }
-
-    return await this.fetch<
-      paths['/v1/invoices']['get']['responses'][200]['content']['application/json']
-    >(`/v1/invoices?${queryParams.toString()}`);
+    return await this.getInvoices({ ...filters, customer_id: id });
   }
 
   async getInvoiceDownload(id: string) {
@@ -441,21 +502,20 @@ export class HyperlineAPI {
   }
 
   async getAllInvoices(
-    items: paths['/v1/invoices']['get']['responses'][200]['content']['application/json']['data'] = [],
-    query: operations['getInvoices']['parameters']['query'] = { status: 'all' }
+    items: paths['/v2/invoices']['get']['responses'][200]['content']['application/json']['data'] = [],
+    query: paths['/v2/invoices']['get']['parameters']['query'] = {}
   ): Promise<
-    paths['/v1/invoices']['get']['responses'][200]['content']['application/json']['data']
+    paths['/v2/invoices']['get']['responses'][200]['content']['application/json']['data']
   > {
-    const { data } = (await this.getInvoices(items.length, 100, {
-      status: 'all',
-      ...query,
-    })) || {
-      data: [],
-    };
+    const page = await this.getInvoices(query);
+    if (!page) throw new Error('Invoice list not found');
 
-    return data.length
-      ? this.getAllInvoices([...items, ...data], { status: 'all', ...query })
-      : [...items, ...data];
+    return page.next_cursor
+      ? this.getAllInvoices([...items, ...page.data], {
+          ...query,
+          cursor: page.next_cursor,
+        })
+      : [...items, ...page.data];
   }
 
   async voidInvoice(
@@ -505,7 +565,7 @@ export class HyperlineAPI {
   }
 
   async createBillableEvent(data: CreateBillableEvent[]) {
-    if (!data.length) return { events_created: [] };
+    if (!data.length) return { events_created: [], events_failed: [] };
 
     return await this.fetchIngest<BillableEvents>(
       '/v1/events/batch',

package/src/const.ts

@@ -7,15 +7,20 @@ export const DEMO_TEST_PARTNER_TENANT_ID =
   '0b6a7bd6-56cc-46b5-b2ab-1bd7d1e994fa';
 export const XIMPLIFI_TENANT_ID = 'd6ab2bbe-e0fc-48d9-89a3-c3c05f4e79b5';
 export const TEST_TENANT_ID = 'fa4d1a20-2f47-4021-9c72-c5a809be9c48';
-
-// Customers
-export const XIMPLIFI_CUSTOMER_ID = 'cus_HDUZawnaJbPa9p';
-export const XIMPLIFI_DEV_CUSTOMER_ID = 'cus_dNUGCETGYVu3ZV';
+export const BOBW_TENANT_ID = 'cb23b44b-c96b-4fc4-95aa-1bf71b1c0f92';
+export const HOSTAWAY_PRODUCTION_TENANT_ID =
+  '4d1583e6-1c76-4bd2-bf8d-ca07d45eedb7';
+export const HOSTAWAY_STAGING_TENANT_ID =
+  '10834664-606b-4b92-acb9-f3e454632f7a';
+export const HOSTAWAY_COSELLING_TENANT_ID =
+  '636dcf13-7b34-4a7f-9b45-60bbb1380d15';
+export const HOSTAWAY_PARTNER_TENANT_IDS = [
+  HOSTAWAY_STAGING_TENANT_ID,
+  HOSTAWAY_PRODUCTION_TENANT_ID,
+  HOSTAWAY_COSELLING_TENANT_ID,
+];
 
 // Coupons
-export const XIMPLIFI_COUPON_ID = 'cou_MXCaik3r19_Xkn';
-export const XIMPLIFI_DEV_COUPON_ID = 'cou_MGtxHbT8IR1gK9';
-
 export const ACCOUNTING_PARTNER_COUPON_ID = 'cou_PJQ328MBAD9kxY';
 export const ACCOUNTING_PARTNER_DEV_COUPON_ID = 'cou_y6UfaI2X1m34Qg';
 
@@ -40,32 +45,39 @@ export const HYPERLINE_PARTNER_TIER_COUPON_IDS = {
   60: HYPERLINE_PARTNER_TIER_60_PERCENT_COUPON_ID,
 } as const;
 
-// Plans
-export const HYPERLINE_DEFAULT_PLAN_ID = 'plan_Dyb5P0ICZ6HsIT';
-export const HYPERLINE_DEFAULT_DEV_PLAN_ID = 'plan_UTCVXFQnKD0oMS';
-export const HYPERLINE_DEFAULT_PLAN_NAME = 'All-in-One VRP Subscription';
-export const HYPERLINE_DEFAULT_PRODUCT_ID = 'itm_9NU7ffT14I4ris';
-export const HYPERLINE_DEFAULT_MIN_AMOUNT = 12500;
+// Subscription templates
 
-export const HYPERLINE_NEW_PRICING_DIRECT_PRODUCT_ID = 'itm_VeR6AJi9OyUQN2';
-export const HYPERLINE_NEW_PRICING_PARTNER_CLIENT_PRODUCT_ID =
-  'itm_wrrT0HuAZ8Tlh1';
+export const DIRECT_PRICING_TEMPLATE_ID = 'subt_Knj7TspKQNAdgE';
+export const DIRECT_PRICING_DEV_TEMPLATE_ID = 'subt_3kdBL2APUz94Vh';
 
-export const HYPERLINE_PARTNER_PLAN_ID = 'plan_vkYJcCz7z0XD0N';
-export const HYPERLINE_PARTNER_DEV_PLAN_ID = 'plan_8qtj8T4j0W3oiS';
-export const HYPERLINE_PARTNER_PLAN_NAME = 'VRP Subscription - Partners';
-export const HYPERLINE_PARTNER_PRODUCT_ID = 'itm_AJBM0_jPsrqizl';
+export const PARTNER_CLIENT_PRICING_TEMPLATE_ID = 'subt_p0bWvUpe59ilo4';
+export const PARTNER_CLIENT_PRICING_DEV_TEMPLATE_ID = 'subt_c972Mz800ZB3C8';
 
-export const GL_HYPERLINE_DEFAULT_PLAN_ID = 'plan_JXviWSpU5yuokD';
-export const GL_HYPERLINE_DEFAULT_DEV_PLAN_ID = 'plan_Nnozk8_TfYqTkj';
-export const GL_HYPERLINE_DEFAULT_PLAN_NAME = 'VRTrust Subscription';
-export const GL_HYPERLINE_DEFAULT_PRODUCT_ID = 'itm_NRTRBQ0fc8bFGW';
-export const GL_HYPERLINE_DEFAULT_MIN_AMOUNT = 25000;
+export const PARTNER_PRICING_TEMPLATE_ID = 'subt_qt58CknWGtPHxH';
+export const PARTNER_PRICING_DEV_TEMPLATE_ID = 'subt_NIoe1kA3Xs4353';
+
+export const HOSTAWAY_PRICING_TEMPLATE_ID = 'subt_gVo8boDZBZvsZk';
+export const HOSTAWAY_PRICING_DEV_TEMPLATE_ID = 'subt_PkEm701PH78Bgn';
 
-export const GL_HYPERLINE_PARTNER_PLAN_ID = 'plan_vyxckdvUi8X_mr';
-export const GL_HYPERLINE_PARTNER_DEV_PLAN_ID = 'plan_CVXQ47ErOWANhJ';
-export const GL_HYPERLINE_PARTNER_PLAN_NAME = 'VRTrust Subscription - Partners';
+export const BOBW_PRICING_TEMPLATE_ID = 'subt_XpHcieqR2Exn4q';
+export const BOBW_PRICING_DEV_TEMPLATE_ID = 'subt_yRmLj6Fdr5R9Sh';
+
+export const SUBSCRIPTION_TEMPLATE_NAMES = [
+  'VRPlatform Subscription - Direct',
+  'VRPlatform Subscription - Partner Clients',
+  'VRPlatform Subscription - Partner',
+  'VRPlatform Subscription - Hostaway',
+  'VRPlatform Subscription - BobW',
+] as const;
+
+// Product identifiers retained only for historical invoice comparisons.
+export const HYPERLINE_DEFAULT_PRODUCT_ID = 'itm_9NU7ffT14I4ris';
+export const HYPERLINE_PARTNER_PRODUCT_ID = 'itm_AJBM0_jPsrqizl';
+export const GL_HYPERLINE_DEFAULT_PRODUCT_ID = 'itm_NRTRBQ0fc8bFGW';
 export const GL_HYPERLINE_PARTNER_PRODUCT_ID = 'itm_bE4y9lhrZ6Qtsf';
+export const HYPERLINE_NEW_PRICING_DIRECT_PRODUCT_ID = 'itm_VeR6AJi9OyUQN2';
+export const HYPERLINE_NEW_PRICING_PARTNER_CLIENT_PRODUCT_ID =
+  'itm_wrrT0HuAZ8Tlh1';
 
 export const WEBHOOKS = {
   'payment_method.created': 'hyperline_payment_method_created',
@@ -73,6 +85,7 @@ export const WEBHOOKS = {
   'payment_method.deleted': 'hyperline_payment_method_deleted',
   'payment_method.expired': 'hyperline_payment_method_expired',
   'subscription.activated': 'hyperline_subscription_status_changed',
+  'subscription.updated': 'hyperline_subscription_status_changed',
   'subscription.reactivated': 'hyperline_subscription_status_changed',
   'subscription.cancellation_scheduled':
     'hyperline_subscription_cancellation_scheduled',

package/src/hyperlineError.ts

@@ -0,0 +1,17 @@
+export class HyperlineError extends Error {
+  readonly retryAt?: Date;
+
+  constructor(
+    message: string,
+    readonly status: number,
+    retryAfter: string | null
+  ) {
+    super(message);
+    this.name = 'HyperlineError';
+    if (status !== 429 || retryAfter === null) return;
+    const seconds = Number(retryAfter);
+    if (!Number.isFinite(seconds) || seconds < 0)
+      throw new Error('Invalid Hyperline Retry-After header');
+    this.retryAt = new Date(Date.now() + seconds * 1000);
+  }
+}

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './client';
 export * from './const';
 export * from './hooks';
+export * from './hyperlineError';
 export * from './types';
 export * from './utils';

package/src/types.ts

@@ -14,18 +14,9 @@ export type HyperlinePayload<T extends HyperlineWebhook> = {
   data: Record<string, any>;
 };
 
-export type BillableEvent = {
-  record: {
-    id: '202408_cus_w_Q7M9bXcHMKB6';
-    amount: 26;
-  };
-  timestamp: '2024-08-07T07:35:20.307Z';
-  event_type: 'api_call';
-  customer_id: 'cus_w_Q7M9bXcHMKB6';
-};
-
 export type BillableEvents = {
-  events_created: BillableEvent[];
+  events_created: CreateBillableEvent[];
+  events_failed: unknown[];
 };
 
 export type CreateBillableEvent = {
@@ -39,5 +30,6 @@ export type CreateBillableEvent = {
     amount?: number;
     amountGl?: number;
     amountNonGl?: number;
+    amountAll?: number;
   };
 };

package/src/utils/calculateMrr.ts

@@ -1,11 +1,3 @@
-import {
-  GL_HYPERLINE_DEFAULT_DEV_PLAN_ID,
-  GL_HYPERLINE_DEFAULT_MIN_AMOUNT,
-  GL_HYPERLINE_DEFAULT_PLAN_ID,
-  HYPERLINE_DEFAULT_DEV_PLAN_ID,
-  HYPERLINE_DEFAULT_MIN_AMOUNT,
-  HYPERLINE_DEFAULT_PLAN_ID,
-} from '../const';
 import { useHyperlineByToken } from '../hooks';
 import type { HyperlineEntities } from '../types';
 
@@ -19,22 +11,22 @@ export async function calculateMrr(
       liveBilling?: boolean
     ): Promise<{
       customer_id: string;
-      plan_id: string | null;
-      products?: unknown[];
       coupons?: (
         | {
             type: 'amount';
-            repeat: 'once' | 'forever' | 'custom';
+            repeat: HyperlineEntities['Coupon']['repeat'];
             discount_amount: number;
           }
         | {
             type: 'percent';
-            repeat: 'once' | 'forever' | 'custom';
+            repeat: HyperlineEntities['Coupon']['repeat'];
             discount_percent: number;
           }
       )[];
       phases?: {
         type: HyperlineEntities['SubscriptionDetails']['phases'][number]['type'];
+        status?: HyperlineEntities['SubscriptionDetails']['phases'][number]['status'];
+        do_not_invoice_phase: boolean;
         products: {
           min_amount?: number | null;
           max_amount?: number | null;
@@ -62,24 +54,27 @@ export async function calculateMrr(
     } | null>;
     getInvoicesByCustomerId(id: string): Promise<{
       data: {
-        emitted_at: string;
+        issued_at: string;
         total_amount: number;
       }[];
     } | null>;
   } = useHyperlineByToken(process.env.HYPERLINE_TOKEN!),
   includeLiveBilling = false
 ) {
-  const _subscription = await hyperline.getSubscription(
+  const subscription = await hyperline.getSubscription(
     subscriptionId,
     includeLiveBilling
   );
-  if (!_subscription) throw new Error('Subscription not found');
-
-  const { products, phases, ...subscription } = _subscription;
+  if (!subscription) throw new Error('Subscription not found');
 
   let mrr = 0;
   const activeListings = _activeListings || 0;
-  const phase = phases?.find((x) => x.type === 'standard');
+  const phase = subscription.phases?.find(
+    (x) =>
+      x.type === 'standard' &&
+      x.status !== 'finished' &&
+      !x.do_not_invoice_phase
+  );
   const product = phase?.products?.[0];
   const type = product?.prices?.[0].type;
   if (type === 'volume') {
@@ -148,20 +143,7 @@ export async function calculateMrr(
         ? firstTier.amount *
           ((firstTier.to - firstTier.from) / firstTier.unit_count)
         : 0;
-    const plan_min_amount = [
-      GL_HYPERLINE_DEFAULT_PLAN_ID,
-      GL_HYPERLINE_DEFAULT_DEV_PLAN_ID,
-    ].includes(subscription.plan_id!)
-      ? GL_HYPERLINE_DEFAULT_MIN_AMOUNT
-      : [HYPERLINE_DEFAULT_PLAN_ID, HYPERLINE_DEFAULT_DEV_PLAN_ID].includes(
-            subscription.plan_id!
-          )
-        ? HYPERLINE_DEFAULT_MIN_AMOUNT
-        : 0;
-
-    const min_amount =
-      ((product_min_amount || plan_min_amount || inferred_min_amount) ?? 0) /
-      100;
+    const min_amount = (product_min_amount ?? inferred_min_amount) / 100;
     mrr = Math.max(mrr, min_amount);
 
     const max_amount = ((product_max_amount || 0) ?? 0) / 100;
@@ -185,7 +167,7 @@ export async function calculateMrr(
 
     // sort invoices by date
     const invoices = data
-      ?.sort((a, b) => a.emitted_at.localeCompare(b.emitted_at))
+      ?.sort((a, b) => a.issued_at.localeCompare(b.issued_at))
       .reverse();
 
     // get the last invoice

package/src/utils/index.ts

@@ -1,3 +1,2 @@
 export * from './arrayBufferToBase64';
 export * from './calculateMrr';
-export * from './isTestingTeam';

package/build/main/utils/isTestingTeam.d.ts

@@ -1,5 +0,0 @@
-export declare const isTestingTeam: (tenant: {
-    id?: string;
-    partnerId?: string | null;
-    billingPartnerId?: string | null;
-}) => boolean;

package/build/main/utils/isTestingTeam.js

@@ -1,4 +0,0 @@
-import { DEMO_TEST_PARTNER_TENANT_ID, TEST_TENANT_ID } from '../const';
-export const isTestingTeam = (tenant) => tenant.id === TEST_TENANT_ID ||
-    [tenant.id, tenant.partnerId, tenant.billingPartnerId].includes(DEMO_TEST_PARTNER_TENANT_ID);
-//# sourceMappingURL=isTestingTeam.js.map

package/build/main/utils/isTestingTeam.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isTestingTeam.js","sourceRoot":"src/","sources":["utils/isTestingTeam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAI7B,EAAE,EAAE,CACH,MAAM,CAAC,EAAE,KAAK,cAAc;IAC5B,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAC7D,2BAA2B,CAC5B,CAAC","sourcesContent":["import { DEMO_TEST_PARTNER_TENANT_ID, TEST_TENANT_ID } from '../const';\n\nexport const isTestingTeam = (tenant: {\n  id?: string;\n  partnerId?: string | null;\n  billingPartnerId?: string | null;\n}) =>\n  tenant.id === TEST_TENANT_ID ||\n  [tenant.id, tenant.partnerId, tenant.billingPartnerId].includes(\n    DEMO_TEST_PARTNER_TENANT_ID\n  );\n"]}

package/build/module/utils/isTestingTeam.d.ts

@@ -1,5 +0,0 @@
-export declare const isTestingTeam: (tenant: {
-    id?: string;
-    partnerId?: string | null;
-    billingPartnerId?: string | null;
-}) => boolean;