@base44/app-plugin-commerce 0.1.3 → 0.1.4

package/base44/functions/commerce/seed-store/sample-data.ts

@@ -1,7 +1,7 @@
 /**
- * Optional demo catalog: 3 categories, 2 global attributes (+terms),
- * ~12 products covering every product type (including 3 variable products
- * with variants), 2 coupons, 2 tax rates. Every product ships with a
+ * Optional demo catalog: 3 categories, 2 shared attributes (+values),
+ * 10 products (3 of which carry attributes and ship with variants),
+ * 2 coupons, 2 tax rates. Every product ships with a
  * description, short description and a small image gallery so the storefront
  * and admin look populated out of the box.
  * Only installed when with_sample_data=true AND the store has no products.
@@ -32,29 +32,29 @@ export const SAMPLE_CATEGORIES = [
 ];
 
 export const SAMPLE_ATTRIBUTES = [
-  { name: "Color", slug: "color", type: "select", order_by: "menu_order", has_archives: false },
-  { name: "Size", slug: "size", type: "select", order_by: "menu_order", has_archives: false },
+  { name: "Color", code: "color", order: 0 },
+  { name: "Size", code: "size", order: 1 },
 ];
 
-export const SAMPLE_ATTRIBUTE_TERMS: Record<string, Array<{ name: string; slug: string; menu_order: number }>> = {
+export const SAMPLE_ATTRIBUTE_TERMS: Record<string, Array<{ name: string; order: number }>> = {
   color: [
-    { name: "Red", slug: "red", menu_order: 0 },
-    { name: "Blue", slug: "blue", menu_order: 1 },
-    { name: "Black", slug: "black", menu_order: 2 },
-    { name: "Green", slug: "green", menu_order: 3 },
+    { name: "Red", order: 0 },
+    { name: "Blue", order: 1 },
+    { name: "Black", order: 2 },
+    { name: "Green", order: 3 },
   ],
   size: [
-    { name: "S", slug: "s", menu_order: 0 },
-    { name: "M", slug: "m", menu_order: 1 },
-    { name: "L", slug: "l", menu_order: 2 },
-    { name: "XL", slug: "xl", menu_order: 3 },
+    { name: "S", order: 0 },
+    { name: "M", order: 1 },
+    { name: "L", order: 2 },
+    { name: "XL", order: 3 },
   ],
 };
 
 /**
  * Per-colour variation photos, keyed by product: a colour swatch is only useful
  * if it shows the right *garment* in that colour, so these can't be shared
- * across product types. Products with no colour-accurate photo available (the
+ * between products. Products with no colour-accurate photo available (the
  * tote) are deliberately absent — their variations fall back to the product
  * gallery, which beats showing an unrelated item.
  */
@@ -79,15 +79,14 @@ const colorImage = (name: string, color: string) => {
 };
 
 /**
- * Product specs — category/attribute references are by slug and resolved to
- * ids at seed time. `variations` uses attribute slug→option pairs and may carry
- * a per-variation `image`.
+ * Product specs — categories are referenced by slug and attributes by `code`,
+ * both resolved to ids at seed time. `variations` uses attribute code→option
+ * pairs and may carry a per-variation `image`.
  */
 export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "tshirt",
     name: "Classic T-Shirt",
-    type: "simple",
     status: "publish",
     categories: ["clothing"],
     regular_price: 19.99,
@@ -105,7 +104,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "hoodie",
     name: "Zip Hoodie",
-    type: "simple",
     status: "publish",
     categories: ["clothing"],
     regular_price: 44.99,
@@ -123,7 +121,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "cap",
     name: "Logo Cap",
-    type: "simple",
     status: "publish",
     categories: ["accessories"],
     regular_price: 14.99,
@@ -140,7 +137,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "stickers",
     name: "Sticker Pack",
-    type: "simple",
     status: "publish",
     categories: ["accessories"],
     regular_price: 4.99,
@@ -156,7 +152,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "album",
     name: "Demo Album (Digital Download)",
-    type: "simple",
     status: "publish",
     categories: ["downloads"],
     regular_price: 9.99,
@@ -175,7 +170,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "poster",
     name: "Art Print Poster",
-    type: "simple",
     status: "publish",
     categories: ["accessories"],
     regular_price: 12.99,
@@ -191,7 +185,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "vneck",
     name: "V-Neck T-Shirt",
-    type: "variable",
     status: "publish",
     categories: ["clothing"],
     sku: "DEMO-VNECK",
@@ -201,10 +194,10 @@ export const SAMPLE_PRODUCTS: any[] = [
       "<p>A fitted v-neck tee in a lightweight jersey knit, available across multiple colors and sizes.</p>" +
       "<ul><li>Slim, tailored fit</li><li>Lightweight 150 gsm jersey</li><li>Six color/size combinations</li></ul>",
     attributes: [
-      { slug: "color", visible: true, variation: true, options: ["Red", "Blue"] },
-      { slug: "size", visible: true, variation: true, options: ["S", "M", "L"] },
+      { code: "color", options: ["Red", "Blue"] },
+      { code: "size", options: ["S", "M", "L"] },
     ],
-    default_attributes: [{ slug: "color", option: "Red" }, { slug: "size", option: "M" }],
+    default_attributes: [{ code: "color", option: "Red" }, { code: "size", option: "M" }],
     variations: [
       { options: { color: "Red", size: "S" }, regular_price: 21.99, stock_quantity: 10, image: colorImage("V-Neck T-Shirt", "Red") },
       { options: { color: "Red", size: "M" }, regular_price: 21.99, stock_quantity: 10, image: colorImage("V-Neck T-Shirt", "Red") },
@@ -217,7 +210,6 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "pullover",
     name: "Colorblock Pullover Hoodie",
-    type: "variable",
     status: "publish",
     categories: ["clothing"],
     sku: "DEMO-PULLOVER",
@@ -227,10 +219,10 @@ export const SAMPLE_PRODUCTS: any[] = [
       "<p>A heavyweight brushed-back pullover hoodie with a double-layer hood and ribbed cuffs. Some combinations are on sale.</p>" +
       "<ul><li>380 gsm brushed-back fleece</li><li>Double-layer drawcord hood</li><li>Nine color/size combinations</li></ul>",
     attributes: [
-      { slug: "color", visible: true, variation: true, options: ["Black", "Blue", "Green"] },
-      { slug: "size", visible: true, variation: true, options: ["M", "L", "XL"] },
+      { code: "color", options: ["Black", "Blue", "Green"] },
+      { code: "size", options: ["M", "L", "XL"] },
     ],
-    default_attributes: [{ slug: "color", option: "Black" }, { slug: "size", option: "L" }],
+    default_attributes: [{ code: "color", option: "Black" }, { code: "size", option: "L" }],
     variations: [
       { options: { color: "Black", size: "M" }, regular_price: 49.99, stock_quantity: 12, image: colorImage("Colorblock Pullover Hoodie", "Black") },
       { options: { color: "Black", size: "L" }, regular_price: 49.99, stock_quantity: 12, image: colorImage("Colorblock Pullover Hoodie", "Black") },
@@ -246,57 +238,27 @@ export const SAMPLE_PRODUCTS: any[] = [
   {
     key: "tote",
     name: "Canvas Tote Bag",
-    type: "variable",
     status: "publish",
     categories: ["accessories"],
     sku: "DEMO-TOTE",
     images: gallery("Canvas Tote Bag", ["photo-1544816155-12df9643f363"]),
-    short_description: "Sturdy canvas tote — a single-attribute variable product in three colors.",
+    short_description: "Sturdy canvas tote — one attribute, three colors.",
     description:
-      "<p>A roomy, sturdy cotton-canvas tote with reinforced handles. Demonstrates a variable product driven by a single attribute (color).</p>" +
+      "<p>A roomy, sturdy cotton-canvas tote with reinforced handles. Demonstrates variants driven by a single attribute (color).</p>" +
       "<ul><li>12 oz heavyweight cotton canvas</li><li>Reinforced 28 cm handles</li><li>Interior slip pocket</li></ul>",
     attributes: [
-      { slug: "color", visible: true, variation: true, options: ["Black", "Blue", "Green"] },
+      { code: "color", options: ["Black", "Blue", "Green"] },
     ],
-    default_attributes: [{ slug: "color", option: "Black" }],
+    default_attributes: [{ code: "color", option: "Black" }],
     variations: [
       { options: { color: "Black" }, regular_price: 18.99, stock_quantity: 25, image: colorImage("Canvas Tote Bag", "Black") },
       { options: { color: "Blue" }, regular_price: 18.99, stock_quantity: 20, image: colorImage("Canvas Tote Bag", "Blue") },
       { options: { color: "Green" }, regular_price: 18.99, stock_quantity: 0, backorders: "notify", image: colorImage("Canvas Tote Bag", "Green") },
     ],
   },
-  {
-    key: "mug",
-    name: "Partner Mug (External)",
-    type: "external",
-    status: "publish",
-    categories: ["accessories"],
-    regular_price: 11.99,
-    sku: "DEMO-MUG",
-    external_url: "https://example.com/partner/mug",
-    button_text: "Buy at partner store",
-    images: gallery("Partner Mug", ["photo-1514228742587-6b1558fcca3d", "photo-1516390118834-21602d501886"]),
-    short_description: "Sold on our partner's site — an external/affiliate product.",
-    description:
-      "<p>A 350 ml ceramic mug sold through our partner store. An example of an external/affiliate product whose buy button links off-site.</p>" +
-      "<ul><li>350 ml ceramic body</li><li>Dishwasher &amp; microwave safe</li><li>Fulfilled by our partner</li></ul>",
-  },
-  {
-    key: "bundle",
-    name: "Starter Bundle",
-    type: "grouped",
-    status: "publish",
-    categories: ["clothing", "accessories"],
-    grouped_keys: ["tshirt", "cap", "stickers"], // resolved to grouped_products ids at seed time
-    images: gallery("Starter Bundle", ["photo-1479064555552-3ef4979f8908"]),
-    short_description: "Tee, cap and sticker pack together in one grouped listing.",
-    description:
-      "<p>A grouped product that bundles the Classic T-Shirt, Logo Cap and Sticker Pack into a single listing. Customers pick quantities for each item.</p>",
-  },
   {
     key: "beanie",
     name: "Wool Beanie",
-    type: "simple",
     status: "publish",
     categories: ["accessories"],
     regular_price: 16.99,

package/base44/functions/commerce/storefront-cart/entry.ts

@@ -11,7 +11,6 @@
  */
 import { createClientFromRequest } from "npm:@base44/sdk";
 import { HttpError, getCallerUser } from "../../../shared/commerce/auth.ts";
-import { getSetting } from "../../../shared/commerce/settings.ts";
 import { checkPurchasable } from "../../../shared/commerce/stock.ts";
 import { validateCoupon } from "../../../shared/commerce/coupons.ts";
 import { uuid } from "../../../shared/commerce/sequence.ts";
@@ -177,9 +176,6 @@ Deno.serve(async (req: Request) => {
       case "apply-coupon": {
         const cart = await loadCart(sr, payload.cart_token);
         const pricingData = await loadPricingData(sr);
-        if (!getSetting(pricingData.settings, "general", "enable_coupons", true)) {
-          throw new HttpError(400, "Coupons are disabled for this store.", "coupons_disabled");
-        }
         const code = String(payload.code || "").toLowerCase().trim();
         if (!code) throw new HttpError(400, "Coupon code is required.", "code_required");
         if ((cart.coupon_codes || []).includes(code)) {
@@ -250,9 +246,6 @@ async function addItem(sr: any, cart: any, payload: any): Promise<void> {
   const { product_id, variation_id, attributes } = payload;
   let quantity = Math.max(1, Math.floor(Number(payload.quantity) || 1));
   const { product, variation } = await loadProductPair(sr, product_id, variation_id);
-  if (product.type === "variable" && !variation) {
-    throw new HttpError(400, "Please choose product options.", "variation_required");
-  }
   if (product.sold_individually) quantity = 1;
 
   const items = [...(cart.items || [])];

package/base44/functions/commerce/storefront-catalog/entry.ts

@@ -12,6 +12,7 @@ import { createClientFromRequest } from "npm:@base44/sdk";
 import { getCallerUser, HttpError, requireUser } from "../../../shared/commerce/auth.ts";
 import { getSettings, getSetting, storefrontSafeSettings } from "../../../shared/commerce/settings.ts";
 import { isOnlineGateway, onlinePaymentStatus } from "../../../shared/commerce/payments.ts";
+import { isVariable } from "../../../shared/commerce/products.ts";
 import { recalcProductRating } from "../../../shared/commerce/reviews.ts";
 import { scanAll } from "../../../shared/commerce/scan.ts";
 import { COUNTRIES } from "../../../shared/commerce/data/countries.ts";
@@ -69,8 +70,8 @@ Deno.serve(async (req: Request) => {
  * `downloads[].file_url` is the paywalled file itself — access to it is gated by
  * commerce.DownloadPermission (limits, expiry, signed URLs) via
  * commerce/storefront-account `get-download`, so it can't ride along in the
- * catalog. `purchase_note` is a post-purchase message, not pre-sale content.
- * The `downloadable` flag is kept so a shopfront can still badge the product.
+ * catalog. The `downloadable` flag is kept so a shopfront can still badge the
+ * product.
  */
 function publicProduct<T extends Record<string, any>>(product: T): T {
   if (!product || typeof product !== "object") return product;
@@ -78,7 +79,6 @@ function publicProduct<T extends Record<string, any>>(product: T): T {
     downloads: _downloads,
     download_limit: _dlLimit,
     download_expiry: _dlExpiry,
-    purchase_note: _note,
     ...safe
   } = product as Record<string, any>;
   return safe as T;
@@ -87,7 +87,7 @@ function publicProduct<T extends Record<string, any>>(product: T): T {
 // ── list-products ────────────────────────────────────────────────────────────
 
 const SORTS: Record<string, (a: any, b: any) => number> = {
-  "menu_order": (a, b) => (a.menu_order ?? 0) - (b.menu_order ?? 0) || String(a.name).localeCompare(String(b.name)),
+  "name": (a, b) => String(a.name ?? "").localeCompare(String(b.name ?? "")),
   "price": (a, b) => (a.price ?? 0) - (b.price ?? 0),
   "-price": (a, b) => (b.price ?? 0) - (a.price ?? 0),
   "-created_date": (a, b) => String(b.created_date ?? "").localeCompare(String(a.created_date ?? "")),
@@ -143,8 +143,8 @@ async function listProducts(sr: any, p: any): Promise<any> {
   if (p.featured != null) products = products.filter((prod: any) => !!prod.featured === !!p.featured);
   if (p.on_sale != null) products = products.filter((prod: any) => !!prod.on_sale === !!p.on_sale);
 
-  const sortKey = String(p.sort ?? "menu_order");
-  products.sort(SORTS[sortKey] ?? SORTS["menu_order"]);
+  const sortKey = String(p.sort ?? "-created_date");
+  products.sort(SORTS[sortKey] ?? SORTS["-created_date"]);
 
   const start = (page - 1) * perPage;
   const pageItems = await withTags(sr, products.slice(start, start + perPage).map(publicProduct));
@@ -160,13 +160,12 @@ async function listProducts(sr: any, p: any): Promise<any> {
  * Attach resolved `tags` to listing rows. A row otherwise carries only tag_ids,
  * which is why cards end up with no tags at all — the shape a card needs has to
  * be in the row it renders. One tag read per request, not per row; kept to
- * {id, name, slug} so a listing payload stays small (use list-tags for
- * descriptions and counts).
+ * {id, name} so a listing payload stays small (use list-tags for counts).
  */
 async function withTags(sr: any, rows: any[]): Promise<any[]> {
   if (!rows.some((r) => (r.tag_ids ?? []).length)) return rows;
   const all = await scanAll(sr.entities["commerce.ProductTag"], {}, "name", 2000);
-  const byId = new Map(all.map((t: any) => [t.id, { id: t.id, name: t.name, slug: t.slug }]));
+  const byId = new Map(all.map((t: any) => [t.id, { id: t.id, name: t.name }]));
   return rows.map((r) => ({
     ...r,
     tags: (r.tag_ids ?? []).map((id: string) => byId.get(id)).filter(Boolean),
@@ -205,7 +204,7 @@ async function getProduct(sr: any, p: any): Promise<any> {
   }
 
   const [variations, categories, tags] = await Promise.all([
-    product.type === "variable"
+    isVariable(product)
       ? sr.entities["commerce.ProductVariation"].filter({ product_id: product.id }, "menu_order", 500)
       : Promise.resolve([]),
     resolveMany(sr.entities["commerce.ProductCategory"], product.category_ids),
@@ -225,10 +224,9 @@ async function getProduct(sr: any, p: any): Promise<any> {
     (reviewsPage - 1) * reviewsPerPage,
   )) ?? [];
 
-  const [upsells, crossSells, grouped] = await Promise.all([
+  const [upsells, crossSells] = await Promise.all([
     productSummaries(sr, product.upsell_ids),
     productSummaries(sr, product.cross_sell_ids),
-    productSummaries(sr, product.grouped_products),
   ]);
 
   return {
@@ -246,7 +244,6 @@ async function getProduct(sr: any, p: any): Promise<any> {
     },
     upsells,
     cross_sells: crossSells,
-    grouped_products: grouped,
   };
 }
 
@@ -347,8 +344,6 @@ async function listTags(sr: any, p: any): Promise<any> {
     .map((t: any) => ({
       id: t.id,
       name: t.name,
-      slug: t.slug,
-      description: t.description ?? "",
       count: counts.get(t.id) ?? 0,
     }))
     .filter((t: any) => p?.with_products_only === false || t.count > 0);
@@ -356,10 +351,10 @@ async function listTags(sr: any, p: any): Promise<any> {
 }
 
 async function listAttributes(sr: any): Promise<any> {
-  const attributes = await scanAll(sr.entities["commerce.ProductAttribute"], {}, undefined, 500);
+  const attributes = await scanAll(sr.entities["commerce.ProductAttribute"], {}, "order", 500);
   const out: any[] = [];
   for (const attr of attributes) {
-    const terms = (await sr.entities["commerce.ProductAttributeTerm"].filter({ attribute_id: attr.id }, "menu_order", 500)) ?? [];
+    const terms = (await sr.entities["commerce.ProductAttributeTerm"].filter({ attribute_id: attr.id }, "order", 500)) ?? [];
     out.push({ ...attr, terms });
   }
   return { attributes: out };
@@ -404,10 +399,6 @@ async function submitReview(sr: any, p: any, user: any): Promise<any> {
   if (!product || product.status !== "publish") {
     throw new HttpError(404, "Product not found.", "not_found");
   }
-  if (product.reviews_allowed === false) {
-    throw new HttpError(403, "Reviews are disabled for this product.", "reviews_disabled");
-  }
-
   const reviewerEmail = String(user.email ?? "").trim().toLowerCase();
   if (!reviewerEmail) {
     throw new HttpError(403, "Your account has no email address to review under.", "forbidden");

package/base44/functions/commerce/storefront-checkout/entry.ts

@@ -279,22 +279,16 @@ async function placeOrder(sr: any, req: Request, user: any, payload: any): Promi
   let paymentInstructions: any = null;
   let payment: any = null;
   switch (gateway.slug) {
-    case "cod":
-      await transitionOrder(sr, order, "processing", { settings });
-      paymentInstructions = { type: "cod", description: gateway.description ?? "Pay with cash upon delivery." };
-      break;
-    case "bacs":
+    // Settled outside the store, so no money has arrived yet: on-hold, and the
+    // merchant moves it on once it has.
+    case "offline":
       await transitionOrder(sr, order, "on-hold", { settings });
       paymentInstructions = {
-        type: "bacs",
-        description: gateway.description ?? "Make your payment directly into our bank account.",
+        type: "offline",
+        description: gateway.description ?? "Pay outside the store. Your order is confirmed once we receive payment.",
         account_details: gateway.settings?.account_details ?? [],
       };
       break;
-    case "cheque":
-      await transitionOrder(sr, order, "on-hold", { settings });
-      paymentInstructions = { type: "cheque", description: gateway.description ?? "Please send a check to our store address." };
-      break;
     default:
       if (isOnlineGateway(gateway.slug)) {
         // Online payment: the order stays `pending` and the customer is sent to
@@ -306,7 +300,6 @@ async function placeOrder(sr: any, req: Request, user: any, payload: any): Promi
           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, {

package/base44/shared/commerce/coupons.ts

@@ -148,19 +148,16 @@ export interface CouponLineTotal {
 }
 
 /**
- * Apply coupons in order, mutating each line's `.discount`.
- * `calc_discounts_sequentially` (general settings): when true each coupon sees
- * the line total minus prior discounts; when false all see the original
- * subtotal (the default). Line discounts never exceed the line's remaining value.
+ * Apply coupons in order, mutating each line's `.discount`. Every coupon is
+ * computed off the original line subtotal, not the running total. Line
+ * discounts never exceed the line's remaining value.
  */
 export function applyCoupons(
   lines: CouponLineInput[],
   coupons: any[],
-  settings: Record<string, any>,
 ): CouponLineTotal[] {
-  const sequential = !!settings?.general?.calc_discounts_sequentially;
   const couponLines: CouponLineTotal[] = [];
-  const base = (l: CouponLineInput) => Math.max(0, sequential ? l.subtotal - l.discount : l.subtotal);
+  const base = (l: CouponLineInput) => Math.max(0, l.subtotal);
   const remaining = (l: CouponLineInput) => Math.max(0, round2(l.subtotal - l.discount));
 
   for (const coupon of coupons || []) {

package/base44/shared/commerce/email-templates.ts

@@ -66,12 +66,12 @@ const DEFAULT_COPY: Record<string, EmailCopy> = {
   },
 };
 
-function substitute(text: string, order: any, general: Record<string, any>): string {
+function substitute(text: string, order: any, storeName: string, general: Record<string, any>): string {
   const customerName = [order.billing?.first_name, order.billing?.last_name].filter(Boolean).join(" ") || "customer";
   const out = (text || "")
     .replaceAll("{order_number}", String(order.order_number ?? ""))
     .replaceAll("{customer_name}", customerName)
-    .replaceAll("{store_name}", String(general.store_name || ""))
+    .replaceAll("{store_name}", storeName)
     .replaceAll("{order_total}", formatMoney(order.total ?? 0, general));
   // An unnamed store must not leave debris behind: "[]: New order", "Your  order",
   // "Invoice #12 from ". A missing name drops out of the sentence instead.
@@ -89,7 +89,7 @@ function esc(s: unknown): string {
 const cell = 'style="padding:8px 12px;border-bottom:1px solid #e5e5e5;font-size:14px;color:#333;"';
 const cellR = 'style="padding:8px 12px;border-bottom:1px solid #e5e5e5;font-size:14px;color:#333;text-align:right;"';
 
-function addressBlock(title: string, a: any, general: Record<string, any>): string {
+function addressBlock(title: string, a: any): string {
   if (!a || (!a.address_1 && !a.first_name && !a.city)) return "";
   const lines = [
     [a.first_name, a.last_name].filter(Boolean).join(" "),
@@ -121,8 +121,8 @@ export interface RenderedEmail {
 }
 
 /**
- * Render an order email. `settings` is the groups object (uses `emails` for
- * overrides and `general` for store name / money format).
+ * Render an order email. `settings` is the groups object (uses `emails` for the
+ * store name and per-type overrides, `general` for money format).
  */
 export function renderOrderEmail(
   type: string,
@@ -131,12 +131,14 @@ export function renderOrderEmail(
   extra: RenderExtra = {},
 ): RenderedEmail {
   const general = settings.general ?? {};
-  const typeCfg = (settings.emails ?? {})[type] ?? {};
+  const emails = settings.emails ?? {};
+  const storeName = String(emails.store_name || "");
+  const typeCfg = emails[type] ?? {};
   const copy = DEFAULT_COPY[type] ?? DEFAULT_COPY.customer_invoice;
 
-  const subject = substitute(typeCfg.subject || copy.subject, order, general);
-  const heading = substitute(typeCfg.heading || copy.heading, order, general);
-  const intro = substitute(copy.intro, order, general);
+  const subject = substitute(typeCfg.subject || copy.subject, order, storeName, general);
+  const heading = substitute(typeCfg.heading || copy.heading, order, storeName, general);
+  const intro = substitute(copy.intro, order, storeName, general);
   const money = (n: number) => esc(formatMoney(n ?? 0, general));
 
   const itemRows = (order.line_items || []).map((li: any) => `
@@ -197,7 +199,7 @@ export function renderOrderEmail(
   <table role="presentation" width="600" align="center" cellpadding="0" cellspacing="0" style="background:#ffffff;border-radius:6px;overflow:hidden;margin:0 auto;">
     <tr>
       <td style="background:#557da1;padding:24px;">
-        <h1 style="margin:0;color:#ffffff;font-size:22px;font-weight:600;">${esc(general.store_name || "Your order")}</h1>
+        <h1 style="margin:0;color:#ffffff;font-size:22px;font-weight:600;">${esc(storeName || "Your order")}</h1>
       </td>
     </tr>
     <tr>
@@ -218,15 +220,15 @@ export function renderOrderEmail(
         ${payHtml}${customerNoteHtml}${additional}
         <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="margin-top:20px;">
           <tr>
-            ${addressBlock("Billing address", order.billing, general)}
-            ${addressBlock("Shipping address", order.shipping, general)}
+            ${addressBlock("Billing address", order.billing)}
+            ${addressBlock("Shipping address", order.shipping)}
           </tr>
         </table>
       </td>
     </tr>
     <tr>
       <td style="padding:16px 24px;background:#fafafa;border-top:1px solid #eee;">
-        <p style="margin:0;font-size:12px;color:#999;">${general.store_name ? `${esc(general.store_name)} — ` : ""}powered by the Base44 commerce template</p>
+        <p style="margin:0;font-size:12px;color:#999;">${storeName ? `${esc(storeName)} — ` : ""}powered by the Base44 commerce template</p>
       </td>
     </tr>
   </table>

package/base44/shared/commerce/emails.ts

@@ -120,7 +120,8 @@ export async function sendOrderEmail(
     }
 
     const { subject, html } = renderOrderEmail(type, order, settings, opts.extra ?? {});
-    const fromName = cfg.from_name || settings.general?.store_name || undefined;
+    // Blank sends without from_name, in which case Base44 sends as the app's name.
+    const fromName = cfg.store_name || undefined;
 
     let anySent = false;
     for (const { to, target } of recipients) {
@@ -172,7 +173,7 @@ export async function sendStockEmail(sr: any, kind: string, product: any, opts:
       return;
     }
 
-    const storeName = settings.general?.store_name || "";
+    const storeName = settings.emails?.store_name || "";
     const labels: Record<string, string> = {
       low_stock: "is low in stock",
       out_of_stock: "is out of stock",
@@ -182,7 +183,7 @@ export async function sendStockEmail(sr: any, kind: string, product: any, opts:
     const body = `<p><strong>${product.name}</strong> (${product.sku || "no SKU"}) ${labels[kind] ?? kind}.</p>
 <p>Remaining stock: ${product.stock_quantity ?? "n/a"}</p>`;
     try {
-      await sr.integrations.Core.SendEmail({ to, subject, body, from_name: settings.emails?.from_name });
+      await sr.integrations.Core.SendEmail({ to, subject, body, from_name: storeName || undefined });
       await logEmail(sr, { type: kind, recipient: to, target: "admin", subject, success: true });
     } catch (e) {
       await logEmail(sr, {

package/base44/shared/commerce/payments.ts

@@ -194,23 +194,12 @@ export function isAbsoluteUrl(value: unknown): boolean {
 }
 
 /**
- * First candidate that is a usable absolute origin, without a trailing slash.
+ * The origin of the caller, from the request headers ("" when absent).
  *
  * Providers reject relative paths ("Not a valid URL"), so the return URLs have
- * to be built from a real origin. Callers pass their candidates in order of
- * authority — an explicit `return_url`, the store's configured URL, then the
- * origin the request came from (the admin or storefront calling this lives on the
- * app's own host, which is exactly where the customer should land back).
+ * to be built from a real origin — and the storefront calling this is exactly
+ * where the customer should land back.
  */
-export function resolveReturnBase(candidates: Array<unknown>): string {
-  for (const candidate of candidates) {
-    const value = String(candidate ?? "").trim();
-    if (value && isAbsoluteUrl(value)) return value.replace(/\/+$/, "");
-  }
-  return "";
-}
-
-/** The origin of the caller, from the request headers ("" when absent). */
 export function requestOrigin(req: Request): string {
   const origin = req.headers.get("origin");
   if (origin && isAbsoluteUrl(origin)) return origin;
@@ -254,8 +243,8 @@ export function orderReturnUrl(base: string, order: any, outcome: "success" | "c
  * to fix it — better than letting the provider answer "Not a valid URL".
  *
  * Precedence: `successUrl`/`cancelUrl` per outcome → `returnUrl` (the return
- * page, both outcomes) → `storeUrl`/request origin + `returnPath`. Every result
- * carries `order_id`, `order_key` and `payment`.
+ * page, both outcomes) → the calling storefront's own origin + `returnPath`.
+ * Every result carries `order_id`, `order_key` and `payment`.
  */
 export function resolveReturnUrls(opts: {
   order: any;
@@ -263,10 +252,9 @@ export function resolveReturnUrls(opts: {
   successUrl?: unknown;
   cancelUrl?: unknown;
   returnUrl?: unknown;
-  storeUrl?: unknown;
   returnPath?: unknown;
 }): { successUrl: string; cancelUrl: string } {
-  const base = resolveReturnBase([opts.storeUrl, opts.req ? requestOrigin(opts.req) : ""]);
+  const base = (opts.req ? requestOrigin(opts.req) : "").replace(/\/+$/, "");
 
   // A `returnUrl` naming a page is used as-is; a bare origin has no page in it,
   // so it is treated as a base and gets the store's return path appended.
@@ -289,9 +277,9 @@ export function resolveReturnUrls(opts: {
   if (!success || !cancel) {
     throw new HttpError(
       400,
-      "Can't build the return URLs for the payment page: pass an absolute success_url/cancel_url (or return_url pointing at your return page), or set the store URL in the store's general settings.",
+      "Can't build the return URLs for the payment page: the request carried no origin to return to, so pass an absolute success_url/cancel_url (or a return_url pointing at your return page).",
       "return_url_required",
-      { needs: ["success_url", "cancel_url"], hint: "settings.general.store_url + order_received_path" },
+      { needs: ["success_url", "cancel_url"], hint: "request origin + settings.general.order_received_path" },
     );
   }
   return { successUrl: success, cancelUrl: cancel };

package/base44/shared/commerce/products.ts

@@ -0,0 +1,24 @@
+/**
+ * Product shape predicates.
+ *
+ * There is no product `type` field: a product sells variants because it carries
+ * attributes, and every entry in `attributes[]` is a variant axis. Attaching an
+ * attribute is the whole declaration — which also means a product with an axis
+ * but no variations is deliberately unsellable (`variation_required`) rather
+ * than quietly falling back to the parent price.
+ *
+ * Descriptive properties are not attributes; they live in `meta_data` (the
+ * admin calls them modifiers) and never affect price or stock.
+ */
+
+/** Does this product sell variants? */
+export function isVariable(product: any): boolean {
+  return (product?.attributes ?? []).length > 0;
+}
+
+/** The variant axes, in the order the storefront should present them. */
+export function variationAxes(product: any): any[] {
+  return (product?.attributes ?? [])
+    .slice()
+    .sort((a: any, b: any) => (a?.position ?? 0) - (b?.position ?? 0));
+}

package/base44/shared/commerce/settings.ts

@@ -37,14 +37,13 @@ export function storefrontSafeSettings(groups: Record<string, any>): Record<stri
   const tax = groups.tax ?? {};
   const inventory = groups.inventory ?? {};
   return {
-    store_name: general.store_name ?? "",
+    // The one key taken from the emails group: the store's own name is public.
+    store_name: groups.emails?.store_name ?? "",
     currency: general.currency ?? "USD",
     currency_position: general.currency_position ?? "left",
     thousand_sep: general.thousand_sep ?? ",",
     decimal_sep: general.decimal_sep ?? ".",
     num_decimals: general.num_decimals ?? 2,
-    enable_taxes: general.enable_taxes ?? true,
-    enable_coupons: general.enable_coupons ?? true,
     weight_unit: products.weight_unit ?? "kg",
     dimension_unit: products.dimension_unit ?? "cm",
     enable_reviews: products.enable_reviews ?? true,