create-brainerce-store 1.43.0 → 1.43.2

package/templates/nextjs/base/src/components/checkout/tax-display.tsx

@@ -1,64 +1,74 @@
-'use client';
-
-import type { TaxBreakdown } from 'brainerce';
-import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCurrency } from '@/lib/use-currency';
-import { cn } from '@/lib/utils';
-
-interface TaxDisplayProps {
-  /** Whether shipping address has been set */
-  addressSet: boolean;
-  /** Tax amount string from checkout (only available after address is set) */
-  taxAmount?: string;
-  /** Detailed tax breakdown (optional) */
-  taxBreakdown?: TaxBreakdown | null;
-  className?: string;
-}
-
-export function TaxDisplay({ addressSet, taxAmount, taxBreakdown, className }: TaxDisplayProps) {
-  const t = useTranslations('checkout');
-  const tc = useTranslations('common');
-  const currency = useCurrency();
-
-  // Before address is set
-  if (!addressSet) {
-    return (
-      <div className={cn('flex items-center justify-between text-sm', className)}>
-        <span className="text-muted-foreground">{tc('tax')}</span>
-        <span className="text-muted-foreground text-xs">{t('calculatedAfterAddress')}</span>
-      </div>
-    );
-  }
-
-  // After address, show tax amount
-  const tax = taxAmount ? parseFloat(taxAmount) : 0;
-
-  return (
-    <div className={cn('space-y-1', className)}>
-      <div className="flex items-center justify-between text-sm">
-        <span className="text-muted-foreground">{tc('tax')}</span>
-        <span className="text-foreground font-medium">
-          {tax > 0 ? (formatPrice(tax, { currency }) as string) : t('noTax')}
-        </span>
-      </div>
-
-      {/* Tax breakdown details */}
-      {taxBreakdown && taxBreakdown.breakdown?.length > 0 && tax > 0 && (
-        <div className="space-y-0.5 ps-4">
-          {taxBreakdown.breakdown.map((item, index) => (
-            <div
-              key={index}
-              className="text-muted-foreground flex items-center justify-between text-xs"
-            >
-              <span>
-                {item.name} ({(item.rate * 100).toFixed(1)}%)
-              </span>
-              <span>{formatPrice(item.amount, { currency }) as string}</span>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
+'use client';
+
+import type { TaxBreakdown } from 'brainerce';
+import { formatPrice } from 'brainerce';
+import { useTranslations } from '@/lib/translations';
+import { useCurrency } from '@/lib/use-currency';
+import { cn } from '@/lib/utils';
+
+interface TaxDisplayProps {
+  /** Whether shipping address has been set */
+  addressSet: boolean;
+  /** Tax amount string from checkout (only available after address is set) */
+  taxAmount?: string;
+  /** Detailed tax breakdown (optional) */
+  taxBreakdown?: TaxBreakdown | null;
+  className?: string;
+}
+
+export function TaxDisplay({ addressSet, taxAmount, taxBreakdown, className }: TaxDisplayProps) {
+  const t = useTranslations('checkout');
+  const tc = useTranslations('common');
+  const currency = useCurrency();
+
+  // Before address is set
+  if (!addressSet) {
+    return (
+      <div className={cn('flex items-center justify-between text-sm', className)}>
+        <span className="text-muted-foreground">{tc('tax')}</span>
+        <span className="text-muted-foreground text-xs">{t('calculatedAfterAddress')}</span>
+      </div>
+    );
+  }
+
+  // Inclusive-pricing stores back the tax out of the displayed price, so
+  // `checkout.taxAmount` is stored as 0 and the real VAT lives on the
+  // aggregated breakdown. Surface whichever is present.
+  const explicitTax = taxAmount ? parseFloat(taxAmount) : 0;
+  const tax =
+    explicitTax > 0
+      ? explicitTax
+      : typeof taxBreakdown?.totalTax === 'number'
+        ? taxBreakdown.totalTax
+        : 0;
+
+  // When there's a per-rate breakdown, prefer per-row display ("VAT 18% ₪3.05").
+  // Otherwise show a single aggregated tax line.
+  const hasBreakdown = !!taxBreakdown?.breakdown && taxBreakdown.breakdown.length > 0;
+
+  if (hasBreakdown) {
+    return (
+      <div className={cn('space-y-1', className)}>
+        {taxBreakdown!.breakdown.map((item, index) => (
+          <div key={index} className="flex items-center justify-between text-sm">
+            <span className="text-muted-foreground">
+              {item.name} ({(item.rate * 100).toFixed(1)}%)
+            </span>
+            <span className="text-foreground font-medium">
+              {formatPrice(item.amount, { currency }) as string}
+            </span>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn('flex items-center justify-between text-sm', className)}>
+      <span className="text-muted-foreground">{tc('tax')}</span>
+      <span className="text-foreground font-medium">
+        {tax > 0 ? (formatPrice(tax, { currency }) as string) : t('noTax')}
+      </span>
+    </div>
+  );
+}

package/templates/nextjs/base/src/components/products/frequently-bought-together.tsx

@@ -1,203 +1,203 @@
-'use client';
-
-import { useState } from 'react';
-import Image from 'next/image';
-import type { Product, ProductRecommendation } from 'brainerce';
-import { formatPrice } from 'brainerce';
-import { useCart, useStoreInfo } from '@/providers/store-provider';
-import { useCurrency } from '@/lib/use-currency';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-
-interface FrequentlyBoughtTogetherProps {
-  items: ProductRecommendation[];
-  currentProduct: Product;
-  className?: string;
-}
-
-function getEffectivePrice(item: { basePrice: string; salePrice?: string | null }): number {
-  const sale = item.salePrice ? parseFloat(item.salePrice) : null;
-  const base = parseFloat(item.basePrice);
-  return sale != null && sale < base ? sale : base;
-}
-
-function ProductThumb({
-  name,
-  imageUrl,
-  price,
-  currency,
-  checked,
-  onToggle,
-  disabled,
-}: {
-  name: string;
-  imageUrl: string | null;
-  price: number;
-  currency: string;
-  checked: boolean;
-  onToggle?: () => void;
-  disabled?: boolean;
-}) {
-  return (
-    <label
-      className={cn(
-        'border-border bg-background relative flex cursor-pointer flex-col items-center rounded-lg border p-3 transition-all',
-        checked ? 'ring-primary ring-2' : 'opacity-60',
-        disabled && 'pointer-events-none'
-      )}
-    >
-      {onToggle && (
-        <input
-          type="checkbox"
-          checked={checked}
-          onChange={onToggle}
-          className="absolute start-2 top-2 h-4 w-4 rounded"
-        />
-      )}
-      <div className="bg-muted relative mb-2 h-20 w-20 overflow-hidden rounded">
-        {imageUrl ? (
-          <Image src={imageUrl} alt={name} fill sizes="80px" className="object-cover" />
-        ) : (
-          <div className="flex h-full w-full items-center justify-center">
-            <svg
-              className="text-muted-foreground h-8 w-8"
-              fill="none"
-              viewBox="0 0 24 24"
-              stroke="currentColor"
-            >
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                strokeWidth={1.5}
-                d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
-              />
-            </svg>
-          </div>
-        )}
-      </div>
-      <span className="text-foreground line-clamp-2 text-center text-xs font-medium">{name}</span>
-      <span className="text-muted-foreground mt-1 text-xs">
-        {formatPrice(price, { currency }) as string}
-      </span>
-    </label>
-  );
-}
-
-export function FrequentlyBoughtTogether({
-  items,
-  currentProduct,
-  className,
-}: FrequentlyBoughtTogetherProps) {
-  // Hooks must be called unconditionally and in the same order on every
-  // render — keep all of them above any early `return null` branch.
-  const { storeInfo } = useStoreInfo();
-  const { refreshCart } = useCart();
-  const t = useTranslations('productDetail');
-  const currency = useCurrency();
-
-  // Only show up to 3 cross-sells
-  const crossSells = items.slice(0, 3);
-
-  const [selected, setSelected] = useState<Set<string>>(() => new Set(crossSells.map((i) => i.id)));
-  const [adding, setAdding] = useState(false);
-
-  if (!storeInfo?.upsell?.frequentlyBoughtTogetherEnabled) return null;
-  if (crossSells.length === 0) return null;
-
-  const currentPrice = getEffectivePrice(currentProduct);
-  const currentImage = currentProduct.images?.[0];
-  const currentImageUrl = currentImage
-    ? typeof currentImage === 'string'
-      ? currentImage
-      : currentImage.url
-    : null;
-
-  const totalPrice = crossSells
-    .filter((item) => selected.has(item.id))
-    .reduce((sum, item) => sum + getEffectivePrice(item), currentPrice);
-
-  const toggleItem = (id: string) => {
-    setSelected((prev) => {
-      const next = new Set(prev);
-      if (next.has(id)) {
-        next.delete(id);
-      } else {
-        next.add(id);
-      }
-      return next;
-    });
-  };
-
-  async function handleAddAll() {
-    if (adding || selected.size === 0) return;
-    try {
-      setAdding(true);
-      const { getClient } = await import('@/lib/brainerce');
-      const client = getClient();
-      const selectedItems = crossSells.filter((item) => selected.has(item.id));
-      for (const item of selectedItems) {
-        await client.smartAddToCart({ productId: item.id, quantity: 1 });
-      }
-      await refreshCart();
-    } catch (err) {
-      console.error('Failed to add items to cart:', err);
-    } finally {
-      setAdding(false);
-    }
-  }
-
-  return (
-    <div className={cn('border-border rounded-lg border p-6', className)}>
-      <h2 className="text-foreground mb-4 text-xl font-semibold">
-        {t('frequentlyBoughtTogether')}
-      </h2>
-
-      <div className="flex flex-wrap items-center gap-3">
-        {/* Current product (always included, no checkbox) */}
-        <ProductThumb
-          name={currentProduct.name}
-          imageUrl={currentImageUrl}
-          price={currentPrice}
-          currency={currency}
-          checked={true}
-          disabled
-        />
-
-        {crossSells.map((item) => {
-          const img = item.images?.[0];
-          const imgUrl = img ? (typeof img === 'string' ? img : img.url) : null;
-          return (
-            <div key={item.id} className="flex items-center gap-3">
-              <span className="text-muted-foreground text-lg font-light">+</span>
-              <ProductThumb
-                name={item.name}
-                imageUrl={imgUrl}
-                price={getEffectivePrice(item)}
-                currency={currency}
-                checked={selected.has(item.id)}
-                onToggle={() => toggleItem(item.id)}
-              />
-            </div>
-          );
-        })}
-      </div>
-
-      {/* Total + Add button */}
-      <div className="mt-4 flex flex-wrap items-center gap-4">
-        <span className="text-foreground text-lg font-semibold">
-          {t('totalPrice', { price: formatPrice(totalPrice, { currency }) as string })}
-        </span>
-        <button
-          onClick={handleAddAll}
-          disabled={adding || selected.size === 0}
-          className={cn(
-            'bg-primary text-primary-foreground rounded px-5 py-2.5 text-sm font-medium transition-opacity hover:opacity-90',
-            'disabled:cursor-not-allowed disabled:opacity-50'
-          )}
-        >
-          {adding ? t('addingAll') : t('addSelectedToCart')}
-        </button>
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { useState } from 'react';
+import Image from 'next/image';
+import type { Product, ProductRecommendation } from 'brainerce';
+import { formatPrice } from 'brainerce';
+import { useCart, useStoreInfo } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
+import { useTranslations } from '@/lib/translations';
+import { cn } from '@/lib/utils';
+
+interface FrequentlyBoughtTogetherProps {
+  items: ProductRecommendation[];
+  currentProduct: Product;
+  className?: string;
+}
+
+function getEffectivePrice(item: { basePrice: string; salePrice?: string | null }): number {
+  const sale = item.salePrice ? parseFloat(item.salePrice) : null;
+  const base = parseFloat(item.basePrice);
+  return sale != null && sale < base ? sale : base;
+}
+
+function ProductThumb({
+  name,
+  imageUrl,
+  price,
+  currency,
+  checked,
+  onToggle,
+  disabled,
+}: {
+  name: string;
+  imageUrl: string | null;
+  price: number;
+  currency: string;
+  checked: boolean;
+  onToggle?: () => void;
+  disabled?: boolean;
+}) {
+  return (
+    <label
+      className={cn(
+        'border-border bg-background relative flex cursor-pointer flex-col items-center rounded-lg border p-3 transition-all',
+        checked ? 'ring-primary ring-2' : 'opacity-60',
+        disabled && 'pointer-events-none'
+      )}
+    >
+      {onToggle && (
+        <input
+          type="checkbox"
+          checked={checked}
+          onChange={onToggle}
+          className="absolute start-2 top-2 h-4 w-4 rounded"
+        />
+      )}
+      <div className="bg-muted relative mb-2 h-20 w-20 overflow-hidden rounded">
+        {imageUrl ? (
+          <Image src={imageUrl} alt={name} fill sizes="80px" className="object-cover" />
+        ) : (
+          <div className="flex h-full w-full items-center justify-center">
+            <svg
+              className="text-muted-foreground h-8 w-8"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={1.5}
+                d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
+              />
+            </svg>
+          </div>
+        )}
+      </div>
+      <span className="text-foreground line-clamp-2 text-center text-xs font-medium">{name}</span>
+      <span className="text-muted-foreground mt-1 text-xs">
+        {formatPrice(price, { currency }) as string}
+      </span>
+    </label>
+  );
+}
+
+export function FrequentlyBoughtTogether({
+  items,
+  currentProduct,
+  className,
+}: FrequentlyBoughtTogetherProps) {
+  // Hooks must be called unconditionally and in the same order on every
+  // render — keep all of them above any early `return null` branch.
+  const { storeInfo } = useStoreInfo();
+  const { refreshCart } = useCart();
+  const t = useTranslations('productDetail');
+  const currency = useCurrency();
+
+  // Only show up to 3 cross-sells
+  const crossSells = items.slice(0, 3);
+
+  const [selected, setSelected] = useState<Set<string>>(() => new Set(crossSells.map((i) => i.id)));
+  const [adding, setAdding] = useState(false);
+
+  if (!storeInfo?.upsell?.frequentlyBoughtTogetherEnabled) return null;
+  if (crossSells.length === 0) return null;
+
+  const currentPrice = getEffectivePrice(currentProduct);
+  const currentImage = currentProduct.images?.[0];
+  const currentImageUrl = currentImage
+    ? typeof currentImage === 'string'
+      ? currentImage
+      : currentImage.url
+    : null;
+
+  const totalPrice = crossSells
+    .filter((item) => selected.has(item.id))
+    .reduce((sum, item) => sum + getEffectivePrice(item), currentPrice);
+
+  const toggleItem = (id: string) => {
+    setSelected((prev) => {
+      const next = new Set(prev);
+      if (next.has(id)) {
+        next.delete(id);
+      } else {
+        next.add(id);
+      }
+      return next;
+    });
+  };
+
+  async function handleAddAll() {
+    if (adding || selected.size === 0) return;
+    try {
+      setAdding(true);
+      const { getClient } = await import('@/lib/brainerce');
+      const client = getClient();
+      const selectedItems = crossSells.filter((item) => selected.has(item.id));
+      for (const item of selectedItems) {
+        await client.smartAddToCart({ productId: item.id, quantity: 1 });
+      }
+      await refreshCart();
+    } catch (err) {
+      console.error('Failed to add items to cart:', err);
+    } finally {
+      setAdding(false);
+    }
+  }
+
+  return (
+    <div className={cn('border-border rounded-lg border p-6', className)}>
+      <h2 className="text-foreground mb-4 text-xl font-semibold">
+        {t('frequentlyBoughtTogether')}
+      </h2>
+
+      <div className="flex flex-wrap items-center gap-3">
+        {/* Current product (always included, no checkbox) */}
+        <ProductThumb
+          name={currentProduct.name}
+          imageUrl={currentImageUrl}
+          price={currentPrice}
+          currency={currency}
+          checked={true}
+          disabled
+        />
+
+        {crossSells.map((item) => {
+          const img = item.images?.[0];
+          const imgUrl = img ? (typeof img === 'string' ? img : img.url) : null;
+          return (
+            <div key={item.id} className="flex items-center gap-3">
+              <span className="text-muted-foreground text-lg font-light">+</span>
+              <ProductThumb
+                name={item.name}
+                imageUrl={imgUrl}
+                price={getEffectivePrice(item)}
+                currency={currency}
+                checked={selected.has(item.id)}
+                onToggle={() => toggleItem(item.id)}
+              />
+            </div>
+          );
+        })}
+      </div>
+
+      {/* Total + Add button */}
+      <div className="mt-4 flex flex-wrap items-center gap-4">
+        <span className="text-foreground text-lg font-semibold">
+          {t('totalPrice', { price: formatPrice(totalPrice, { currency }) as string })}
+        </span>
+        <button
+          onClick={handleAddAll}
+          disabled={adding || selected.size === 0}
+          className={cn(
+            'bg-primary text-primary-foreground rounded px-5 py-2.5 text-sm font-medium transition-opacity hover:opacity-90',
+            'disabled:cursor-not-allowed disabled:opacity-50'
+          )}
+        >
+          {adding ? t('addingAll') : t('addSelectedToCart')}
+        </button>
+      </div>
+    </div>
+  );
+}

package/templates/nextjs/base/src/components/products/product-card.tsx

@@ -18,6 +18,41 @@ interface ProductCardProps {
   className?: string;
 }
 
+/**
+ * Pick the price + currency to render for a given product (PRD §23 FX overlay).
+ *
+ * When the storefront passed `regionId` to `getProducts({ regionId })` AND the
+ * region currency differs from the store currency, the backend attaches
+ * additive `displayPrice` / `displayCurrency` fields. Otherwise we fall back
+ * to the canonical store-currency `basePrice` / `salePrice`. Either way the
+ * cart still charges in the store currency — this only affects display.
+ */
+function pickDisplayPrice(
+  product: Product,
+  fallbackCurrency: string
+): { price: number | undefined; salePrice: number | null; currency: string } {
+  if (product.displayPrice != null && product.displayCurrency) {
+    const sale =
+      product.displaySalePrice != null ? parseFloat(product.displaySalePrice) : null;
+    return {
+      // `displayPrice` is the base price converted to the region currency —
+      // it goes into the PriceDisplay `price` (base) slot, NOT the sale slot.
+      price: parseFloat(product.displayPrice),
+      salePrice: sale != null && !Number.isNaN(sale) ? sale : null,
+      currency: product.displayCurrency,
+    };
+  }
+  // Same-currency fallback. `getProductPriceInfo.price` is the EFFECTIVE
+  // charged amount (= salePrice when on sale, base otherwise); `originalPrice`
+  // is the base. Map them to PriceDisplay's (price = base, salePrice = sale).
+  const { price: effective, originalPrice, isOnSale } = getProductPriceInfo(product);
+  return {
+    price: originalPrice,
+    salePrice: isOnSale ? effective : null,
+    currency: fallbackCurrency,
+  };
+}
+
 function VariantPriceRange({ product }: { product: Product }) {
   const currency = useCurrency();
 
@@ -51,6 +86,11 @@ export function ProductCard({ product, className }: ProductCardProps) {
   const tProd = useTranslations('products');
   const router = useRouter();
   const { refreshCart } = useCart();
+  const fallbackCurrency = useCurrency();
+  // FX overlay (PRD §23): prefer the region-converted display values when the
+  // storefront passed regionId to getProducts. Otherwise fall back to the
+  // canonical store-currency basePrice / salePrice.
+  const display = pickDisplayPrice(product, fallbackCurrency);
   const { price, originalPrice, isOnSale } = getProductPriceInfo(product);
   const mainImage = product.images?.[0];
   const imageUrl = mainImage?.url || null;
@@ -215,7 +255,12 @@ export function ProductCard({ product, className }: ProductCardProps) {
         {isVariable ? (
           <VariantPriceRange product={product} />
         ) : (
-          <PriceDisplay price={originalPrice} salePrice={isOnSale ? price : undefined} size="sm" />
+          <PriceDisplay
+            price={display.price ?? originalPrice}
+            salePrice={display.salePrice ?? (isOnSale ? price : undefined)}
+            currency={display.currency}
+            size="sm"
+          />
         )}
 
         {/* Stock */}