@base44/app-plugin-commerce 0.1.3 → 0.1.5

package/base44/functions/commerce/admin-products/entry.ts

@@ -10,10 +10,21 @@ import { createClientFromRequest } from "npm:@base44/sdk";
 import { HttpError, requireAdmin } from "../../../shared/commerce/auth.ts";
 import { getSettings } from "../../../shared/commerce/settings.ts";
 import { deriveStockStatus } from "../../../shared/commerce/stock.ts";
+import { isVariable } from "../../../shared/commerce/products.ts";
 import { sendStockEmail } from "../../../shared/commerce/emails.ts";
 import { dispatch } from "../../../shared/commerce/webhooks.ts";
 import { pageSlice, scanAll, textMatch } from "../../../shared/commerce/scan.ts";
-import { round2 } from "../../../shared/commerce/money.ts";
+import {
+  adjustTermCounts,
+  assertUniqueSku,
+  bumpCount,
+  derivePricing,
+  deriveStock,
+  ensureUniqueCode,
+  ensureUniqueSlug,
+  rollUpParent,
+  slugify,
+} from "../../../shared/commerce/catalog.ts";
 
 const ok = (data: unknown, status = 200) => Response.json({ success: true, data }, { status });
 const fail = (status: number, error: string, code?: string) =>
@@ -55,87 +66,6 @@ Deno.serve(async (req) => {
   }
 });
 
-// ── derivations ──────────────────────────────────────────────────────────────
-
-function slugify(name: string): string {
-  return String(name || "")
-    .toLowerCase()
-    .trim()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "") || "product";
-}
-
-/** price/on_sale from the sale window. Mutates rec. */
-function derivePricing(rec: any): void {
-  const now = Date.now();
-  const from = rec.date_on_sale_from ? new Date(rec.date_on_sale_from).getTime() : -Infinity;
-  const to = rec.date_on_sale_to ? new Date(rec.date_on_sale_to).getTime() : Infinity;
-  const saleActive = rec.sale_price != null && rec.sale_price !== "" && now >= from && now <= to;
-  rec.on_sale = !!saleActive;
-  const effective = saleActive ? rec.sale_price : rec.regular_price;
-  if (effective != null && effective !== "") rec.price = round2(Number(effective));
-}
-
-/** stock_status derivation when stock is managed. Mutates rec. */
-function deriveStock(rec: any, outThreshold: number, managed: boolean): void {
-  if (managed) {
-    rec.stock_status = deriveStockStatus(
-      Number(rec.stock_quantity ?? 0),
-      rec.backorders ?? "no",
-      outThreshold,
-    );
-  } else if (!rec.stock_status) {
-    rec.stock_status = "instock";
-  }
-}
-
-// ── uniqueness ───────────────────────────────────────────────────────────────
-
-async function ensureUniqueSlug(
-  sr: any,
-  slug: string,
-  selfId?: string,
-  entity = "commerce.Product",
-  scope?: Record<string, any>,
-): Promise<string> {
-  let candidate = slug;
-  for (let i = 2; i < 100; i++) {
-    const hits = (await sr.entities[entity].filter({ ...(scope ?? {}), slug: candidate }, undefined, 2)) ?? [];
-    if (!hits.some((p: any) => p.id !== selfId)) return candidate;
-    candidate = `${slug}-${i}`;
-  }
-  return `${slug}-${crypto.randomUUID().slice(0, 6)}`;
-}
-
-/** SKU must be unique across products AND variations. Throws duplicate_sku. */
-async function assertUniqueSku(sr: any, sku: string, opts: { productId?: string; variationId?: string }): Promise<void> {
-  if (!sku) return;
-  const prods = (await sr.entities["commerce.Product"].filter({ sku }, undefined, 2)) ?? [];
-  if (prods.some((p: any) => p.id !== opts.productId)) {
-    throw new HttpError(409, `SKU "${sku}" is already in use by another product.`, "duplicate_sku");
-  }
-  const vars = (await sr.entities["commerce.ProductVariation"].filter({ sku }, undefined, 2)) ?? [];
-  if (vars.some((v: any) => v.id !== opts.variationId)) {
-    throw new HttpError(409, `SKU "${sku}" is already in use by a product variation.`, "duplicate_sku");
-  }
-}
-
-// ── taxonomy counts ──────────────────────────────────────────────────────────
-
-async function adjustTermCounts(sr: any, entity: string, prevIds: string[], nextIds: string[]): Promise<void> {
-  const added = nextIds.filter((id) => !prevIds.includes(id));
-  const removed = prevIds.filter((id) => !nextIds.includes(id));
-  for (const id of added) await bumpCount(sr, entity, id, +1);
-  for (const id of removed) await bumpCount(sr, entity, id, -1);
-}
-
-async function bumpCount(sr: any, entity: string, id: string, delta: number): Promise<void> {
-  try {
-    const rec = await sr.entities[entity].get(id);
-    if (rec) await sr.entities[entity].update(id, { count: Math.max(0, (rec.count ?? 0) + delta) });
-  } catch { /* stale reference — recount-terms repairs */ }
-}
-
 // ── save ─────────────────────────────────────────────────────────────────────
 
 async function save(sr: any, payload: any): Promise<any> {
@@ -155,7 +85,7 @@ async function save(sr: any, payload: any): Promise<any> {
   rec.slug = await ensureUniqueSlug(sr, slugify(rec.slug), rec.id);
   await assertUniqueSku(sr, rec.sku, { productId: rec.id });
   derivePricing(rec);
-  deriveStock(rec, outThreshold, !!rec.manage_stock && rec.type !== "variable");
+  deriveStock(rec, outThreshold, !!rec.manage_stock);
 
   const { id: _id, created_date: _cd, updated_date: _ud, created_by: _cb, ...fields } = rec;
   let saved: any;
@@ -177,10 +107,10 @@ async function save(sr: any, payload: any): Promise<any> {
   let savedVariations: any[] | undefined;
   if (Array.isArray(variations)) {
     savedVariations = await diffVariations(sr, saved, variations, outThreshold);
-    await rollUpParentStock(sr, saved, savedVariations);
-  } else if (saved.type === "variable") {
+    await rollUpParent(sr, saved, savedVariations);
+  } else if (isVariable(saved)) {
     const existing = await scanAll(sr.entities["commerce.ProductVariation"], { product_id: saved.id });
-    await rollUpParentStock(sr, saved, existing);
+    await rollUpParent(sr, saved, existing);
   }
 
   await dispatch(sr, prev ? "product.updated" : "product.created", saved);
@@ -213,19 +143,6 @@ async function diffVariations(sr: any, parent: any, incoming: any[], outThreshol
   return out;
 }
 
-/** Variable parent shows outofstock only when every purchasable variation is out. */
-async function rollUpParentStock(sr: any, parent: any, variations: any[]): Promise<void> {
-  if (parent.type !== "variable" || parent.manage_stock) return;
-  const live = variations.filter((v) => (v.status ?? "publish") === "publish");
-  const status = live.length && live.every((v) => v.stock_status === "outofstock")
-    ? "outofstock"
-    : "instock";
-  if (status !== parent.stock_status) {
-    await sr.entities["commerce.Product"].update(parent.id, { stock_status: status });
-    parent.stock_status = status;
-  }
-}
-
 // ── delete / batch / duplicate ───────────────────────────────────────────────
 
 async function remove(sr: any, id: string): Promise<any> {
@@ -355,10 +272,9 @@ async function categoryWithDescendants(sr: any, rootId: string): Promise<Set<str
 }
 
 async function search(sr: any, payload: any): Promise<any> {
-  const { q, category_id, type, stock_status, status, sort = "-created_date", limit = 20, skip = 0 } = payload;
+  const { q, category_id, stock_status, status, sort = "-created_date", limit = 20, skip = 0 } = payload;
 
   const query: Record<string, any> = {};
-  if (type) query.type = type;
   if (status) query.status = status;
   if (stock_status) query.stock_status = stock_status;
 
@@ -393,10 +309,10 @@ function taxonomyEntity(taxonomy: string): string {
 }
 
 /**
- * Upsert a category, tag, attribute or attribute term. Exists so an agent (or
+ * Upsert a category, tag, attribute or attribute value. Exists so an agent (or
  * any API caller) can create these — referencing one from a product is useless
  * while the record itself can only be made in the admin UI. An attribute plus
- * its terms is what a variable product's `attributes[].options` draws on.
+ * its values is what a product's `attributes[].options` draws on.
  */
 async function saveTerm(sr: any, payload: any): Promise<any> {
   const entity = taxonomyEntity(payload.taxonomy);
@@ -407,30 +323,29 @@ async function saveTerm(sr: any, payload: any): Promise<any> {
   const fields: Record<string, any> = { name };
 
   if (entity === "commerce.ProductAttributeTerm") {
-    // A term without its attribute is unreachable, and its slug is only required
-    // to be unique inside that attribute.
+    // A value without its attribute is unreachable.
     const attributeId = String(term.attribute_id ?? "").trim();
-    if (!attributeId) throw new HttpError(400, "term.attribute_id is required for an attribute term", "invalid_payload");
+    if (!attributeId) throw new HttpError(400, "term.attribute_id is required for an attribute value", "invalid_payload");
     if (!(await sr.entities["commerce.ProductAttribute"].get(attributeId))) {
       throw new HttpError(404, `Attribute ${attributeId} not found`, "not_found");
     }
     fields.attribute_id = attributeId;
-    fields.description = term.description ?? "";
-    fields.menu_order = Number(term.menu_order ?? 0) || 0;
-    fields.slug = await ensureUniqueSlug(sr, slugify(term.slug || name), term.id, entity, { attribute_id: attributeId });
+    fields.order = Number(term.order ?? 0) || 0;
   } else if (entity === "commerce.ProductAttribute") {
-    fields.type = term.type ?? "select";
-    fields.order_by = term.order_by ?? "menu_order";
-    fields.has_archives = !!term.has_archives;
-    fields.slug = await ensureUniqueSlug(sr, slugify(term.slug || name), term.id, entity);
-  } else {
+    fields.code = await ensureUniqueCode(sr, slugify(term.code || name), term.id);
+    fields.order = Number(term.order ?? 0) || 0;
+  } else if (entity === "commerce.ProductCategory") {
     fields.description = term.description ?? "";
     fields.slug = await ensureUniqueSlug(sr, slugify(term.slug || name), term.id, entity);
-    if (entity === "commerce.ProductCategory") {
-      fields.parent_id = term.parent_id ?? "";
-      if (term.image !== undefined) fields.image = term.image;
-      if (term.menu_order !== undefined) fields.menu_order = Number(term.menu_order) || 0;
-    }
+    fields.parent_id = term.parent_id ?? "";
+    if (term.image !== undefined) fields.image = term.image;
+    if (term.menu_order !== undefined) fields.menu_order = Number(term.menu_order) || 0;
+  } else if (!term.id) {
+    // Tags are created by typing a name on the product form, so "create" has to
+    // mean get-or-create: a second Best Seller would split the tag in two.
+    const existing = (await scanAll(sr.entities[entity], null, "name"))
+      .find((t: any) => String(t.name ?? "").toLowerCase() === name.toLowerCase());
+    if (existing) return existing;
   }
 
   if (term.id) {
@@ -439,12 +354,47 @@ async function saveTerm(sr: any, payload: any): Promise<any> {
     // parent_id === own id would make the tree unwalkable (categoryWithDescendants loops on it).
     if (fields.parent_id === term.id) fields.parent_id = "";
     await sr.entities[entity].update(term.id, fields);
+    // Products store an attribute value by *name*, so a rename that stops here
+    // would leave every product and variant pointing at a value that is gone.
+    if (entity === "commerce.ProductAttributeTerm" && existing.name !== fields.name) {
+      await renameAttributeValue(sr, fields.attribute_id, existing.name, fields.name);
+    }
     return { ...existing, ...fields, id: term.id };
   }
   const withCount = entity === "commerce.ProductAttribute" ? fields : { ...fields, count: 0 };
   return await sr.entities[entity].create(withCount);
 }
 
+/** Rewrite a renamed value across every product and variant that used it. */
+async function renameAttributeValue(sr: any, attributeId: string, from: string, to: string): Promise<void> {
+  const products = await scanAll(sr.entities["commerce.Product"]);
+  for (const product of products) {
+    const rows = product.attributes ?? [];
+    if (!rows.some((a: any) => a.attribute_id === attributeId && (a.options ?? []).includes(from))) continue;
+
+    await sr.entities["commerce.Product"].update(product.id, {
+      attributes: rows.map((a: any) =>
+        a.attribute_id === attributeId
+          ? { ...a, options: (a.options ?? []).map((o: string) => (o === from ? to : o)) }
+          : a
+      ),
+      default_attributes: (product.default_attributes ?? []).map((d: any) =>
+        d.attribute_id === attributeId && d.option === from ? { ...d, option: to } : d
+      ),
+    });
+
+    const variations = await scanAll(sr.entities["commerce.ProductVariation"], { product_id: product.id });
+    for (const v of variations) {
+      if (!(v.attributes ?? []).some((a: any) => a.attribute_id === attributeId && a.option === from)) continue;
+      await sr.entities["commerce.ProductVariation"].update(v.id, {
+        attributes: v.attributes.map((a: any) =>
+          a.attribute_id === attributeId && a.option === from ? { ...a, option: to } : a
+        ),
+      });
+    }
+  }
+}
+
 /**
  * Delete a term. For a category or tag, products keep the id in
  * category_ids/tag_ids — same as the admin UI, and the storefront skips ids that
@@ -494,13 +444,15 @@ async function deleteTerm(sr: any, payload: any): Promise<any> {
 /** Terms for the taxonomy, so a caller can reuse an existing one before creating a duplicate. */
 async function listTerms(sr: any, payload: any): Promise<any> {
   const entity = taxonomyEntity(payload.taxonomy);
-  const sort = entity === "commerce.ProductCategory" || entity === "commerce.ProductAttributeTerm"
+  const sort = entity === "commerce.ProductCategory"
     ? "menu_order"
+    : entity === "commerce.ProductAttributeTerm" || entity === "commerce.ProductAttribute"
+    ? "order"
     : "name";
   const query = entity === "commerce.ProductAttributeTerm" && payload.attribute_id
     ? { attribute_id: String(payload.attribute_id) }
     : null;
   let rows = await scanAll(sr.entities[entity], query, sort);
-  if (payload.q) rows = rows.filter((t: any) => textMatch(t.name, payload.q) || textMatch(t.slug, payload.q));
+  if (payload.q) rows = rows.filter((t: any) => textMatch(t.name, payload.q) || textMatch(t.code, payload.q));
   return pageSlice(rows, Number(payload.limit ?? 100), Number(payload.skip ?? 0));
 }

package/base44/functions/commerce/admin-refunds/entry.ts

@@ -1,6 +1,6 @@
 /**
  * commerce/admin-refunds — create/delete order refunds with optional restock and
- * (placeholder) gateway refunds.
+ * provider refunds through shared/commerce/payments.
  *
  * Actions: create | delete
  */

package/base44/functions/commerce/admin-reports/entry.ts

@@ -30,7 +30,7 @@ Deno.serve(async (req) => {
       case "top-sellers": return ok(await topSellers(sr, payload));
       case "stock": return ok(await stockReport(sr));
       case "orders-totals": return ok(await ordersTotals(sr));
-      case "products-totals": return ok(await groupCount(sr.entities["commerce.Product"], "type"));
+      case "products-totals": return ok(await groupCount(sr.entities["commerce.Product"], "status"));
       case "customers-totals": return ok(await customersTotals(sr));
       case "coupons-totals": return ok(await groupCount(sr.entities["commerce.Coupon"], "discount_type"));
       case "reviews-totals": return ok(await groupCount(sr.entities["commerce.ProductReview"], "status"));

package/base44/functions/commerce/admin-tools/entry.ts

@@ -116,9 +116,10 @@ async function status(sr: any): Promise<any> {
     settings_groups: groups,
     counts,
     checks: {
-      has_payment_gateways: (counts.PaymentGateway as number) > 0,
-      has_default_zone: (counts.ShippingZone as number) > 0,
-      taxes_enabled: settings.general?.enable_taxes ?? null,
+      // counts is keyed by the namespaced entity name — `counts.PaymentGateway`
+      // is undefined, which silently reported both checks as false.
+      has_payment_gateways: (counts["commerce.PaymentGateway"] as number) > 0,
+      has_default_zone: (counts["commerce.ShippingZone"] as number) > 0,
     },
   };
 }

package/base44/functions/commerce/payments/entry.ts

@@ -120,7 +120,6 @@ Deno.serve(async (req: Request) => {
           successUrl: payload.success_url,
           cancelUrl: payload.cancel_url,
           returnUrl: payload.return_url,
-          storeUrl: settings.general?.store_url,
           returnPath: settings.general?.order_received_path,
         });
         const link = await startOnlinePayment(sr, order, {
@@ -164,7 +163,6 @@ Deno.serve(async (req: Request) => {
               successUrl: payload.success_url,
               cancelUrl: payload.cancel_url,
               returnUrl: payload.return_url,
-              storeUrl: settings.general?.store_url,
               returnPath: settings.general?.order_received_path,
             });
             const link = await startOnlinePayment(sr, result.order, {

package/base44/functions/commerce/seed-store/defaults.ts

@@ -24,17 +24,8 @@ export const SETTINGS_DEFAULTS: Array<{ group_id: string; values: Record<string,
   {
     group_id: "general",
     values: {
-      store_name: "",   // seed-store payload supplies it (the app/store name)
-      // Public URL of the shopfront (e.g. https://shop.example.com). Used to
-      // build the page a customer returns to after paying; when empty the
-      // origin of the calling app is used instead.
-      store_url: "",
       // Storefront route customers return to after paying; a mismatch is a 404.
       order_received_path: "/order-received",
-      address: { address_1: "", address_2: "", city: "", state: "", postcode: "", country: "US" },
-      enable_taxes: true,
-      enable_coupons: true,
-      calc_discounts_sequentially: false,
       currency: "USD",
       currency_position: "left",         // left | right | left_space | right_space
       thousand_sep: ",",
@@ -70,7 +61,7 @@ export const SETTINGS_DEFAULTS: Array<{ group_id: string; values: Record<string,
     group_id: "tax",
     values: {
       prices_include_tax: false,
-      tax_based_on: "shipping",          // shipping | billing | base
+      tax_based_on: "shipping",          // shipping | billing
       shipping_tax_class: "inherit",     // inherit | standard | <class slug>
       display_prices_shop: "excl",       // incl | excl
       display_prices_cart: "excl",
@@ -85,7 +76,9 @@ export const SETTINGS_DEFAULTS: Array<{ group_id: string; values: Record<string,
   {
     group_id: "emails",
     values: {
-      from_name: "",   // blank: emails.ts inherits general.store_name
+      // Subject line and sender name both. seed-store's payload supplies it;
+      // blank means SendEmail gets no from_name and Base44 sends as the app's name.
+      store_name: "",
       admin_recipients: [],
       ...EMAIL_TYPE_DEFAULTS,
     },
@@ -94,35 +87,16 @@ export const SETTINGS_DEFAULTS: Array<{ group_id: string; values: Record<string,
 
 export const GATEWAY_DEFAULTS = [
   {
-    slug: "bacs",
-    title: "Direct bank transfer",
-    description: "Make your payment directly into our bank account. Please use your Order ID as the payment reference.",
+    slug: "offline",
+    title: "Offline payment",
+    description: "Pay outside the store — bank transfer on the details below, or cash on delivery. Please quote your order number.",
     enabled: true,
     order: 0,
-    method_title: "Direct bank transfer",
-    method_description: "Take payments in person via BACS. Orders are set on-hold until payment clears.",
+    method_title: "Offline payment",
+    method_description:
+      "Any payment settled outside the store: bank transfer, cash on delivery, or whatever you arrange with the customer. Orders are set on-hold until you confirm the money arrived.",
     settings: { account_details: [] as any[] },
   },
-  {
-    slug: "cheque",
-    title: "Check payments",
-    description: "Please send a check to our store address.",
-    enabled: false,
-    order: 1,
-    method_title: "Check payments",
-    method_description: "Take payments by check. Orders are set on-hold until payment clears.",
-    settings: {},
-  },
-  {
-    slug: "cod",
-    title: "Cash on delivery",
-    description: "Pay with cash upon delivery.",
-    enabled: true,
-    order: 2,
-    method_title: "Cash on delivery",
-    method_description: "Have your customers pay with cash (or by other means) upon delivery.",
-    settings: { enable_for_methods: [] as string[], enable_for_virtual: false },
-  },
   {
     slug: "stripe",
     title: "Credit card",
@@ -132,10 +106,10 @@ export const GATEWAY_DEFAULTS = [
     // storefront gateway list and the admin both check that live — so enabling it
     // here cannot strand a shopper on an unusable option.
     enabled: true,
-    order: 3,
-    method_title: "Online card payments",
+    order: 1,
+    method_title: "Online card payments (Stripe by default)",
     method_description:
-      "Card payments through the connected payment provider (Stripe out of the box). Connect the provider's connector to start taking payments; customers only see this option once it is connected.",
+      "Card payments through the connected payment provider (Stripe out of the box). Set the provider up in the app's integrations to start taking payments; customers only see this option once it is connected.",
     settings: { connector: "stripe" },
   },
 ];