Merge remote-tracking branch 'origin/newjitsu' into newjitsu

webapps/console/components/Billing/BillingManager.tsx

@@ -214,6 +214,16 @@ const CurrentSubscription: React.FC<{}> = () => {
                 <Edit2 className="ml-1 h-3 w-3" />
               </Link>
             )}
+            {billing.settings?.futureSubscriptionDate && (
+              <div className="text-textLight">
+                Your paid subscription starts on{" "}
+                {new Intl.DateTimeFormat("en-US", {
+                  month: "long",
+                  year: "numeric",
+                  day: "numeric",
+                }).format(new Date(billing.settings?.futureSubscriptionDate))}
+              </div>
+            )}
           </div>
         </div>
         <div>

webapps/console/lib/schema/index.ts

@@ -36,6 +36,8 @@ export const BillingSettings = z.object({
   destinationEvensPerMonth: z.number().default(200_000),
   expiresAt: z.string().optional(),
   renewAfterExpiration: z.boolean().default(false).optional(),
+  //if subscription starts some time in the future, for enterprise plans only
+  futureSubscriptionDate: z.string().optional(),
 });
 
 export type BillingSettings = z.infer<typeof BillingSettings>;

webapps/ee-api/lib/stripe.ts

@@ -73,7 +73,22 @@ export async function getOrCreateCurrentSubscription(
       .log(
         `Custom billing is set for workspace ${workspaceId}: ${JSON.stringify(stripeOptions.customBilling, null, 2)}`
       );
+
     const startDate = new Date(stripeOptions.customBilling.start + "T00:00:00Z");
+    getLog().atInfo().log(`Subscription start date for workspace ${workspaceId}: ${startDate.toISOString()}`);
+    if (startDate.getTime() > new Date().getTime()) {
+      getLog()
+        .atInfo()
+        .log(`Subscription start date for workspace ${workspaceId}: ${startDate.toISOString()} - future`);
+      return {
+        stripeCustomerId: stripeOptions.stripeCustomerId,
+        subscriptionStatus: {
+          //customBilling: true,
+          planId: "free",
+          futureSubscriptionDate: startDate,
+        },
+      };
+    }
     const startDay = startDate.getUTCDate();
     const currentDay = new Date().getUTCDate();
     const expiresAt = new Date();