create-brainerce-store 1.72.0 → 1.74.0

package/templates/nextjs/base/src/ui/product/frequently-bought-together.tsx

@@ -1,191 +1,197 @@
-'use client';
-
-import { useState } from 'react';
-import { Image as ImageIcon } from 'lucide-react';
-import { CdnImage as Image } from '@/ui/shared/cdn-image';
-import type { Product, ProductRecommendation } from 'brainerce';
-import { formatPrice } from 'brainerce';
-import { useCart, useStoreInfo } from '@/core/providers/store-provider';
-import { useCurrency } from '@/core/lib/use-currency';
-import { useTranslations } from '@/core/lib/translations';
-import { Button } from '@/components/ui/button';
-import { Card } from '@/components/ui/card';
-import { Checkbox } from '@/components/ui/checkbox';
-import { cn } from '@/core/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 && (
-        <Checkbox
-          checked={checked}
-          onCheckedChange={onToggle}
-          className="absolute start-2 top-2"
-        />
-      )}
-      <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">
-            <ImageIcon
-              className="text-muted-foreground h-8 w-8"
-              strokeWidth={1.5}
-              aria-hidden="true"
-            />
-          </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('@/core/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 (
-    <Card className={cn('shadow-none 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="rounded px-5">
-          {adding ? t('addingAll') : t('addSelectedToCart')}
-        </Button>
-      </div>
-    </Card>
-  );
-}
+'use client';
+
+import { useState } from 'react';
+import { Image as ImageIcon } from 'lucide-react';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
+import type { Product, ProductRecommendation } from 'brainerce';
+import { formatPrice } from 'brainerce';
+import { useCart, useStoreInfo } from '@/core/providers/store-provider';
+import { useCurrency } from '@/core/lib/use-currency';
+import { useTranslations } from '@/core/lib/translations';
+import { Button } from '@/components/ui/button';
+import { Card } from '@/components/ui/card';
+import { Checkbox } from '@/components/ui/checkbox';
+import { cn } from '@/core/lib/utils';
+
+interface FrequentlyBoughtTogetherProps {
+  items: ProductRecommendation[];
+  currentProduct: Product;
+  className?: string;
+}
+
+// ⛔ STORE CURRENCY THROUGHOUT, deliberately. The cross-sells are
+// `ProductRecommendation`, a trimmed shape with no displayPrice/displayCurrency,
+// so there is nothing to convert them to. Converting only `currentProduct`
+// (which is a full Product and does carry FX fields) would add a euro amount to
+// two dollar amounts and print the result as one total. One currency wins, and
+// it has to be the one the cart actually charges.
+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 && (
+        <Checkbox
+          checked={checked}
+          onCheckedChange={onToggle}
+          className="absolute start-2 top-2"
+        />
+      )}
+      <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">
+            <ImageIcon
+              className="text-muted-foreground h-8 w-8"
+              strokeWidth={1.5}
+              aria-hidden="true"
+            />
+          </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('@/core/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 (
+    <Card className={cn('shadow-none 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="rounded px-5">
+          {adding ? t('addingAll') : t('addSelectedToCart')}
+        </Button>
+      </div>
+    </Card>
+  );
+}

package/templates/nextjs/base/src/ui/product/product-card.tsx

@@ -1,11 +1,12 @@
 'use client';
 
 import { useState } from 'react';
-import { Check, Image as ImageIcon, Plus, ShoppingCart } from 'lucide-react';
+import { Check, Image as ImageIcon, Plus, ShoppingCart, Star } from 'lucide-react';
 import { Link, useRouter } from '@/core/lib/navigation';
 import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { Product } from 'brainerce';
-import { getProductPriceInfo, getVariantPrice, formatPrice } from 'brainerce';
+import { getProductPriceInfo, formatPrice } from 'brainerce';
+import { pickDisplayPrice, pickDisplayPriceRange } from '@/core/lib/display-price';
 import { useTranslations } from '@/core/lib/translations';
 import { PriceDisplay } from '@/ui/product/price-display';
 import { StockBadge } from '@/ui/product/stock-badge';
@@ -23,57 +24,14 @@ 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();
-
-  let min: number;
-  let max: number;
-  if (product.priceMin && product.priceMax) {
-    min = parseFloat(product.priceMin);
-    max = parseFloat(product.priceMax);
-  } else {
-    const variants = product.variants ?? [];
-    if (variants.length === 0) return null;
-    const prices = variants.map((v) => getVariantPrice(v, product.basePrice));
-    min = Math.min(...prices);
-    max = Math.max(...prices);
-  }
-
-  if (isNaN(min) || isNaN(max)) return null;
+  const fallbackCurrency = useCurrency();
+  // ⛔ Region-aware. A range built from priceMin/priceMax alone stays in the
+  // store currency while the single-price card beside it converts, so a
+  // variable product would quote a different currency from its neighbours.
+  const range = pickDisplayPriceRange(product, fallbackCurrency);
+  if (!range) return null;
+  const { min, max, currency } = range;
 
   return (
     <span className="text-foreground text-sm font-medium">
@@ -88,6 +46,7 @@ export function ProductCard({ product, className }: ProductCardProps) {
   const t = useTranslations('common');
   const tp = useTranslations('productDetail');
   const tProd = useTranslations('products');
+  const tr = useTranslations('reviews');
   const router = useRouter();
   const { refreshCart } = useCart();
   const fallbackCurrency = useCurrency();
@@ -223,6 +182,20 @@ export function ProductCard({ product, className }: ProductCardProps) {
           </h3>
         </Link>
 
+        {/* Star rating. `avgRating` / `reviewCount` are denormalized rollups
+            the API returns on every product fetch. Auto-hides on a store with
+            no reviews yet: `reviewCount` is 0 (or absent) and the whole block
+            is skipped, so nothing renders and the card keeps its layout. */}
+        {product.reviewCount ? (
+          <div className="flex items-center gap-1" aria-label={tr('starRating')}>
+            <Star className="h-3.5 w-3.5 fill-amber-400 text-amber-400" aria-hidden="true" />
+            <span className="text-foreground text-xs font-medium">
+              {(product.avgRating ?? 0).toFixed(1)}
+            </span>
+            <span className="text-muted-foreground text-xs">({product.reviewCount})</span>
+          </div>
+        ) : null}
+
         {/* Price */}
         {isVariable ? (
           <VariantPriceRange product={product} />

package/templates/nextjs/base/src/ui/product/product-client-section.tsx

@@ -8,6 +8,7 @@ import { PriceDisplay } from '@/ui/product/price-display';
 import { LoadingSpinner } from '@/ui/shared/loading-spinner';
 import { VariantSelector } from '@/ui/product/variant-selector';
 import { StockBadge } from '@/ui/product/stock-badge';
+import { DiscountBadge } from '@/ui/product/discount-badge';
 import { BackInStockForm, canOfferStockAlert } from '@/ui/product/back-in-stock-form';
 import { RecommendationSection } from '@/ui/product/recommendation-section';
 import { FrequentlyBoughtTogether } from '@/ui/product/frequently-bought-together';
@@ -132,6 +133,7 @@ export function ProductClientSection({
     selectedVariant,
     setSelectedVariant,
     priceInfo,
+    displayPrice,
     inventory,
     canPurchase,
     description,
@@ -253,10 +255,17 @@ export function ProductClientSection({
               </div>
             )}
 
+          {/* Active discount rule on this product, as a badge. `product.discount`
+              is returned by getProductBySlug and is null/absent when no rule
+              applies, and DiscountBadge returns null on a falsy `discount`, so
+              this renders nothing on a store with no discounts configured. */}
+          <DiscountBadge discount={product.discount} className="w-fit" />
+
           {/* Price */}
           <PriceDisplay
-            price={priceInfo.originalPrice}
-            salePrice={priceInfo.isOnSale ? priceInfo.price : undefined}
+            price={displayPrice.price}
+            salePrice={displayPrice.salePrice ?? undefined}
+            currency={displayPrice.currency}
             size="lg"
           />
 
@@ -270,7 +279,7 @@ export function ProductClientSection({
               {t('instantDownload')}
             </Badge>
           ) : (
-            <StockBadge inventory={inventory} lowStockThreshold={5} />
+            <StockBadge inventory={inventory} />
           )}
 
           {/* Downloadable files info */}