@develemit/commerce-server 0.7.0 → 0.9.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.9.0 (2026-11-14)
+
+### Features
+
+- Products can carry an optional Stripe `taxCode`. Migration `0011` adds `commerce_products.tax_code`; the admin API reads and writes it, checkout sends it on that line (`CheckoutLine.taxCode`, which the Stripe gateway passes as `tax_code`), and the public catalog does not expose it.
+- `orderEmailLines` adds a `tax` line (structured, text and HTML, label `labels.tax`, default "Tax") between shipping and total, only when the order's `taxCents` is above 0.
+- Opt-in automatic sales tax through Stripe Tax: `createStripeGateway({ tax: { enabled: true, behavior?, shippingTaxCode? } })` (or `resolvePayment(env, { tax })`) sets `automatic_tax`, a `tax_behavior` on every line and shipping option, and a per-line `taxCode` (`CheckoutLine.taxCode`) when present. The completed-session webhook reads `total_details.amount_tax` into `taxCents`. Without the option, sessions are unchanged. The fake gateway accepts `tax: { rate }` and `taxFor()`, and `devCheckout` records the computed tax.
+- Orders record sales tax. Migration `0010` adds `commerce_orders.tax_cents` (default 0). A `checkout.completed` `PaymentEvent` may carry `taxCents`; it is stored on the order and included in `totalCents`, so full refunds return the tax. Public and admin order responses return `taxCents`. The fake gateway's `completed()` accepts `taxCents`.
+
+## 0.8.0 (2026-11-12)
+
+### Features
+
+- `DELETE /admin/products/:id` permanently deletes a draft that has never been live and has no order lines (204), along with its image files and holds; otherwise 409 `PRODUCT_NOT_DELETABLE` with `reason: 'published' | 'has_orders'`. Migration `0009` adds `commerce_products.published_at` (set when a product first goes active; backfilled for existing non-draft products), and admin products report `everPublished`.
+- `orderEmailLines` returns `reference`, the short order reference to print in order emails instead of the full id.
+- `GET /admin/orders?q=` accepts the short reference (with or without the leading `#`).
+
+### Changes
+
+- `GET /admin/products/counts`: `live` counts active pieces with stock, and `sold` counts active pieces at zero stock, so a sold piece is no longer counted in both. Each chip's count equals the list its filter shows (`status=active&stock=in` / `status=active&stock=sold`). Upgrading shows lower Live numbers.
+
 ## 0.7.0 (2026-11-04)
 
 ### Features

package/README.md

@@ -132,8 +132,12 @@ onOrderPaid: async (order) => {
 },
 ```
 
+`lines.reference` is the short order reference (`#A1B2C3D4`, from
+`formatOrderRef` in contracts); print it instead of the full id.
+
 The result also has structured `items`, `subtotal`, `discount` (absent when
-no discount applied), `shipping`, `total` and `address` (absent for pickup).
+no discount applied), `shipping`, `tax` (absent when the order has no tax), `total` and `address`
+(absent for pickup).
 HTML output is `<tr>` / `<p>` fragments with `& < > " '` escaped. Override
 copy with `labels`.
 

package/dist/index.d.ts

@@ -214,6 +214,40 @@ declare const commerceSchema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            taxCode: drizzle_orm_pg_core.PgColumn<{
+                name: "tax_code";
+                tableName: "commerce_products";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            publishedAt: drizzle_orm_pg_core.PgColumn<{
+                name: "published_at";
+                tableName: "commerce_products";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             createdAt: drizzle_orm_pg_core.PgColumn<{
                 name: "created_at";
                 tableName: "commerce_products";
@@ -628,6 +662,23 @@ declare const commerceSchema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            taxCents: drizzle_orm_pg_core.PgColumn<{
+                name: "tax_cents";
+                tableName: "commerce_orders";
+                dataType: "number";
+                columnType: "PgInteger";
+                data: number;
+                driverParam: string | number;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             currency: drizzle_orm_pg_core.PgColumn<{
                 name: "currency";
                 tableName: "commerce_orders";
@@ -1669,6 +1720,7 @@ interface CheckoutLine {
     name: string;
     unitAmountCents: number;
     quantity: number;
+    taxCode?: string;
 }
 interface CreateCheckoutSessionInput {
     reference: string;
@@ -1714,6 +1766,7 @@ type PaymentEvent = {
     email?: string;
     shippingAddress?: ShippingAddress;
     shipping?: ChosenShipping;
+    taxCents?: number;
     paymentPending?: boolean;
 } | {
     id: string;
@@ -1827,8 +1880,14 @@ interface StripeGatewayOptions {
     secretKey: string;
     webhookSecret: string;
     client?: Stripe;
+    tax?: StripeTaxOptions;
+}
+interface StripeTaxOptions {
+    enabled: true;
+    behavior?: 'exclusive' | 'inclusive';
+    shippingTaxCode?: string;
 }
-declare function createStripeGateway({ secretKey, webhookSecret, client, }: StripeGatewayOptions): PaymentGateway;
+declare function createStripeGateway({ secretKey, webhookSecret, client, tax, }: StripeGatewayOptions): PaymentGateway;
 
 interface SignedWebhook {
     rawBody: Buffer;
@@ -1851,6 +1910,7 @@ interface FakeGateway extends PaymentGateway {
         email?: string;
         shippingAddress?: ShippingAddress;
         shipping?: ChosenShipping;
+        taxCents?: number;
         paymentPending?: boolean;
     }): SignedWebhook;
     asyncPaid(sessionId: string): SignedWebhook;
@@ -1858,11 +1918,16 @@ interface FakeGateway extends PaymentGateway {
     expired(sessionId: string): SignedWebhook;
     refunded(sessionId: string, refunds: GatewayRefundEvent[]): SignedWebhook;
     sign(event: PaymentEvent): SignedWebhook;
+    taxFor(sessionId: string, shippingCents?: number): number;
+}
+interface FakeTaxOptions {
+    rate: number;
 }
 interface FakeGatewayOptions {
     secret?: string;
+    tax?: FakeTaxOptions;
 }
-declare function createFakeGateway({ secret, }?: FakeGatewayOptions): FakeGateway;
+declare function createFakeGateway({ secret, tax, }?: FakeGatewayOptions): FakeGateway;
 declare function isFakeGateway(gateway: PaymentGateway): gateway is FakeGateway;
 
 interface HoldSweeperOptions {
@@ -1882,6 +1947,7 @@ interface OrderEmailLabels {
     subtotal: string;
     discount: (code: string | null) => string;
     shipping: (label: string | null) => string;
+    tax: string;
     total: string;
 }
 interface OrderEmailLinesOptions {
@@ -1899,10 +1965,12 @@ interface OrderEmailLinesHtml {
     address: string;
 }
 interface OrderEmailLines {
+    reference: string;
     items: EmailLine[];
     subtotal: EmailLine;
     discount?: EmailLine;
     shipping: EmailLine;
+    tax?: EmailLine;
     total: EmailLine;
     address?: string[];
     text: OrderEmailLinesText;
@@ -1968,7 +2036,11 @@ interface PaymentEnv {
     STRIPE_SECRET_KEY?: string;
     STRIPE_WEBHOOK_SECRET?: string;
 }
-declare function resolvePayment(env?: PaymentEnv): PaymentGateway;
+interface ResolvePaymentOptions {
+    tax?: StripeTaxOptions;
+    fakeTax?: FakeTaxOptions;
+}
+declare function resolvePayment(env?: PaymentEnv, { tax, fakeTax }?: ResolvePaymentOptions): PaymentGateway;
 interface CheckoutUrlPaths {
     successPath?: string;
     cancelPath?: string;
@@ -1976,4 +2048,4 @@ interface CheckoutUrlPaths {
 declare function checkoutUrls(webUrl: string, { successPath, cancelPath, }?: CheckoutUrlPaths): CheckoutUrls;
 
 export { ProductNotFoundError, SESSION_ID_PLACEHOLDER, WebhookSignatureError, catalogPlugin, checkoutUrls, commercePlugin, commerceSchema, createDiskStorage, createFakeGateway, createMemoryStorage, createStripeGateway, isFakeGateway, openStoredFile, orderEmailLines, ordersPlugin, resolvePayment, runCommerceMigrations, seedProducts, seedShippingRates, startHoldSweeper };
-export type { AdminOptions, CatalogCacheOptions, CatalogPluginOptions, CategoryLabels, CheckoutDiscount, CheckoutLine, CheckoutSession, CheckoutUrlPaths, CheckoutUrls, ChosenShipping, CommerceDb, CommercePluginOptions, CommerceSchema, CreateCheckoutSessionInput, DevBuyer, DevBuyerSetting, DevCheckoutSetting, DiskStorageOptions, EmailLine, FakeGateway, FakeGatewayOptions, FileStorage, GatewayRefund, HoldSweeper, HoldSweeperOptions, MemoryStorage, OrderEmailLabels, OrderEmailLines, OrderEmailLinesOptions, OrderHooks, OrdersPluginOptions, PaymentEnv, PaymentEvent, PaymentGateway, RefundInput, SeedProduct, SeedShippingRate, ShippingAddress, ShippingRateOption, SignedWebhook, StoredFile, StoredFileStream, StripeGatewayOptions };
+export type { AdminOptions, CatalogCacheOptions, CatalogPluginOptions, CategoryLabels, CheckoutDiscount, CheckoutLine, CheckoutSession, CheckoutUrlPaths, CheckoutUrls, ChosenShipping, CommerceDb, CommercePluginOptions, CommerceSchema, CreateCheckoutSessionInput, DevBuyer, DevBuyerSetting, DevCheckoutSetting, DiskStorageOptions, EmailLine, FakeGateway, FakeGatewayOptions, FakeTaxOptions, FileStorage, GatewayRefund, HoldSweeper, HoldSweeperOptions, MemoryStorage, OrderEmailLabels, OrderEmailLines, OrderEmailLinesOptions, OrderHooks, OrdersPluginOptions, PaymentEnv, PaymentEvent, PaymentGateway, RefundInput, ResolvePaymentOptions, SeedProduct, SeedShippingRate, ShippingAddress, ShippingRateOption, SignedWebhook, StoredFile, StoredFileStream, StripeGatewayOptions, StripeTaxOptions };

package/dist/index.js

@@ -82,6 +82,8 @@ var products = pgTable(
     quantity: integer("quantity").notNull().default(1),
     status: productStatus("status").notNull().default("draft"),
     featured: boolean("featured").notNull().default(false),
+    taxCode: text("tax_code"),
+    publishedAt: timestamp("published_at", { withTimezone: true }),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
     updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow()
   },
@@ -138,6 +140,7 @@ var orders = pgTable("commerce_orders", {
   discountCode: text("discount_code"),
   shippingCents: integer("shipping_cents").notNull().default(0),
   shippingLabel: text("shipping_label"),
+  taxCents: integer("tax_cents").notNull().default(0),
   currency: text("currency").notNull(),
   checkoutSessionId: text("checkout_session_id").unique(),
   shippingAddress: jsonb("shipping_address"),
@@ -331,9 +334,6 @@ async function setShippingRates(db, rates) {
   return listShippingRates(db);
 }
 
-// src/admin/images.ts
-import { Readable } from "stream";
-
 // src/admin/repo.ts
 import {
   and as and2,
@@ -438,14 +438,23 @@ async function setImageAlt(db, id, alt) {
 async function selectProductCounts(db) {
   const [row] = await db.select({
     all: sql2`count(*) filter (where ${products.status} <> 'archived')::int`,
-    live: sql2`count(*) filter (where ${products.status} = 'active')::int`,
+    live: sql2`count(*) filter (where ${products.status} = 'active' and ${products.quantity} > 0)::int`,
     draft: sql2`count(*) filter (where ${products.status} = 'draft')::int`,
-    sold: sql2`count(*) filter (where ${products.quantity} = 0)::int`,
+    sold: sql2`count(*) filter (where ${products.status} = 'active' and ${products.quantity} = 0)::int`,
     archived: sql2`count(*) filter (where ${products.status} = 'archived')::int`,
     incompleteDrafts: sql2`count(*) filter (where ${products.status} = 'draft' and (${products.name} = '' or ${products.priceCents} is null or ${products.category} is null))::int`
   }).from(products);
   return row;
 }
+async function productHasOrderLines(db, productId) {
+  const rows = await db.select({ id: orderItems.id }).from(orderItems).where(eq2(orderItems.productId, productId)).limit(1);
+  return rows.length > 0;
+}
+async function deleteProductRows(db, id) {
+  await db.delete(inventoryHolds).where(eq2(inventoryHolds.productId, id));
+  await db.delete(productImages).where(eq2(productImages.productId, id));
+  await db.delete(products).where(eq2(products.id, id));
+}
 
 // src/admin/service.ts
 import {
@@ -481,6 +490,17 @@ var ProductIncompleteError = class extends Error {
   missing;
   code = "PRODUCT_INCOMPLETE";
 };
+var ProductNotDeletableError = class extends Error {
+  constructor(reason) {
+    super(
+      reason === "published" ? "This product has been live, so it can only be archived" : "This product is on an order, so it can only be archived"
+    );
+    this.reason = reason;
+    this.name = "ProductNotDeletableError";
+  }
+  reason;
+  code = "PRODUCT_NOT_DELETABLE";
+};
 
 // src/admin/publish.ts
 function temporarySlug(id) {
@@ -529,6 +549,8 @@ function toAdminProduct({ row, images }) {
     quantity: row.quantity,
     status: row.status,
     featured: row.featured,
+    everPublished: row.publishedAt !== null,
+    taxCode: row.taxCode,
     images: images.map((i) => ({
       id: i.id,
       url: i.url,
@@ -578,6 +600,7 @@ async function createAdminProduct(db, currency, input, { requirePhotoToPublish =
     const slug = uniqueSlug(base, await slugsStartingWith(tx, base));
     return insertProduct(tx, {
       ...data,
+      publishedAt: data.status === "active" ? /* @__PURE__ */ new Date() : void 0,
       id: newId,
       slug,
       currency: data.currency ?? currency
@@ -593,6 +616,9 @@ async function patchAdminProduct(db, id, input, { requirePhotoToPublish = true }
     assertPublishable(record, fields, photoNeeded);
   }
   const set = sold ? { ...fields, quantity: 0 } : { ...fields };
+  if (fields.status === "active" && !record.row.publishedAt) {
+    set.publishedAt = /* @__PURE__ */ new Date();
+  }
   const renames = fields.name && record.row.slug === temporarySlug(id);
   await db.transaction(async (tx) => {
     if (renames) {
@@ -607,6 +633,24 @@ async function getAdminProductCounts(db) {
   return selectProductCounts(db);
 }
 
+// src/admin/delete.ts
+async function deleteAdminProduct(db, storage, id) {
+  const { row, images } = await requireProduct(db, id);
+  if (row.status !== "draft" || row.publishedAt) {
+    throw new ProductNotDeletableError("published");
+  }
+  if (await productHasOrderLines(db, id)) {
+    throw new ProductNotDeletableError("has_orders");
+  }
+  await db.transaction((tx) => deleteProductRows(tx, id));
+  for (const image of images) {
+    if (image.storageKey) await storage.delete(image.storageKey);
+  }
+}
+
+// src/admin/images.ts
+import { Readable } from "stream";
+
 // src/admin/upload.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { fileTypeFromBuffer } from "file-type";
@@ -712,6 +756,13 @@ var adminPlugin = async (app, { db, currency, authorize, storage, requirePhotoTo
         missing: err.missing
       });
     }
+    if (err instanceof ProductNotDeletableError) {
+      return reply.code(409).send({
+        error: err.code,
+        message: err.message,
+        reason: err.reason
+      });
+    }
     if (err instanceof InvalidCursorError || err instanceof InvalidImageError || err instanceof InvalidImageOrderError) {
       return reply.code(400).send({ error: err.code, message: err.message });
     }
@@ -752,6 +803,13 @@ var adminPlugin = async (app, { db, currency, authorize, storage, requirePhotoTo
       { requirePhotoToPublish }
     )
   );
+  app.delete(
+    "/products/:id",
+    async (req, reply) => {
+      await deleteAdminProduct(db, storage, req.params.id);
+      return reply.code(204).send();
+    }
+  );
   app.post(
     "/products/:id/images",
     async (req, reply) => {
@@ -1171,7 +1229,8 @@ async function findPurchasable(db, ids) {
     id: row.id,
     name: row.name,
     priceCents: completeFields(row).priceCents,
-    currency: row.currency
+    currency: row.currency,
+    taxCode: row.taxCode
   }));
 }
 
@@ -1217,6 +1276,9 @@ import {
   shipOrderInputSchema
 } from "@develemit/commerce-contracts";
 
+// src/orders/admin-service.ts
+import { orderRefSearchTerm } from "@develemit/commerce-contracts";
+
 // src/orders/admin-repo.ts
 import { and as and5, desc as desc2, eq as eq5, ilike as ilike2, lt as lt3, or as or3, sql as sql5 } from "drizzle-orm";
 function escapeLike2(value) {
@@ -1260,7 +1322,8 @@ async function selectOrderPage(db, filter) {
     id: orders.id,
     status: orders.status,
     email: orders.email,
-    totalCents: sql5`${orders.subtotalCents} - ${orders.discountCents} + ${orders.shippingCents}`,
+    taxCents: orders.taxCents,
+    totalCents: sql5`${orders.subtotalCents} - ${orders.discountCents} + ${orders.shippingCents} + ${orders.taxCents}`,
     currency: orders.currency,
     itemCount,
     createdAt: orders.createdAt,
@@ -1283,7 +1346,7 @@ var isRecordedRefund = or4(
 async function lockOrderForRefund(tx, id) {
   const [row] = await tx.select({
     status: orders.status,
-    totalCents: sql6`${orders.subtotalCents} - ${orders.discountCents} + ${orders.shippingCents}`,
+    totalCents: sql6`${orders.subtotalCents} - ${orders.discountCents} + ${orders.shippingCents} + ${orders.taxCents}`,
     currency: orders.currency,
     checkoutSessionId: orders.checkoutSessionId
   }).from(orders).where(eq6(orders.id, id)).for("update");
@@ -1375,6 +1438,7 @@ async function saveOrderDetails(db, orderId, details, status) {
     shippingAddress: details.shippingAddress ?? null,
     shippingCents: details.shipping?.amountCents ?? 0,
     shippingLabel: details.shipping?.label ?? null,
+    taxCents: details.taxCents ?? 0,
     updatedAt: sql7`now()`
   }).where(eq7(orders.id, orderId));
 }
@@ -1420,7 +1484,8 @@ async function toSummary(db, order) {
     discountCode: order.discountCode,
     shippingCents: order.shippingCents,
     shippingLabel: order.shippingLabel,
-    totalCents: order.subtotalCents - order.discountCents + order.shippingCents,
+    taxCents: order.taxCents,
+    totalCents: order.subtotalCents - order.discountCents + order.shippingCents + order.taxCents,
     currency: order.currency,
     items: items.map((i) => ({
       productId: i.productId,
@@ -1488,7 +1553,7 @@ function decodeOrderCursor(raw) {
 async function listAdminOrders(db, query) {
   const rows = await selectOrderPage(db, {
     status: query.status,
-    q: query.q,
+    q: query.q ? orderRefSearchTerm(query.q) || void 0 : void 0,
     hasPendingRefund: query.hasPendingRefund,
     after: query.cursor ? decodeOrderCursor(query.cursor) : void 0,
     limit: query.limit + 1
@@ -1500,6 +1565,7 @@ async function listAdminOrders(db, query) {
       id: r.id,
       status: r.status,
       email: r.email,
+      taxCents: r.taxCents,
       totalCents: r.totalCents,
       currency: r.currency,
       itemCount: r.itemCount,
@@ -2478,6 +2544,15 @@ function assertDevCheckoutAllowed() {
     throw new Error("devCheckout is not allowed when NODE_ENV=production");
   }
 }
+function completedWithTax(payment, session, buyer) {
+  const details = resolveDevCompletion(
+    buyer,
+    session.id,
+    session.shippingRates[0]
+  );
+  const taxCents = payment.taxFor(session.id, details.shipping?.amountCents);
+  return payment.completed(session.id, { ...details, taxCents });
+}
 var devCheckoutRoutes = async (app, { db, payment, urls, hooks, buyer }) => {
   assertDevCheckoutAllowed();
   app.get("/checkout/dev/:sessionId/complete", async (req, reply) => {
@@ -2487,10 +2562,7 @@ var devCheckoutRoutes = async (app, { db, payment, urls, hooks, buyer }) => {
       return reply.code(404).send({ error: "SESSION_NOT_FOUND" });
     }
     const expire = req.query.outcome === "expired";
-    const { rawBody, signature } = expire ? payment.expired(sessionId) : payment.completed(
-      sessionId,
-      resolveDevCompletion(buyer, sessionId, session.shippingRates[0])
-    );
+    const { rawBody, signature } = expire ? payment.expired(sessionId) : completedWithTax(payment, session, buyer);
     const event = await payment.verifyWebhook(rawBody, signature);
     await handlePaymentEvent(db, event, hooks, req.log);
     return reply.redirect(expire ? urls.cancel : urls.success(sessionId), 302);
@@ -2574,7 +2646,8 @@ async function priceLines(db, requests, currency) {
       productId,
       name: product.name,
       unitAmountCents: product.priceCents,
-      quantity
+      quantity,
+      ...product.taxCode && { taxCode: product.taxCode }
     };
   });
 }
@@ -2764,7 +2837,8 @@ var ordersPlugin = async (app, { db, ...settings }) => {
 // src/payment/fake-gateway.ts
 import { createHmac, randomUUID as randomUUID4, timingSafeEqual } from "crypto";
 function createFakeGateway({
-  secret = "fake-webhook-secret"
+  secret = "fake-webhook-secret",
+  tax
 } = {}) {
   const sessions = [];
   const refunds = [];
@@ -2867,7 +2941,17 @@ function createFakeGateway({
         refunds: refunds2
       });
     },
-    sign
+    sign,
+    taxFor(sessionId, shippingCents = 0) {
+      const session = sessions.find((s) => s.id === sessionId);
+      if (!tax || !session) return 0;
+      const merchandise = session.lines.reduce(
+        (sum, l) => sum + l.unitAmountCents * l.quantity,
+        0
+      );
+      const taxable = merchandise - (session.discount?.amountCents ?? 0) + shippingCents;
+      return Math.round(taxable * tax.rate);
+    }
   };
 }
 function isFakeGateway(gateway) {
@@ -2983,13 +3067,17 @@ function toShippingAddress(name, address) {
     Object.entries(fields).filter(([, v]) => v !== void 0)
   );
 }
-function toShippingOption(rate, currency) {
+function toShippingOption(rate, currency, tax) {
   const days = (value) => ({ unit: "business_day", value });
   return {
     shipping_rate_data: {
       type: "fixed_amount",
       display_name: rate.label,
       fixed_amount: { amount: rate.amountCents, currency },
+      ...tax && {
+        tax_behavior: tax.behavior ?? "exclusive",
+        ...tax.shippingTaxCode && { tax_code: tax.shippingTaxCode }
+      },
       ...rate.minDays !== void 0 && rate.maxDays !== void 0 && {
         delivery_estimate: {
           minimum: days(rate.minDays),
@@ -3005,7 +3093,7 @@ function toChosenShipping(session) {
   if (!cost || !rate || typeof rate === "string") return void 0;
   return {
     label: rate.display_name ?? "Shipping",
-    amountCents: cost.amount_total
+    amountCents: cost.amount_subtotal
   };
 }
 function toPaymentEvent(event, expanded) {
@@ -3019,6 +3107,9 @@ function toPaymentEvent(event, expanded) {
       email: session.customer_details?.email ?? void 0,
       shippingAddress: toShippingAddress(shipping?.name, shipping?.address),
       shipping: expanded && toChosenShipping(expanded),
+      ...session.total_details && {
+        taxCents: session.total_details.amount_tax
+      },
       paymentPending: session.payment_status === "unpaid"
     };
   }
@@ -3087,7 +3178,8 @@ function createCoupon(stripe, { discount, currency, expiresAt }) {
 function createStripeGateway({
   secretKey,
   webhookSecret,
-  client
+  client,
+  tax
 }) {
   let stripe = client ? Promise.resolve(client) : void 0;
   const getStripe = () => stripe ??= loadStripe(secretKey);
@@ -3107,19 +3199,22 @@ function createStripeGateway({
           price_data: {
             currency: input.currency.toLowerCase(),
             unit_amount: line.unitAmountCents,
+            ...tax && { tax_behavior: tax.behavior ?? "exclusive" },
             product_data: {
               name: line.name,
-              metadata: { productId: line.productId }
+              metadata: { productId: line.productId },
+              ...tax && line.taxCode && { tax_code: line.taxCode }
             }
           }
         })),
+        ...tax && { automatic_tax: { enabled: true } },
         ...coupon && { discounts: [{ coupon: coupon.id }] },
         success_url: input.successUrl,
         cancel_url: input.cancelUrl,
         expires_at: Math.floor(input.expiresAt.getTime() / 1e3),
         ...input.shippingRates.length > 0 && {
           shipping_options: input.shippingRates.map(
-            (rate) => toShippingOption(rate, input.currency.toLowerCase())
+            (rate) => toShippingOption(rate, input.currency.toLowerCase(), tax)
           )
         },
         shipping_address_collection: {
@@ -3192,10 +3287,14 @@ function startHoldSweeper(db, { intervalMs = 6e4, onError } = {}) {
 }
 
 // src/emails/order-lines.ts
+import {
+  formatOrderRef
+} from "@develemit/commerce-contracts";
 var defaultLabels = {
   subtotal: "Subtotal",
   discount: (code) => code ? `Discount (${code})` : "Discount",
   shipping: (label) => label ? `Shipping (${label})` : "Shipping",
+  tax: "Tax",
   total: "Total"
 };
 var escapes = {
@@ -3251,14 +3350,23 @@ function orderEmailLines(order, options = {}) {
     label: labels.shipping(order.shippingLabel),
     amount: money(order.shippingCents)
   };
+  const tax = order.taxCents > 0 ? { label: labels.tax, amount: money(order.taxCents) } : void 0;
   const total = { label: labels.total, amount: money(order.totalCents) };
   const address = addressLines(order);
-  const totals = [subtotal, ...discount ? [discount] : [], shipping, total];
+  const totals = [
+    subtotal,
+    ...discount ? [discount] : [],
+    shipping,
+    ...tax ? [tax] : [],
+    total
+  ];
   return {
+    reference: formatOrderRef(order.id),
     items,
     subtotal,
     discount,
     shipping,
+    tax,
     total,
     address,
     text: {
@@ -3430,7 +3538,7 @@ async function openStoredFile(dir, key) {
 }
 
 // src/payment/resolve.ts
-function resolvePayment(env = process.env) {
+function resolvePayment(env = process.env, { tax, fakeTax } = {}) {
   const secretKey = env.STRIPE_SECRET_KEY || void 0;
   const webhookSecret = env.STRIPE_WEBHOOK_SECRET || void 0;
   if (!secretKey !== !webhookSecret) {
@@ -3447,9 +3555,13 @@ function resolvePayment(env = process.env) {
         "The fake payment gateway is not allowed in production; set the Stripe keys"
       );
     }
-    return createFakeGateway();
+    return createFakeGateway({ tax: fakeTax });
   }
-  return createStripeGateway({ secretKey, webhookSecret });
+  return createStripeGateway({
+    secretKey,
+    webhookSecret,
+    tax
+  });
 }
 function checkoutUrls(webUrl, {
   successPath = "/checkout/success",