@oneuptime/common 7.0.5058 → 7.0.5068

package/Models/DatabaseModels/Project.ts

@@ -248,6 +248,84 @@ export default class Project extends TenantModel {
   })
   public paymentProviderCustomerId?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ProjectUser,
+    ],
+    update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+  })
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "Business Details / Billing Address",
+    description:
+      "Business legal name, address and any tax information to appear on invoices.",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    nullable: true,
+    unique: false,
+  })
+  public businessDetails?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ProjectUser,
+    ],
+    update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Business Country (ISO Alpha-2)",
+    description:
+      "Two-letter ISO country code for billing address (e.g., US, GB, DE).",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: false,
+  })
+  public businessDetailsCountry?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ProjectUser,
+    ],
+    update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+  })
+  @TableColumn({
+    type: TableColumnType.Email,
+    title: "Finance / Accounting Email",
+    description:
+      "Invoices, receipts and billing related notifications will be sent to this email in addition to project owner.",
+  })
+  @Column({
+    type: ColumnType.Email,
+    length: ColumnLength.Email,
+    nullable: true,
+    unique: false,
+  })
+  public financeAccountingEmail?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Server/Infrastructure/Postgres/SchemaMigrations/1754671483948-MigrationName.ts

@@ -68,6 +68,28 @@ export class MigrationName1754671483948 implements MigrationInterface {
     await queryRunner.query(
       `ALTER TABLE "StatusPageAnnouncement" ADD "subscriberNotificationStatusMessage" text`,
     );
+    // Set all existing rows' subscriber notification statuses to 'Success' since they were previously considered notified
+    await queryRunner.query(
+      `UPDATE "Incident" SET "subscriberNotificationStatusOnIncidentCreated"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "IncidentPublicNote" SET "subscriberNotificationStatusOnNoteCreated"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "IncidentStateTimeline" SET "subscriberNotificationStatus"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "ScheduledMaintenance" SET "subscriberNotificationStatusOnEventScheduled"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "ScheduledMaintenancePublicNote" SET "subscriberNotificationStatusOnNoteCreated"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "ScheduledMaintenanceStateTimeline" SET "subscriberNotificationStatus"='Success'`,
+    );
+    await queryRunner.query(
+      `UPDATE "StatusPageAnnouncement" SET "subscriberNotificationStatus"='Success'`,
+    );
     await queryRunner.query(
       `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
     );

package/Server/Infrastructure/Postgres/SchemaMigrations/1756293325324-MigrationName.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1756293325324 implements MigrationInterface {
+  public name = "MigrationName1756293325324";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "businessDetails" character varying(500)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "businessDetails"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1756296282627-MigrationName.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1756296282627 implements MigrationInterface {
+  public name = "MigrationName1756296282627";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "businessDetailsCountry" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "businessDetailsCountry"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1756300358095-MigrationName.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1756300358095 implements MigrationInterface {
+  public name = "MigrationName1756300358095";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "financeAccountingEmail" character varying(100)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "financeAccountingEmail"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -161,6 +161,9 @@ import { MigrationName1755110936888 } from "./1755110936888-MigrationName";
 import { MigrationName1755775040650 } from "./1755775040650-MigrationName";
 import { MigrationName1755778495455 } from "./1755778495455-MigrationName";
 import { MigrationName1755778934927 } from "./1755778934927-MigrationName";
+import { MigrationName1756293325324 } from "./1756293325324-MigrationName";
+import { MigrationName1756296282627 } from "./1756296282627-MigrationName";
+import { MigrationName1756300358095 } from "./1756300358095-MigrationName";
 
 export default [
   InitialMigration,
@@ -326,4 +329,7 @@ export default [
   MigrationName1755775040650,
   MigrationName1755778495455,
   MigrationName1755778934927,
+  MigrationName1756293325324,
+  MigrationName1756296282627,
+  MigrationName1756300358095,
 ];

package/Server/Services/BillingService.ts

@@ -80,6 +80,94 @@ export class BillingService extends BaseService {
     await this.stripe.customers.update(id, { name: newName });
   }
 
+  @CaptureSpan()
+  public async updateCustomerBusinessDetails(
+    id: string,
+    businessDetails: string,
+    countryCode?: string | null,
+    financeAccountingEmail?: string | null,
+  ): Promise<void> {
+    if (!this.isBillingEnabled()) {
+      throw new BadDataException(Errors.BillingService.BILLING_NOT_ENABLED);
+    }
+    // Goal: Update Stripe Customer "Billing details" (address fields) rather than invoice footer.
+    // We only have a single free-form textarea. We'll map:
+    //   First non-empty line -> address.line1
+    //   Second non-empty line (if any) and remaining (joined, truncated) -> address.line2
+    // We also persist full text in metadata so we can reconstruct or improve parsing later.
+    // NOTE: Because Stripe requires structured address, any city/state/postal/country detection
+    // would be heuristic; we keep it simple unless we later add structured fields.
+
+    const lines: Array<string> = businessDetails
+      .split(/\r?\n/)
+      .map((l: string) => {
+        return l.trim();
+      })
+      .filter((l: string) => {
+        return l.length > 0;
+      });
+
+    let line1: string | undefined = undefined;
+    let line2: string | undefined = undefined;
+
+    if (lines && lines.length > 0) {
+      const first: string = lines[0]!; // non-null
+      line1 = first.substring(0, 200); // Stripe typical limit safeguard.
+    }
+    if (lines && lines.length > 1) {
+      const rest: string = lines.slice(1).join(", ");
+      line2 = rest.substring(0, 200);
+    }
+
+    const metadata: Record<string, string> = {
+      business_details_full: businessDetails.substring(0, 5000),
+    };
+    if (financeAccountingEmail) {
+      metadata["finance_accounting_email"] = financeAccountingEmail.substring(
+        0,
+        200,
+      );
+    } else {
+      // Remove if cleared
+      metadata["finance_accounting_email"] = "";
+    }
+
+    const updateParams: Stripe.CustomerUpdateParams = {
+      metadata,
+      address: {},
+    };
+
+    // If finance / accounting email provided, set it as the customer email so Stripe sends
+    // invoices / receipts there. (Stripe only supports a single email via API currently.)
+    if (financeAccountingEmail && financeAccountingEmail.trim().length > 0) {
+      updateParams.email = financeAccountingEmail.trim();
+    }
+
+    if (line1) {
+      updateParams.address = updateParams.address || {};
+      updateParams.address.line1 = line1;
+    }
+    if (line2) {
+      updateParams.address = updateParams.address || {};
+      updateParams.address.line2 = line2;
+    }
+    if (countryCode) {
+      updateParams.address = updateParams.address || {};
+      // Stripe expects uppercase 2-letter ISO code
+      updateParams.address.country = countryCode.toUpperCase();
+    }
+
+    if (!line1 && !line2 && !countryCode) {
+      // Clear address if empty details submitted.
+      updateParams.address = {
+        line1: "",
+        line2: "",
+      } as any;
+    }
+
+    await this.stripe.customers.update(id, updateParams);
+  }
+
   @CaptureSpan()
   public async deleteCustomer(id: string): Promise<void> {
     if (!this.isBillingEnabled()) {

package/Server/Services/ProjectService.ts

@@ -273,6 +273,38 @@ export class ProjectService extends DatabaseService<Model> {
     updateBy: UpdateBy<Model>,
   ): Promise<OnUpdate<Model>> {
     if (IsBillingEnabled) {
+      if (
+        updateBy.data.businessDetails ||
+        updateBy.data.businessDetailsCountry ||
+        updateBy.data.financeAccountingEmail
+      ) {
+        // Sync to Stripe.
+        const project: Model | null = await this.findOneById({
+          id: new ObjectID(updateBy.query._id! as string),
+          select: {
+            paymentProviderCustomerId: true,
+            financeAccountingEmail: true,
+          },
+          props: { isRoot: true },
+        });
+
+        if (project?.paymentProviderCustomerId) {
+          try {
+            await BillingService.updateCustomerBusinessDetails(
+              project.paymentProviderCustomerId,
+              (updateBy.data.businessDetails as string) || "",
+              (updateBy.data.businessDetailsCountry as string) || null,
+              (updateBy.data.financeAccountingEmail as string) ||
+                (project as any).financeAccountingEmail ||
+                null,
+            );
+          } catch (err) {
+            logger.error(
+              "Failed to update Stripe customer business details: " + err,
+            );
+          }
+        }
+      }
       if (updateBy.data.enableAutoRechargeSmsOrCallBalance) {
         await NotificationService.rechargeIfBalanceIsLow(
           new ObjectID(updateBy.query._id! as string),

package/Server/Services/StatusPageService.ts

@@ -340,10 +340,26 @@ export class Service extends DatabaseService<StatusPage> {
     projectId: ObjectID,
     statusPageId: ObjectID,
   ): Promise<URL> {
-    const dahboardUrl: URL = await DatabaseConfig.getDashboardUrl();
+    if (!projectId) {
+      throw new BadDataException(
+        "projectId is required to build status page dashboard link",
+      );
+    }
+
+    if (!statusPageId) {
+      throw new BadDataException(
+        "statusPageId is required to build status page dashboard link",
+      );
+    }
+
+    const dashboardUrl: URL = await DatabaseConfig.getDashboardUrl();
+
+    // Defensive: ensure objects have toString
+    const projectIdStr: string = projectId.toString();
+    const statusPageIdStr: string = statusPageId.toString();
 
-    return URL.fromString(dahboardUrl.toString()).addRoute(
-      `/${projectId.toString()}/status-pages/${statusPageId.toString()}`,
+    return URL.fromString(dashboardUrl.toString()).addRoute(
+      `/${projectIdStr}/status-pages/${statusPageIdStr}`,
     );
   }
 

package/Server/Types/Markdown.ts

@@ -203,30 +203,30 @@ export default class Markdown {
         return text as string;
       }
 
-      const isHash: boolean = href.startsWith('#');
-      const isMailTo: boolean = href.startsWith('mailto:');
-      const isTel: boolean = href.startsWith('tel:');
+      const isHash: boolean = href.startsWith("#");
+      const isMailTo: boolean = href.startsWith("mailto:");
+      const isTel: boolean = href.startsWith("tel:");
       const isInternal: boolean =
-        href.startsWith('/') ||
-        href.includes('oneuptime.com') ||
+        href.startsWith("/") ||
+        href.includes("oneuptime.com") ||
         isHash ||
         isMailTo ||
         isTel;
 
       const baseClasses: string = [
-        'font-semibold',
-        'text-indigo-600',
-        'underline',
-        'underline-offset-2',
-        'decoration-indigo-300',
-        'hover:decoration-indigo-500',
-        'hover:text-indigo-500',
-        'transition-colors',
-      ].join(' ');
-
-      const titleAttr: string = title ? ` title="${title}"` : '';
+        "font-semibold",
+        "text-indigo-600",
+        "underline",
+        "underline-offset-2",
+        "decoration-indigo-300",
+        "hover:decoration-indigo-500",
+        "hover:text-indigo-500",
+        "transition-colors",
+      ].join(" ");
+
+      const titleAttr: string = title ? ` title="${title}"` : "";
       const externalAttrs: string = isInternal
-        ? ''
+        ? ""
         : ' target="_blank" rel="noopener noreferrer"';
 
       return `<a href="${href}"${titleAttr} class="${baseClasses}"${externalAttrs}>${text}</a>`;

package/UI/Components/Detail/Detail.tsx

@@ -420,9 +420,8 @@ const Detail: DetailFunction = <T extends GenericObject>(
                 )}
             </div>
           )}
-          {(data === null || data === undefined) && field.placeholder && (
-            <PlaceholderText text={field.placeholder} />
-          )}
+          {(data === null || data === undefined || data === "") &&
+            field.placeholder && <PlaceholderText text={field.placeholder} />}
         </div>
       </div>
     );