@infuro/cms-core 1.0.14 → 1.0.15

package/dist/api.d.cts

@@ -1,3 +1,3 @@
-export { A as AnalyticsHandlerConfig, c as AuthHandlersConfig, B as BlogBySlugConfig, d as ChangePasswordConfig, e as CmsApiHandlerConfig, f as CmsGetter, g as CrudHandlerOptions, D as DashboardStatsConfig, b as EntityMap, F as ForgotPasswordConfig, h as FormBySlugConfig, G as GetPublicSettingsGroupConfig, i as GetPublicSettingsGroupDataSource, I as InviteAcceptConfig, j as SetPasswordConfig, k as SettingsApiConfig, m as StorefrontApiConfig, n as StorefrontOtpFlags, U as UploadHandlerConfig, o as UserAuthApiConfig, p as UserAvatarConfig, q as UserProfileConfig, r as UsersApiConfig, s as createAnalyticsHandlers, t as createBlogBySlugHandler, u as createChangePasswordHandler, v as createCmsApiHandler, w as createCrudByIdHandler, x as createCrudHandler, y as createDashboardStatsHandler, z as createForgotPasswordHandler, H as createFormBySlugHandler, J as createInviteAcceptHandler, K as createSetPasswordHandler, L as createSettingsApiHandlers, M as createStorefrontApiHandler, N as createUploadHandler, P as createUserAuthApiRouter, Q as createUserAvatarHandler, R as createUserProfileHandler, V as createUsersApiHandlers, X as getPublicSettingsGroup } from './index-Be8NLxu-.cjs';
+export { A as AnalyticsHandlerConfig, c as AuthHandlersConfig, B as BlogBySlugConfig, d as ChangePasswordConfig, e as CmsApiHandlerConfig, f as CmsGetter, g as CrudHandlerOptions, D as DashboardStatsConfig, b as EntityMap, F as ForgotPasswordConfig, h as FormBySlugConfig, G as GetPublicSettingsGroupConfig, i as GetPublicSettingsGroupDataSource, I as InviteAcceptConfig, j as SetPasswordConfig, k as SettingsApiConfig, m as StorefrontApiConfig, n as StorefrontOtpFlags, U as UploadHandlerConfig, o as UserAuthApiConfig, p as UserAvatarConfig, q as UserProfileConfig, r as UsersApiConfig, s as createAnalyticsHandlers, t as createBlogBySlugHandler, u as createChangePasswordHandler, v as createCmsApiHandler, w as createCrudByIdHandler, x as createCrudHandler, y as createDashboardStatsHandler, z as createForgotPasswordHandler, H as createFormBySlugHandler, J as createInviteAcceptHandler, K as createSetPasswordHandler, L as createSettingsApiHandlers, M as createStorefrontApiHandler, N as createUploadHandler, P as createUserAuthApiRouter, Q as createUserAvatarHandler, R as createUserProfileHandler, V as createUsersApiHandlers, X as getPublicSettingsGroup } from './index-BQnqJ7EO.cjs';
 import 'typeorm';
 import './helpers-dlrF_49e.cjs';

package/dist/api.d.ts

@@ -1,3 +1,3 @@
-export { A as AnalyticsHandlerConfig, c as AuthHandlersConfig, B as BlogBySlugConfig, d as ChangePasswordConfig, e as CmsApiHandlerConfig, f as CmsGetter, g as CrudHandlerOptions, D as DashboardStatsConfig, b as EntityMap, F as ForgotPasswordConfig, h as FormBySlugConfig, G as GetPublicSettingsGroupConfig, i as GetPublicSettingsGroupDataSource, I as InviteAcceptConfig, j as SetPasswordConfig, k as SettingsApiConfig, m as StorefrontApiConfig, n as StorefrontOtpFlags, U as UploadHandlerConfig, o as UserAuthApiConfig, p as UserAvatarConfig, q as UserProfileConfig, r as UsersApiConfig, s as createAnalyticsHandlers, t as createBlogBySlugHandler, u as createChangePasswordHandler, v as createCmsApiHandler, w as createCrudByIdHandler, x as createCrudHandler, y as createDashboardStatsHandler, z as createForgotPasswordHandler, H as createFormBySlugHandler, J as createInviteAcceptHandler, K as createSetPasswordHandler, L as createSettingsApiHandlers, M as createStorefrontApiHandler, N as createUploadHandler, P as createUserAuthApiRouter, Q as createUserAvatarHandler, R as createUserProfileHandler, V as createUsersApiHandlers, X as getPublicSettingsGroup } from './index-CjBf9dAb.js';
+export { A as AnalyticsHandlerConfig, c as AuthHandlersConfig, B as BlogBySlugConfig, d as ChangePasswordConfig, e as CmsApiHandlerConfig, f as CmsGetter, g as CrudHandlerOptions, D as DashboardStatsConfig, b as EntityMap, F as ForgotPasswordConfig, h as FormBySlugConfig, G as GetPublicSettingsGroupConfig, i as GetPublicSettingsGroupDataSource, I as InviteAcceptConfig, j as SetPasswordConfig, k as SettingsApiConfig, m as StorefrontApiConfig, n as StorefrontOtpFlags, U as UploadHandlerConfig, o as UserAuthApiConfig, p as UserAvatarConfig, q as UserProfileConfig, r as UsersApiConfig, s as createAnalyticsHandlers, t as createBlogBySlugHandler, u as createChangePasswordHandler, v as createCmsApiHandler, w as createCrudByIdHandler, x as createCrudHandler, y as createDashboardStatsHandler, z as createForgotPasswordHandler, H as createFormBySlugHandler, J as createInviteAcceptHandler, K as createSetPasswordHandler, L as createSettingsApiHandlers, M as createStorefrontApiHandler, N as createUploadHandler, P as createUserAuthApiRouter, Q as createUserAvatarHandler, R as createUserProfileHandler, V as createUsersApiHandlers, X as getPublicSettingsGroup } from './index-BiagwMjV.js';
 import 'typeorm';
 import './helpers-dlrF_49e.js';

package/dist/api.js

@@ -8,7 +8,25 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/plugins/erp/erp-queue.ts
+async function queueErp(cms, payload) {
+  const queue = cms.getPlugin("queue");
+  if (!queue) return;
+  await queue.add(ERP_QUEUE_NAME, payload);
+}
+var ERP_QUEUE_NAME;
+var init_erp_queue = __esm({
+  "src/plugins/erp/erp-queue.ts"() {
+    "use strict";
+    ERP_QUEUE_NAME = "erp";
+  }
+});
+
 // src/plugins/erp/erp-config-enabled.ts
+var erp_config_enabled_exports = {};
+__export(erp_config_enabled_exports, {
+  isErpIntegrationEnabled: () => isErpIntegrationEnabled
+});
 async function isErpIntegrationEnabled(cms, dataSource, entityMap) {
   if (!cms.getPlugin("erp")) return false;
   const configRepo = dataSource.getRepository(entityMap.configs);
@@ -63,14 +81,31 @@ async function queueEmail(cms, payload) {
   }
 }
 async function queueOrderPlacedEmails(cms, payload) {
-  const { orderNumber, total, currency, customerName, customerEmail, salesTeamEmails, companyDetails, lineItems } = payload;
+  const {
+    orderNumber,
+    total,
+    subtotal,
+    tax,
+    currency,
+    customerName,
+    customerEmail,
+    salesTeamEmails,
+    companyDetails,
+    lineItems,
+    billingAddress,
+    shippingAddress
+  } = payload;
   const base = {
     orderNumber,
     total: total != null ? String(total) : void 0,
+    subtotal: subtotal != null ? String(subtotal) : void 0,
+    tax: tax != null ? String(tax) : void 0,
     currency,
     customerName,
     companyDetails: companyDetails ?? {},
-    lineItems: lineItems ?? []
+    lineItems: lineItems ?? [],
+    billingAddress,
+    shippingAddress
   };
   const customerLower = customerEmail?.trim().toLowerCase() ?? "";
   const jobs = [];
@@ -248,18 +283,124 @@ var init_erp_order_invoice = __esm({
   }
 });
 
+// src/plugins/erp/paid-order-erp.ts
+var paid_order_erp_exports = {};
+__export(paid_order_erp_exports, {
+  queueErpPaidOrderForOrderId: () => queueErpPaidOrderForOrderId
+});
+function roundMoney(major) {
+  return Math.round(major * 100) / 100;
+}
+function addressToWebhookDto(a) {
+  if (!a) return {};
+  return {
+    line1: a.line1 ?? "",
+    line2: a.line2 ?? "",
+    city: a.city ?? "",
+    state: a.state ?? "",
+    postalCode: a.postalCode ?? "",
+    country: a.country ?? ""
+  };
+}
+function orderStatusLabel(status) {
+  const s = (status || "").toLowerCase();
+  if (s === "confirmed") return "Confirmed";
+  if (s === "pending") return "Pending";
+  if (!status) return "Pending";
+  return status.charAt(0).toUpperCase() + status.slice(1);
+}
+function paymentRowToWebhookDto(p, amountMajorOverride) {
+  const currency = String(p.currency || "INR");
+  const amountMajor = amountMajorOverride != null && Number.isFinite(amountMajorOverride) ? amountMajorOverride : Number(p.amount);
+  const meta = { ...p.metadata || {} };
+  delete meta.amount;
+  delete meta.currency;
+  return {
+    id: String(p.externalReference || `payment_${p.id}`),
+    amount: roundMoney(amountMajor),
+    currency_code: currency,
+    captured_at: p.paidAt ? new Date(p.paidAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
+    provider_id: String(p.method || "unknown"),
+    data: { status: "captured", ...meta }
+  };
+}
+async function queueErpPaidOrderForOrderId(cms, dataSource, entityMap, orderId) {
+  try {
+    const configRepo = dataSource.getRepository(entityMap.configs);
+    const cfgRows = await configRepo.find({ where: { settings: "erp", deleted: false } });
+    for (const row of cfgRows) {
+      const r = row;
+      if (r.key === "enabled" && r.value === "false") return;
+    }
+    if (!cms.getPlugin("erp")) return;
+    const orderRepo = dataSource.getRepository(entityMap.orders);
+    const ord = await orderRepo.findOne({
+      where: { id: orderId },
+      relations: ["items", "items.product", "contact", "billingAddress", "shippingAddress", "payments"]
+    });
+    if (!ord) return;
+    const o = ord;
+    const okKind = o.orderKind === void 0 || o.orderKind === null || o.orderKind === "sale";
+    if (!okKind) return;
+    const rawPayments = o.payments ?? [];
+    const completedPayments = rawPayments.filter((pay) => pay.status === "completed" && pay.deleted !== true);
+    if (!completedPayments.length) return;
+    const rawItems = o.items ?? [];
+    const lines = rawItems.filter((it) => it.product).map((it) => {
+      const p = it.product;
+      const sku = p.sku || `SKU-${p.id}`;
+      const itemType = typeof it.productType === "string" && it.productType.trim() ? String(it.productType).trim() : p.type === "service" ? "service" : "product";
+      return {
+        sku,
+        quantity: Number(it.quantity) || 1,
+        unitPrice: Number(it.unitPrice),
+        title: p.name || sku,
+        discount: 0,
+        tax: Number(it.tax) || 0,
+        uom: (typeof it.uom === "string" && it.uom.trim() ? it.uom : p.uom) || void 0,
+        tax_code: typeof it.taxCode === "string" && it.taxCode.trim() ? String(it.taxCode).trim() : void 0,
+        hsn_number: (typeof it.hsn === "string" && it.hsn.trim() ? it.hsn : p.hsn) || void 0,
+        type: itemType
+      };
+    });
+    if (!lines.length) return;
+    const contact = o.contact;
+    const orderTotalMajor = Number(o.total);
+    const paymentDtos = completedPayments.length === 1 && Number.isFinite(orderTotalMajor) ? [paymentRowToWebhookDto(completedPayments[0], orderTotalMajor)] : completedPayments.map((pay) => paymentRowToWebhookDto(pay));
+    const baseMeta = o.metadata && typeof o.metadata === "object" && !Array.isArray(o.metadata) ? { ...o.metadata } : {};
+    const orderDto = {
+      platformType: "website",
+      platformOrderId: String(o.orderNumber),
+      platformOrderNumber: String(o.orderNumber),
+      order_date: o.createdAt ? new Date(o.createdAt).toISOString() : void 0,
+      status: orderStatusLabel(o.status),
+      customer: {
+        name: contact?.name || "",
+        email: contact?.email || "",
+        phone: contact?.phone || ""
+      },
+      shippingAddress: addressToWebhookDto(o.shippingAddress),
+      billingAddress: addressToWebhookDto(o.billingAddress),
+      items: lines,
+      payments: paymentDtos,
+      metadata: { ...baseMeta, source: "storefront" }
+    };
+    await queueErp(cms, { kind: "order", order: orderDto });
+  } catch {
+  }
+}
+var init_paid_order_erp = __esm({
+  "src/plugins/erp/paid-order-erp.ts"() {
+    "use strict";
+    init_erp_queue();
+  }
+});
+
 // src/api/crud.ts
 import { ILike, Like, MoreThan } from "typeorm";
 
-// src/plugins/erp/erp-queue.ts
-var ERP_QUEUE_NAME = "erp";
-async function queueErp(cms, payload) {
-  const queue = cms.getPlugin("queue");
-  if (!queue) return;
-  await queue.add(ERP_QUEUE_NAME, payload);
-}
-
 // src/plugins/erp/erp-contact-sync.ts
+init_erp_queue();
 function splitName(full) {
   const t = (full || "").trim();
   if (!t) return { firstName: "Contact", lastName: "" };
@@ -297,6 +438,7 @@ async function queueErpCreateContactIfEnabled(cms, dataSource, entityMap, input)
 }
 
 // src/plugins/erp/erp-product-sync.ts
+init_erp_queue();
 init_erp_config_enabled();
 async function queueErpProductUpsertIfEnabled(cms, dataSource, entityMap, product) {
   try {
@@ -304,14 +446,21 @@ async function queueErpProductUpsertIfEnabled(cms, dataSource, entityMap, produc
     if (!sku) return;
     const on = await isErpIntegrationEnabled(cms, dataSource, entityMap);
     if (!on) return;
+    const rawMeta = product.metadata;
+    let metadata;
+    if (rawMeta && typeof rawMeta === "object" && !Array.isArray(rawMeta)) {
+      const { description: _d, ...rest } = rawMeta;
+      metadata = Object.keys(rest).length ? rest : void 0;
+    }
     const payload = {
       sku,
       title: product.name || sku,
       name: product.name,
-      description: typeof product.metadata === "object" && product.metadata && "description" in product.metadata ? String(product.metadata.description ?? "") : void 0,
       hsn_number: product.hsn,
+      uom: product.uom != null && String(product.uom).trim() ? String(product.uom).trim() : void 0,
+      type: product.type === "service" ? "service" : "product",
       is_active: product.status === "available",
-      metadata: product.metadata ?? void 0
+      metadata
     };
     await queueErp(cms, { kind: "productUpsert", product: payload });
   } catch {
@@ -571,6 +720,24 @@ function createCrudHandler(dataSource, entityMap, options) {
       } else if (search) {
         where = buildSearchWhereClause(repo, search);
       }
+      const intFilterKeys = ["productId", "attributeId", "taxId"];
+      const extraWhere = {};
+      for (const key of intFilterKeys) {
+        const v = searchParams.get(key);
+        if (v != null && v !== "" && columnNames.has(key)) {
+          const n = Number(v);
+          if (Number.isFinite(n)) extraWhere[key] = n;
+        }
+      }
+      if (Object.keys(extraWhere).length > 0) {
+        if (Array.isArray(where)) {
+          where = where.map((w) => ({ ...w, ...extraWhere }));
+        } else if (where && typeof where === "object" && Object.keys(where).length > 0) {
+          where = { ...where, ...extraWhere };
+        } else {
+          where = extraWhere;
+        }
+      }
       const [data, total] = await repo.findAndCount({
         skip,
         take: limit,
@@ -1037,6 +1204,7 @@ function createUserAuthApiRouter(config) {
 
 // src/api/cms-handlers.ts
 init_email_queue();
+init_erp_queue();
 import { MoreThanOrEqual, ILike as ILike2 } from "typeorm";
 
 // src/plugins/captcha/assert.ts
@@ -2516,6 +2684,29 @@ function createCmsApiHandler(config) {
         if (!Number.isFinite(oid)) return config.json({ error: "Invalid id" }, { status: 400 });
         return streamOrderInvoicePdf2(cms, dataSource, entityMap, oid, {});
       }
+      if (path[0] === "orders" && path.length === 3 && path[2] === "repost-erp" && getCms) {
+        const a = await config.requireAuth(req);
+        if (a) return a;
+        if (perm) {
+          const pe = await perm(req, "orders", method === "GET" ? "read" : "update");
+          if (pe) return pe;
+        }
+        const oid = Number(path[1]);
+        if (!Number.isFinite(oid)) return config.json({ error: "Invalid id" }, { status: 400 });
+        const cms = await getCms();
+        const { isErpIntegrationEnabled: isErpIntegrationEnabled3 } = await Promise.resolve().then(() => (init_erp_config_enabled(), erp_config_enabled_exports));
+        const enabled = await isErpIntegrationEnabled3(cms, dataSource, entityMap);
+        if (method === "GET") {
+          return config.json({ enabled });
+        }
+        if (method === "POST") {
+          if (!enabled) return config.json({ error: "ERP integration is disabled" }, { status: 409 });
+          const { queueErpPaidOrderForOrderId: queueErpPaidOrderForOrderId2 } = await Promise.resolve().then(() => (init_paid_order_erp(), paid_order_erp_exports));
+          await queueErpPaidOrderForOrderId2(cms, dataSource, entityMap, oid);
+          return config.json({ ok: true });
+        }
+        return config.json({ error: "Method not allowed" }, { status: 405 });
+      }
       if (path.length === 0) return config.json({ error: "Not found" }, { status: 404 });
       const resource = resolveResource(path[0]);
       if (!crudResources.includes(resource)) return config.json({ error: "Invalid resource" }, { status: 400 });
@@ -2944,6 +3135,152 @@ function createStorefrontApiHandler(config) {
   const tokenRepo = () => dataSource.getRepository(entityMap.password_reset_tokens);
   const collectionRepo = () => dataSource.getRepository(entityMap.collections);
   const groupRepo = () => dataSource.getRepository(entityMap.user_groups);
+  const configRepo = () => dataSource.getRepository(entityMap.configs);
+  const CART_CHECKOUT_RELATIONS = ["items", "items.product", "items.product.taxes", "items.product.taxes.tax"];
+  function roundMoney2(n) {
+    return Math.round(n * 100) / 100;
+  }
+  async function getStoreDefaultTaxRate() {
+    const rows = await configRepo().find({ where: { settings: "store", deleted: false } });
+    for (const row of rows) {
+      const r = row;
+      if (r.key === "defaultTaxRate") {
+        const n = parseFloat(String(r.value ?? "").trim());
+        return Number.isFinite(n) && n >= 0 ? n : null;
+      }
+    }
+    return null;
+  }
+  function computeTaxForProductLine(p, lineSubtotal, defaultRate) {
+    const pts = p.taxes ?? [];
+    const activePts = pts.filter((pt) => {
+      const t = pt.tax;
+      return t != null && t.active !== false;
+    });
+    if (activePts.length) {
+      let sumRate = 0;
+      const slugs = [];
+      for (const pt of activePts) {
+        const t = pt.tax;
+        const r = Number(pt.rate != null && pt.rate !== "" ? pt.rate : t.rate ?? 0);
+        if (Number.isFinite(r)) sumRate += r;
+        const slug = String(t.slug ?? "").trim();
+        if (slug) slugs.push(slug);
+      }
+      const tax = roundMoney2(lineSubtotal * sumRate / 100);
+      return {
+        tax,
+        taxRate: sumRate > 0 ? roundMoney2(sumRate) : null,
+        taxCode: slugs.length ? [...new Set(slugs)].sort().join(",") : null
+      };
+    }
+    if (defaultRate != null && defaultRate > 0) {
+      return {
+        tax: roundMoney2(lineSubtotal * defaultRate / 100),
+        taxRate: roundMoney2(defaultRate),
+        taxCode: null
+      };
+    }
+    return { tax: 0, taxRate: null, taxCode: null };
+  }
+  function parseInlineAddress(raw) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+    const o = raw;
+    const line1 = String(o.line1 ?? "").trim();
+    if (!line1) return null;
+    return {
+      line1,
+      line2: o.line2 != null ? String(o.line2) : "",
+      city: o.city != null ? String(o.city) : "",
+      state: o.state != null ? String(o.state) : "",
+      postalCode: o.postalCode != null ? String(o.postalCode) : "",
+      country: o.country != null ? String(o.country) : ""
+    };
+  }
+  function intFromBody(v) {
+    if (typeof v === "number" && Number.isInteger(v)) return v;
+    if (typeof v === "string" && /^\d+$/.test(v)) return parseInt(v, 10);
+    return void 0;
+  }
+  async function resolveCheckoutAddress(contactId, idVal, inlineVal) {
+    const aid = intFromBody(idVal);
+    if (aid != null) {
+      const existing = await addressRepo().findOne({
+        where: { id: aid, contactId }
+      });
+      if (!existing) return { id: null, error: "Address not found" };
+      return { id: aid };
+    }
+    const addr = parseInlineAddress(inlineVal);
+    if (addr) {
+      const saved = await addressRepo().save(
+        addressRepo().create({
+          contactId,
+          line1: addr.line1,
+          line2: addr.line2?.trim() ? addr.line2 : null,
+          city: addr.city?.trim() ? addr.city : null,
+          state: addr.state?.trim() ? addr.state : null,
+          postalCode: addr.postalCode?.trim() ? addr.postalCode : null,
+          country: addr.country?.trim() ? addr.country : null
+        })
+      );
+      return { id: saved.id };
+    }
+    return { id: null };
+  }
+  async function prepareCheckoutFromCart(b, cart, contactId) {
+    const defaultRate = await getStoreDefaultTaxRate();
+    const lines = [];
+    let subtotal = 0;
+    let orderTax = 0;
+    let needsShipping = false;
+    for (const it of cart.items || []) {
+      const p = it.product;
+      if (!p || p.deleted || p.status !== "available") continue;
+      const unit = Number(p.price);
+      const qty = it.quantity || 1;
+      const lineSubtotal = unit * qty;
+      const pType = p.type === "service" ? "service" : "product";
+      if (pType === "product") needsShipping = true;
+      const { tax, taxRate, taxCode } = computeTaxForProductLine(p, lineSubtotal, defaultRate);
+      const lineTotal = roundMoney2(lineSubtotal + tax);
+      subtotal = roundMoney2(subtotal + lineSubtotal);
+      orderTax = roundMoney2(orderTax + tax);
+      lines.push({
+        productId: p.id,
+        quantity: qty,
+        unitPrice: unit,
+        tax,
+        total: lineTotal,
+        hsn: p.hsn ?? null,
+        uom: p.uom ?? null,
+        productType: pType,
+        taxRate,
+        taxCode
+      });
+    }
+    if (!lines.length) return { ok: false, status: 400, message: "No available items in cart" };
+    const bill = await resolveCheckoutAddress(contactId, b.billingAddressId, b.billingAddress);
+    if (bill.error) return { ok: false, status: 400, message: bill.error };
+    if (bill.id == null) return { ok: false, status: 400, message: "Billing address required" };
+    const ship = await resolveCheckoutAddress(contactId, b.shippingAddressId, b.shippingAddress);
+    if (ship.error) return { ok: false, status: 400, message: ship.error };
+    let shippingAddressId = ship.id;
+    if (needsShipping && shippingAddressId == null) shippingAddressId = bill.id;
+    if (needsShipping && shippingAddressId == null) {
+      return { ok: false, status: 400, message: "Shipping address required" };
+    }
+    const orderTotal = roundMoney2(subtotal + orderTax);
+    return {
+      ok: true,
+      lines,
+      subtotal,
+      orderTax,
+      orderTotal,
+      billingAddressId: bill.id,
+      shippingAddressId
+    };
+  }
   async function syncContactToErp(contact) {
     if (!getCms) return;
     try {
@@ -3069,6 +3406,7 @@ function createStorefrontApiHandler(config) {
             slug: p.slug,
             price: p.price,
             sku: p.sku,
+            type: p.type === "service" ? "service" : "product",
             image: primaryProductImageUrl(p.metadata)
           } : null
         };
@@ -3096,6 +3434,8 @@ function createStorefrontApiHandler(config) {
       slug: p.slug,
       sku: p.sku,
       hsn: p.hsn,
+      uom: p.uom ?? null,
+      type: p.type === "service" ? "service" : "product",
       price: p.price,
       compareAtPrice: p.compareAtPrice,
       status: p.status,
@@ -3797,7 +4137,7 @@ function createStorefrontApiHandler(config) {
             contactId = contact.id;
             cart = await cartRepo().findOne({
               where: { contactId },
-              relations: ["items", "items.product"]
+              relations: [...CART_CHECKOUT_RELATIONS]
             });
           } else {
             const email = String(b.email ?? "").trim();
@@ -3830,25 +4170,14 @@ function createStorefrontApiHandler(config) {
             if (!guestToken) return json({ error: "Cart not found" }, { status: 400 });
             cart = await cartRepo().findOne({
               where: { guestToken },
-              relations: ["items", "items.product"]
+              relations: [...CART_CHECKOUT_RELATIONS]
             });
           }
           if (!cart || !(cart.items || []).length) {
             return json({ error: "Cart is empty" }, { status: 400 });
           }
-          let subtotal = 0;
-          const lines = [];
-          for (const it of cart.items || []) {
-            const p = it.product;
-            if (!p || p.deleted || p.status !== "available") continue;
-            const unit = Number(p.price);
-            const qty = it.quantity || 1;
-            const lineTotal = unit * qty;
-            subtotal += lineTotal;
-            lines.push({ productId: p.id, quantity: qty, unitPrice: unit, tax: 0, total: lineTotal });
-          }
-          if (!lines.length) return json({ error: "No available items in cart" }, { status: 400 });
-          const total = subtotal;
+          const prepOrd = await prepareCheckoutFromCart(b, cart, contactId);
+          if (!prepOrd.ok) return json({ error: prepOrd.message }, { status: prepOrd.status });
           const cartId = cart.id;
           const ord = await orderRepo().save(
             orderRepo().create({
@@ -3856,13 +4185,13 @@ function createStorefrontApiHandler(config) {
               orderKind: "sale",
               parentOrderId: null,
               contactId,
-              billingAddressId: typeof b.billingAddressId === "number" ? b.billingAddressId : null,
-              shippingAddressId: typeof b.shippingAddressId === "number" ? b.shippingAddressId : null,
+              billingAddressId: prepOrd.billingAddressId,
+              shippingAddressId: prepOrd.shippingAddressId,
               status: "pending",
-              subtotal,
-              tax: 0,
+              subtotal: prepOrd.subtotal,
+              tax: prepOrd.orderTax,
               discount: 0,
-              total,
+              total: prepOrd.orderTotal,
               currency: cart.currency || "INR",
               metadata: { cartId }
             })
@@ -3871,7 +4200,7 @@ function createStorefrontApiHandler(config) {
           await orderRepo().update(oid, {
             orderNumber: buildCanonicalOrderNumber("sale", oid, ord.createdAt ?? /* @__PURE__ */ new Date())
           });
-          for (const line of lines) {
+          for (const line of prepOrd.lines) {
             await orderItemRepo().save(
               orderItemRepo().create({
                 orderId: oid,
@@ -3879,14 +4208,21 @@ function createStorefrontApiHandler(config) {
                 quantity: line.quantity,
                 unitPrice: line.unitPrice,
                 tax: line.tax,
-                total: line.total
+                total: line.total,
+                hsn: line.hsn,
+                uom: line.uom,
+                productType: line.productType,
+                taxRate: line.taxRate,
+                taxCode: line.taxCode
               })
             );
           }
           return json({
             orderId: oid,
             orderNumber: ord.orderNumber,
-            total,
+            subtotal: prepOrd.subtotal,
+            tax: prepOrd.orderTax,
+            total: prepOrd.orderTotal,
             currency: cart.currency || "INR"
           });
         }
@@ -3904,7 +4240,7 @@ function createStorefrontApiHandler(config) {
             contactId = contact.id;
             cart = await cartRepo().findOne({
               where: { contactId },
-              relations: ["items", "items.product"]
+              relations: [...CART_CHECKOUT_RELATIONS]
             });
           } else {
             const email = String(b.email ?? "").trim();
@@ -3937,38 +4273,27 @@ function createStorefrontApiHandler(config) {
             if (!guestToken) return json({ error: "Cart not found" }, { status: 400 });
             cart = await cartRepo().findOne({
               where: { guestToken },
-              relations: ["items", "items.product"]
+              relations: [...CART_CHECKOUT_RELATIONS]
             });
           }
           if (!cart || !(cart.items || []).length) {
             return json({ error: "Cart is empty" }, { status: 400 });
           }
-          let subtotal = 0;
-          const lines = [];
-          for (const it of cart.items || []) {
-            const p = it.product;
-            if (!p || p.deleted || p.status !== "available") continue;
-            const unit = Number(p.price);
-            const qty = it.quantity || 1;
-            const lineTotal = unit * qty;
-            subtotal += lineTotal;
-            lines.push({ productId: p.id, quantity: qty, unitPrice: unit, tax: 0, total: lineTotal });
-          }
-          if (!lines.length) return json({ error: "No available items in cart" }, { status: 400 });
-          const total = subtotal;
+          const prepChk = await prepareCheckoutFromCart(b, cart, contactId);
+          if (!prepChk.ok) return json({ error: prepChk.message }, { status: prepChk.status });
           const ord = await orderRepo().save(
             orderRepo().create({
               orderNumber: temporaryOrderNumberPlaceholder(),
               orderKind: "sale",
               parentOrderId: null,
               contactId,
-              billingAddressId: typeof b.billingAddressId === "number" ? b.billingAddressId : null,
-              shippingAddressId: typeof b.shippingAddressId === "number" ? b.shippingAddressId : null,
+              billingAddressId: prepChk.billingAddressId,
+              shippingAddressId: prepChk.shippingAddressId,
               status: "pending",
-              subtotal,
-              tax: 0,
+              subtotal: prepChk.subtotal,
+              tax: prepChk.orderTax,
               discount: 0,
-              total,
+              total: prepChk.orderTotal,
               currency: cart.currency || "INR"
             })
           );
@@ -3976,7 +4301,7 @@ function createStorefrontApiHandler(config) {
           await orderRepo().update(oid, {
             orderNumber: buildCanonicalOrderNumber("sale", oid, ord.createdAt ?? /* @__PURE__ */ new Date())
           });
-          for (const line of lines) {
+          for (const line of prepChk.lines) {
             await orderItemRepo().save(
               orderItemRepo().create({
                 orderId: oid,
@@ -3984,7 +4309,12 @@ function createStorefrontApiHandler(config) {
                 quantity: line.quantity,
                 unitPrice: line.unitPrice,
                 tax: line.tax,
-                total: line.total
+                total: line.total,
+                hsn: line.hsn,
+                uom: line.uom,
+                productType: line.productType,
+                taxRate: line.taxRate,
+                taxCode: line.taxCode
               })
             );
           }
@@ -3993,7 +4323,9 @@ function createStorefrontApiHandler(config) {
           return json({
             orderId: oid,
             orderNumber: ord.orderNumber,
-            total
+            subtotal: prepChk.subtotal,
+            tax: prepChk.orderTax,
+            total: prepChk.orderTotal
           });
         }
         if (path[0] === "orders" && path.length === 1 && method === "GET") {