Invoicing timezones (#5515)

Author: colegottdank

bifrost/lib/clients/jawnTypes/private.ts

@@ -16595,6 +16595,8 @@ Json: JsonObject;
       endDate: string;
       /** Format: double */
       amountCents: number;
+      /** Format: double */
+      subtotalCents: number | null;
       notes: string | null;
       createdAt: string;
     };
@@ -16772,6 +16774,8 @@ Json: JsonObject;
       dashboardUrl: string;
       /** Format: double */
       amountCents: number;
+      /** Format: double */
+      subtotalCents: number;
       ptbInvoiceId: string;
     };
     ResultSuccess_CreateInvoiceResponse_: {

bifrost/lib/clients/jawnTypes/public.ts

@@ -4734,6 +4734,8 @@ Json: JsonObject;
       endDate: string;
       /** Format: double */
       amountCents: number;
+      /** Format: double */
+      subtotalCents: number | null;
       notes: string | null;
       createdAt: string;
     };

docs/swagger.json

@@ -14385,6 +14385,11 @@
 						"type": "number",
 						"format": "double"
 					},
+					"subtotalCents": {
+						"type": "number",
+						"format": "double",
+						"nullable": true
+					},
 					"notes": {
 						"type": "string",
 						"nullable": true
@@ -14401,6 +14406,7 @@
 					"startDate",
 					"endDate",
 					"amountCents",
+					"subtotalCents",
 					"notes",
 					"createdAt"
 				],

helicone-mcp/src/types/public.ts

@@ -4734,6 +4734,8 @@ Json: JsonObject;
       endDate: string;
       /** Format: double */
       amountCents: number;
+      /** Format: double */
+      subtotalCents: number | null;
       notes: string | null;
       createdAt: string;
     };

supabase/migrations/20260115011903_ptb_invoices_subtotal.sql

@@ -0,0 +1,4 @@
+-- Add subtotal_cents to track pre-discount amount for wallet crediting
+-- Nullable for backwards compatibility with existing invoices
+ALTER TABLE "public"."ptb_invoices"
+ADD COLUMN "subtotal_cents" BIGINT;

valhalla/jawn/src/controllers/private/adminWalletController.ts

@@ -30,6 +30,19 @@ import {
   CreateInvoiceResponse,
 } from "../../managers/admin/InvoicingManager";
 
+// Date normalization helpers for invoice date boundaries
+const normalizeToStartOfDay = (dateStr: string): Date => {
+  const date = new Date(dateStr);
+  date.setUTCHours(0, 0, 0, 0);
+  return date;
+};
+
+const normalizeToEndOfDay = (dateStr: string): Date => {
+  const date = new Date(dateStr);
+  date.setUTCHours(23, 59, 59, 999);
+  return date;
+};
+
 interface DashboardData {
   organizations: Array<{
     orgId: string;
@@ -566,8 +579,8 @@ export class AdminWalletController extends Controller {
   ): Promise<Result<ModelSpend[], string>> {
     await authCheckThrow(request.authParams.userId);
 
-    const start = new Date(startDate);
-    const end = new Date(endDate);
+    const start = normalizeToStartOfDay(startDate);
+    const end = normalizeToEndOfDay(endDate);
 
     if (isNaN(start.getTime()) || isNaN(end.getTime())) {
       return err("Invalid date format");
@@ -668,8 +681,8 @@ export class AdminWalletController extends Controller {
   ): Promise<Result<CreateInvoiceResponse, string>> {
     await authCheckThrow(request.authParams.userId);
 
-    const start = new Date(body.startDate);
-    const end = new Date(body.endDate);
+    const start = normalizeToStartOfDay(body.startDate);
+    const end = normalizeToEndOfDay(body.endDate);
 
     if (isNaN(start.getTime()) || isNaN(end.getTime())) {
       return err("Invalid date format");

valhalla/jawn/src/managers/admin/InvoicingManager.ts

@@ -26,6 +26,7 @@ export interface CreateInvoiceResponse {
   hostedInvoiceUrl: string | null;
   dashboardUrl: string;
   amountCents: number;
+  subtotalCents: number;
   ptbInvoiceId: string;
 }
 
@@ -173,16 +174,8 @@ export class InvoicingManager {
       });
 
       // 5. Create the invoice (in draft mode)
-      const periodStart = startDate.toLocaleDateString("en-US", {
-        month: "short",
-        day: "numeric",
-        year: "numeric",
-      });
-      const periodEnd = endDate.toLocaleDateString("en-US", {
-        month: "short",
-        day: "numeric",
-        year: "numeric",
-      });
+      const periodStart = startDate.toISOString().split("T")[0];
+      const periodEnd = endDate.toISOString().split("T")[0];
 
       const invoice = await stripe.invoices.create({
         customer: stripeCustomerId,
@@ -200,6 +193,7 @@ export class InvoicingManager {
 
       // 6. Create invoice items with discounts applied
       let totalAmountCents = 0;
+      let totalSubtotalCents = 0;
 
       for (const item of spendResult.data) {
         const baseSubtotalUsd = parseFloat(item.cost);
@@ -216,11 +210,13 @@ export class InvoicingManager {
 
         const discountPercent = findDiscount(discounts, item.model, item.provider);
         const totalUsd = subtotalUsd * (1 - discountPercent / 100);
+        const subtotalCents = Math.round(subtotalUsd * 100);
         const amountCents = Math.round(totalUsd * 100);
 
         if (amountCents <= 0) continue;
 
         totalAmountCents += amountCents;
+        totalSubtotalCents += subtotalCents;
 
         const promptTokens = parseInt(item.prompt_tokens, 10) || 0;
         const completionTokens = parseInt(item.completion_tokens, 10) || 0;
@@ -240,21 +236,39 @@ export class InvoicingManager {
         });
       }
 
-      // 7. Record in ptb_invoices
-      const ptbResult = await dbExecute<{ id: string }>(
-        `INSERT INTO ptb_invoices (organization_id, stripe_invoice_id, start_date, end_date, amount_cents, notes)
-         VALUES ($1, $2, $3, $4, $5, $6)
+      // 7. Record in ptb_invoices (with fallback if subtotal_cents column doesn't exist yet)
+      let ptbResult = await dbExecute<{ id: string }>(
+        `INSERT INTO ptb_invoices (organization_id, stripe_invoice_id, start_date, end_date, amount_cents, subtotal_cents, notes)
+         VALUES ($1, $2, $3, $4, $5, $6, $7)
          RETURNING id`,
         [
           this.orgId,
           invoice.id,
           startDate,
           endDate,
           totalAmountCents,
+          totalSubtotalCents,
           `Auto-created invoice for ${orgName}`,
         ]
       );
 
+      // If subtotal_cents column doesn't exist yet, fall back to insert without it
+      if (ptbResult.error && JSON.stringify(ptbResult.error).includes("42703")) {
+        ptbResult = await dbExecute<{ id: string }>(
+          `INSERT INTO ptb_invoices (organization_id, stripe_invoice_id, start_date, end_date, amount_cents, notes)
+           VALUES ($1, $2, $3, $4, $5, $6)
+           RETURNING id`,
+          [
+            this.orgId,
+            invoice.id,
+            startDate,
+            endDate,
+            totalAmountCents,
+            `Auto-created invoice for ${orgName}`,
+          ]
+        );
+      }
+
       if (ptbResult.error) {
         console.error("Failed to record invoice in ptb_invoices:", ptbResult.error);
       }
@@ -266,6 +280,7 @@ export class InvoicingManager {
         hostedInvoiceUrl: null,
         dashboardUrl,
         amountCents: totalAmountCents,
+        subtotalCents: totalSubtotalCents,
         ptbInvoiceId: ptbResult.data?.[0]?.id || "",
       });
     } catch (error: any) {

valhalla/jawn/src/managers/creditsManager.ts

@@ -29,6 +29,7 @@ export interface PTBInvoice {
   startDate: string;
   endDate: string;
   amountCents: number;
+  subtotalCents: number | null; // Pre-discount amount for wallet crediting (null for old invoices)
   notes: string | null;
   createdAt: string;
 }
@@ -311,25 +312,68 @@ export class CreditsManager extends BaseManager {
    */
   public async listInvoices(): Promise<Result<PTBInvoice[], string>> {
     try {
-      const result = await dbExecute<{
+      // Try query with subtotal_cents column first
+      let result = await dbExecute<{
         id: string;
         organization_id: string;
         stripe_invoice_id: string | null;
         hosted_invoice_url: string | null;
         start_date: string;
         end_date: string;
         amount_cents: string;
+        subtotal_cents: string | null;
         notes: string | null;
         created_at: string;
       }>(
         `SELECT id, organization_id, stripe_invoice_id, hosted_invoice_url,
-                start_date, end_date, amount_cents, notes, created_at
+                start_date, end_date, amount_cents, subtotal_cents, notes, created_at
          FROM ptb_invoices
          WHERE organization_id = $1
          ORDER BY created_at DESC`,
         [this.authParams.organizationId]
       );
 
+      // If subtotal_cents column doesn't exist yet, fall back to query without it
+      if (result.error && JSON.stringify(result.error).includes("42703")) {
+        const fallbackResult = await dbExecute<{
+          id: string;
+          organization_id: string;
+          stripe_invoice_id: string | null;
+          hosted_invoice_url: string | null;
+          start_date: string;
+          end_date: string;
+          amount_cents: string;
+          notes: string | null;
+          created_at: string;
+        }>(
+          `SELECT id, organization_id, stripe_invoice_id, hosted_invoice_url,
+                  start_date, end_date, amount_cents, notes, created_at
+           FROM ptb_invoices
+           WHERE organization_id = $1
+           ORDER BY created_at DESC`,
+          [this.authParams.organizationId]
+        );
+
+        if (fallbackResult.error) {
+          return err(`Error listing invoices: ${fallbackResult.error}`);
+        }
+
+        const invoices: PTBInvoice[] = (fallbackResult.data || []).map((row) => ({
+          id: row.id,
+          organizationId: row.organization_id,
+          stripeInvoiceId: row.stripe_invoice_id,
+          hostedInvoiceUrl: row.hosted_invoice_url,
+          startDate: row.start_date,
+          endDate: row.end_date,
+          amountCents: parseInt(row.amount_cents, 10),
+          subtotalCents: null, // Column doesn't exist yet
+          notes: row.notes,
+          createdAt: row.created_at,
+        }));
+
+        return ok(invoices);
+      }
+
       if (result.error) {
         return err(`Error listing invoices: ${result.error}`);
       }
@@ -342,6 +386,7 @@ export class CreditsManager extends BaseManager {
         startDate: row.start_date,
         endDate: row.end_date,
         amountCents: parseInt(row.amount_cents, 10),
+        subtotalCents: row.subtotal_cents ? parseInt(row.subtotal_cents, 10) : null,
         notes: row.notes,
         createdAt: row.created_at,
       }));

valhalla/jawn/src/tsoa-build/private/routes.ts

@@ -14968,6 +14968,7 @@ const models: TsoaRoute.Models = {
             "startDate": {"dataType":"string","required":true},
             "endDate": {"dataType":"string","required":true},
             "amountCents": {"dataType":"double","required":true},
+            "subtotalCents": {"dataType":"union","subSchemas":[{"dataType":"double"},{"dataType":"enum","enums":[null]}],"required":true},
             "notes": {"dataType":"union","subSchemas":[{"dataType":"string"},{"dataType":"enum","enums":[null]}],"required":true},
             "createdAt": {"dataType":"string","required":true},
         },
@@ -15206,6 +15207,7 @@ const models: TsoaRoute.Models = {
             "hostedInvoiceUrl": {"dataType":"union","subSchemas":[{"dataType":"string"},{"dataType":"enum","enums":[null]}],"required":true},
             "dashboardUrl": {"dataType":"string","required":true},
             "amountCents": {"dataType":"double","required":true},
+            "subtotalCents": {"dataType":"double","required":true},
             "ptbInvoiceId": {"dataType":"string","required":true},
         },
         "additionalProperties": false,

valhalla/jawn/src/tsoa-build/private/swagger.json

@@ -49208,6 +49208,11 @@
 						"type": "number",
 						"format": "double"
 					},
+					"subtotalCents": {
+						"type": "number",
+						"format": "double",
+						"nullable": true
+					},
 					"notes": {
 						"type": "string",
 						"nullable": true
@@ -49224,6 +49229,7 @@
 					"startDate",
 					"endDate",
 					"amountCents",
+					"subtotalCents",
 					"notes",
 					"createdAt"
 				],
@@ -49919,6 +49925,10 @@
 						"type": "number",
 						"format": "double"
 					},
+					"subtotalCents": {
+						"type": "number",
+						"format": "double"
+					},
 					"ptbInvoiceId": {
 						"type": "string"
 					}
@@ -49928,6 +49938,7 @@
 					"hostedInvoiceUrl",
 					"dashboardUrl",
 					"amountCents",
+					"subtotalCents",
 					"ptbInvoiceId"
 				],
 				"type": "object",