create-brainerce-store 1.42.0 → 1.43.0

package/templates/nextjs/base/src/components/cart/cart-summary.tsx

@@ -1,108 +1,108 @@
-'use client';
-
-import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useStoreInfo, useCart } from '@/providers/store-provider';
-import { cn } from '@/lib/utils';
-
-interface CartSummaryProps {
-  className?: string;
-}
-
-export function CartSummary({ className }: CartSummaryProps) {
-  const t = useTranslations('cart');
-  const tc = useTranslations('common');
-  const { storeInfo } = useStoreInfo();
-  const { totals, cart } = useCart();
-  const currency = storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
-
-  const rules = cart?.appliedDiscounts;
-  const ruleAmt = cart?.ruleDiscountAmount ? parseFloat(cart.ruleDiscountAmount) : 0;
-  const couponAmt = totals.discount - ruleAmt;
-
-  return (
-    <div className={cn('space-y-3', className)}>
-      <h3 className="text-foreground text-lg font-semibold">{t('orderSummary')}</h3>
-
-      <div className="space-y-2 text-sm">
-        {/* Subtotal */}
-        <div className="flex items-center justify-between">
-          <span className="text-muted-foreground">{tc('subtotal')}</span>
-          <span className="text-foreground font-medium">
-            {formatPrice(totals.subtotal, { currency }) as string}
-          </span>
-        </div>
-
-        {/* Rule discounts - show each rule by name */}
-        {rules && rules.length > 0
-          ? rules.map((rule) => (
-              <div key={rule.ruleId} className="flex items-center justify-between">
-                <span className="text-muted-foreground">{rule.ruleName}</span>
-                <span className="text-destructive font-medium">
-                  -{formatPrice(parseFloat(rule.discountAmount), { currency }) as string}
-                </span>
-              </div>
-            ))
-          : ruleAmt > 0 && (
-              <div className="flex items-center justify-between">
-                <span className="text-muted-foreground">{tc('generalDiscount')}</span>
-                <span className="text-destructive font-medium">
-                  -{formatPrice(ruleAmt, { currency }) as string}
-                </span>
-              </div>
-            )}
-
-        {/* Coupon discount */}
-        {cart?.couponCode && couponAmt > 0 && (
-          <div className="flex items-center justify-between">
-            <span className="text-muted-foreground">
-              {tc('couponDiscount')} ({cart.couponCode})
-            </span>
-            <span className="text-destructive font-medium">
-              -{formatPrice(couponAmt, { currency }) as string}
-            </span>
-          </div>
-        )}
-
-        {/* Fallback: generic discount when no breakdown available */}
-        {totals.discount > 0 &&
-          ruleAmt <= 0 &&
-          !cart?.couponCode &&
-          (!rules || rules.length === 0) && (
-            <div className="flex items-center justify-between">
-              <span className="text-muted-foreground">{tc('discount')}</span>
-              <span className="text-destructive font-medium">
-                -{formatPrice(totals.discount, { currency }) as string}
-              </span>
-            </div>
-          )}
-
-        {/* Shipping */}
-        {totals.shipping > 0 && (
-          <div className="flex items-center justify-between">
-            <span className="text-muted-foreground">{tc('shipping')}</span>
-            <span className="text-foreground font-medium">
-              {formatPrice(totals.shipping, { currency }) as string}
-            </span>
-          </div>
-        )}
-
-        {/* Tax */}
-        <div className="flex items-center justify-between">
-          <span className="text-muted-foreground">{tc('tax')}</span>
-          <span className="text-muted-foreground text-xs">{t('taxAtCheckout')}</span>
-        </div>
-
-        {/* Divider */}
-        <div className="border-border mt-2 border-t pt-2">
-          <div className="flex items-center justify-between">
-            <span className="text-foreground font-semibold">{tc('total')}</span>
-            <span className="text-foreground text-base font-semibold">
-              {formatPrice(totals.total, { currency }) as string}
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { formatPrice } from 'brainerce';
+import { useTranslations } from '@/lib/translations';
+import { useCart } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
+import { cn } from '@/lib/utils';
+
+interface CartSummaryProps {
+  className?: string;
+}
+
+export function CartSummary({ className }: CartSummaryProps) {
+  const t = useTranslations('cart');
+  const tc = useTranslations('common');
+  const { totals, cart } = useCart();
+  const currency = useCurrency();
+
+  const rules = cart?.appliedDiscounts;
+  const ruleAmt = cart?.ruleDiscountAmount ? parseFloat(cart.ruleDiscountAmount) : 0;
+  const couponAmt = totals.discount - ruleAmt;
+
+  return (
+    <div className={cn('space-y-3', className)}>
+      <h3 className="text-foreground text-lg font-semibold">{t('orderSummary')}</h3>
+
+      <div className="space-y-2 text-sm">
+        {/* Subtotal */}
+        <div className="flex items-center justify-between">
+          <span className="text-muted-foreground">{tc('subtotal')}</span>
+          <span className="text-foreground font-medium">
+            {formatPrice(totals.subtotal, { currency }) as string}
+          </span>
+        </div>
+
+        {/* Rule discounts - show each rule by name */}
+        {rules && rules.length > 0
+          ? rules.map((rule) => (
+              <div key={rule.ruleId} className="flex items-center justify-between">
+                <span className="text-muted-foreground">{rule.ruleName}</span>
+                <span className="text-destructive font-medium">
+                  -{formatPrice(parseFloat(rule.discountAmount), { currency }) as string}
+                </span>
+              </div>
+            ))
+          : ruleAmt > 0 && (
+              <div className="flex items-center justify-between">
+                <span className="text-muted-foreground">{tc('generalDiscount')}</span>
+                <span className="text-destructive font-medium">
+                  -{formatPrice(ruleAmt, { currency }) as string}
+                </span>
+              </div>
+            )}
+
+        {/* Coupon discount */}
+        {cart?.couponCode && couponAmt > 0 && (
+          <div className="flex items-center justify-between">
+            <span className="text-muted-foreground">
+              {tc('couponDiscount')} ({cart.couponCode})
+            </span>
+            <span className="text-destructive font-medium">
+              -{formatPrice(couponAmt, { currency }) as string}
+            </span>
+          </div>
+        )}
+
+        {/* Fallback: generic discount when no breakdown available */}
+        {totals.discount > 0 &&
+          ruleAmt <= 0 &&
+          !cart?.couponCode &&
+          (!rules || rules.length === 0) && (
+            <div className="flex items-center justify-between">
+              <span className="text-muted-foreground">{tc('discount')}</span>
+              <span className="text-destructive font-medium">
+                -{formatPrice(totals.discount, { currency }) as string}
+              </span>
+            </div>
+          )}
+
+        {/* Shipping */}
+        {totals.shipping > 0 && (
+          <div className="flex items-center justify-between">
+            <span className="text-muted-foreground">{tc('shipping')}</span>
+            <span className="text-foreground font-medium">
+              {formatPrice(totals.shipping, { currency }) as string}
+            </span>
+          </div>
+        )}
+
+        {/* Tax */}
+        <div className="flex items-center justify-between">
+          <span className="text-muted-foreground">{tc('tax')}</span>
+          <span className="text-muted-foreground text-xs">{t('taxAtCheckout')}</span>
+        </div>
+
+        {/* Divider */}
+        <div className="border-border mt-2 border-t pt-2">
+          <div className="flex items-center justify-between">
+            <span className="text-foreground font-semibold">{tc('total')}</span>
+            <span className="text-foreground text-base font-semibold">
+              {formatPrice(totals.total, { currency }) as string}
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

package/templates/nextjs/base/src/components/cart/cart-upgrade-banner.tsx

@@ -1,142 +1,141 @@
-'use client';
-
-import { useState, useEffect } from 'react';
-import Image from 'next/image';
-import type { CartUpgradeSuggestion, CartItem as CartItemType } from 'brainerce';
-import { formatPrice } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useStoreInfo } from '@/providers/store-provider';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-
-interface CartUpgradeBannerProps {
-  suggestion: CartUpgradeSuggestion;
-  cartItem: CartItemType;
-  onUpgrade: () => void;
-  className?: string;
-}
-
-export function CartUpgradeBanner({
-  suggestion,
-  cartItem,
-  onUpgrade,
-  className,
-}: CartUpgradeBannerProps) {
-  const { storeInfo } = useStoreInfo();
-  const t = useTranslations('cart');
-  const currency = storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
-  const [upgrading, setUpgrading] = useState(false);
-  const [dismissed, setDismissed] = useState(false);
-
-  const storageKey = `dismissed_upgrade_${suggestion.sourceProductId}`;
-
-  useEffect(() => {
-    try {
-      if (sessionStorage.getItem(storageKey)) {
-        setDismissed(true);
-      }
-    } catch {
-      /* ignore */
-    }
-  }, [storageKey]);
-
-  if (dismissed) return null;
-
-  const target = suggestion.targetProduct;
-  const firstImage = target.images?.[0];
-  const imageUrl = firstImage
-    ? typeof firstImage === 'string'
-      ? firstImage
-      : firstImage.url
-    : null;
-  const formattedDelta = formatPrice(parseFloat(suggestion.priceDelta), { currency }) as string;
-
-  function handleDismiss() {
-    try {
-      sessionStorage.setItem(storageKey, '1');
-    } catch {
-      /* ignore */
-    }
-    setDismissed(true);
-  }
-
-  async function handleUpgrade() {
-    if (upgrading) return;
-    try {
-      setUpgrading(true);
-      const client = getClient();
-      await client.smartRemoveFromCart(cartItem.productId, cartItem.variantId || undefined);
-      await client.smartAddToCart({ productId: target.id, quantity: cartItem.quantity });
-      onUpgrade();
-    } catch (err) {
-      console.error('Failed to upgrade cart item:', err);
-    } finally {
-      setUpgrading(false);
-    }
-  }
-
-  return (
-    <div
-      className={cn(
-        'bg-primary/5 border-primary/20 relative flex items-center gap-3 rounded-lg border px-4 py-3',
-        className
-      )}
-    >
-      {/* Dismiss button */}
-      <button
-        type="button"
-        onClick={handleDismiss}
-        className="text-muted-foreground hover:text-foreground absolute end-2 top-2 text-xs"
-        aria-label={t('dismissUpgrade')}
-      >
-        <svg
-          className="h-4 w-4"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-          strokeWidth={2}
-        >
-          <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
-        </svg>
-      </button>
-
-      {/* Product image */}
-      <div className="bg-muted relative h-12 w-12 flex-shrink-0 overflow-hidden rounded">
-        {imageUrl ? (
-          <Image src={imageUrl} alt={target.name} fill sizes="48px" className="object-cover" />
-        ) : (
-          <div className="text-muted-foreground flex h-full w-full items-center justify-center">
-            <svg className="h-5 w-5" 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>
-
-      {/* Text */}
-      <div className="min-w-0 flex-1">
-        <p className="text-foreground text-sm font-medium">
-          {t('upgradeFor', { name: target.name, amount: formattedDelta })}
-        </p>
-      </div>
-
-      {/* Upgrade button */}
-      <button
-        type="button"
-        onClick={handleUpgrade}
-        disabled={upgrading}
-        className={cn(
-          'bg-primary text-primary-foreground flex-shrink-0 rounded px-3 py-1.5 text-xs font-medium transition-opacity hover:opacity-90',
-          'disabled:cursor-not-allowed disabled:opacity-50'
-        )}
-      >
-        {upgrading ? t('upgrading') : t('upgrade')}
-      </button>
-    </div>
-  );
-}
+'use client';
+
+import { useState, useEffect } from 'react';
+import Image from 'next/image';
+import type { CartUpgradeSuggestion, CartItem as CartItemType } from 'brainerce';
+import { formatPrice } from 'brainerce';
+import { getClient } from '@/lib/brainerce';
+import { useCurrency } from '@/lib/use-currency';
+import { useTranslations } from '@/lib/translations';
+import { cn } from '@/lib/utils';
+
+interface CartUpgradeBannerProps {
+  suggestion: CartUpgradeSuggestion;
+  cartItem: CartItemType;
+  onUpgrade: () => void;
+  className?: string;
+}
+
+export function CartUpgradeBanner({
+  suggestion,
+  cartItem,
+  onUpgrade,
+  className,
+}: CartUpgradeBannerProps) {
+  const t = useTranslations('cart');
+  const currency = useCurrency();
+  const [upgrading, setUpgrading] = useState(false);
+  const [dismissed, setDismissed] = useState(false);
+
+  const storageKey = `dismissed_upgrade_${suggestion.sourceProductId}`;
+
+  useEffect(() => {
+    try {
+      if (sessionStorage.getItem(storageKey)) {
+        setDismissed(true);
+      }
+    } catch {
+      /* ignore */
+    }
+  }, [storageKey]);
+
+  if (dismissed) return null;
+
+  const target = suggestion.targetProduct;
+  const firstImage = target.images?.[0];
+  const imageUrl = firstImage
+    ? typeof firstImage === 'string'
+      ? firstImage
+      : firstImage.url
+    : null;
+  const formattedDelta = formatPrice(parseFloat(suggestion.priceDelta), { currency }) as string;
+
+  function handleDismiss() {
+    try {
+      sessionStorage.setItem(storageKey, '1');
+    } catch {
+      /* ignore */
+    }
+    setDismissed(true);
+  }
+
+  async function handleUpgrade() {
+    if (upgrading) return;
+    try {
+      setUpgrading(true);
+      const client = getClient();
+      await client.smartRemoveFromCart(cartItem.productId, cartItem.variantId || undefined);
+      await client.smartAddToCart({ productId: target.id, quantity: cartItem.quantity });
+      onUpgrade();
+    } catch (err) {
+      console.error('Failed to upgrade cart item:', err);
+    } finally {
+      setUpgrading(false);
+    }
+  }
+
+  return (
+    <div
+      className={cn(
+        'bg-primary/5 border-primary/20 relative flex items-center gap-3 rounded-lg border px-4 py-3',
+        className
+      )}
+    >
+      {/* Dismiss button */}
+      <button
+        type="button"
+        onClick={handleDismiss}
+        className="text-muted-foreground hover:text-foreground absolute end-2 top-2 text-xs"
+        aria-label={t('dismissUpgrade')}
+      >
+        <svg
+          className="h-4 w-4"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+          strokeWidth={2}
+        >
+          <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+      </button>
+
+      {/* Product image */}
+      <div className="bg-muted relative h-12 w-12 flex-shrink-0 overflow-hidden rounded">
+        {imageUrl ? (
+          <Image src={imageUrl} alt={target.name} fill sizes="48px" className="object-cover" />
+        ) : (
+          <div className="text-muted-foreground flex h-full w-full items-center justify-center">
+            <svg className="h-5 w-5" 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>
+
+      {/* Text */}
+      <div className="min-w-0 flex-1">
+        <p className="text-foreground text-sm font-medium">
+          {t('upgradeFor', { name: target.name, amount: formattedDelta })}
+        </p>
+      </div>
+
+      {/* Upgrade button */}
+      <button
+        type="button"
+        onClick={handleUpgrade}
+        disabled={upgrading}
+        className={cn(
+          'bg-primary text-primary-foreground flex-shrink-0 rounded px-3 py-1.5 text-xs font-medium transition-opacity hover:opacity-90',
+          'disabled:cursor-not-allowed disabled:opacity-50'
+        )}
+      >
+        {upgrading ? t('upgrading') : t('upgrade')}
+      </button>
+    </div>
+  );
+}

package/templates/nextjs/base/src/components/cart/free-shipping-bar.tsx

@@ -1,59 +1,62 @@
-'use client';
-
-import { formatPrice } from 'brainerce';
-import { useStoreInfo, useCart } from '@/providers/store-provider';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-
-interface FreeShippingBarProps {
-  className?: string;
-}
-
-export function FreeShippingBar({ className }: FreeShippingBarProps) {
-  const t = useTranslations('cart');
-  const { storeInfo } = useStoreInfo();
-  const { totals } = useCart();
-
-  const upsell = storeInfo?.upsell;
-  const threshold = upsell?.freeShippingThreshold;
-  const enabled = upsell?.freeShippingBarEnabled !== false;
-
-  // Don't render if disabled or no threshold configured
-  if (!enabled || !threshold || threshold <= 0) return null;
-
-  const subtotal = totals.subtotal;
-  const remaining = Math.max(0, threshold - subtotal);
-  const progress = Math.min(100, (subtotal / threshold) * 100);
-  const qualified = remaining <= 0;
-  const currency = storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
-
-  // Don't show if already qualified
-  if (qualified) {
-    return (
-      <div className={cn('rounded-lg border border-green-200 bg-green-50 p-3', className)}>
-        <div className="flex items-center gap-2 text-sm font-medium text-green-700">
-          <svg className="h-4 w-4 shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
-          </svg>
-          {t('freeShippingQualified')}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className={cn('rounded-lg border border-amber-200 bg-amber-50 p-3', className)}>
-      <p className="mb-2 text-sm text-amber-800">
-        {t('freeShippingRemaining', {
-          amount: formatPrice(remaining, { currency }) as string,
-        })}
-      </p>
-      <div className="h-2 w-full overflow-hidden rounded-full bg-amber-200">
-        <div
-          className="h-full rounded-full bg-amber-500 transition-all duration-500 ease-out"
-          style={{ width: `${progress}%` }}
-        />
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { formatPrice } from 'brainerce';
+import { useStoreInfo, useCart } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
+import { useTranslations } from '@/lib/translations';
+import { cn } from '@/lib/utils';
+
+interface FreeShippingBarProps {
+  className?: string;
+}
+
+export function FreeShippingBar({ className }: FreeShippingBarProps) {
+  // Hooks must be called unconditionally and in the same order on every
+  // render — keep all of them above any early `return null` branch.
+  const t = useTranslations('cart');
+  const { storeInfo } = useStoreInfo();
+  const { totals } = useCart();
+  const currency = useCurrency();
+
+  const upsell = storeInfo?.upsell;
+  const threshold = upsell?.freeShippingThreshold;
+  const enabled = upsell?.freeShippingBarEnabled !== false;
+
+  // Don't render if disabled or no threshold configured
+  if (!enabled || !threshold || threshold <= 0) return null;
+
+  const subtotal = totals.subtotal;
+  const remaining = Math.max(0, threshold - subtotal);
+  const progress = Math.min(100, (subtotal / threshold) * 100);
+  const qualified = remaining <= 0;
+
+  // Don't show if already qualified
+  if (qualified) {
+    return (
+      <div className={cn('rounded-lg border border-green-200 bg-green-50 p-3', className)}>
+        <div className="flex items-center gap-2 text-sm font-medium text-green-700">
+          <svg className="h-4 w-4 shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
+          </svg>
+          {t('freeShippingQualified')}
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn('rounded-lg border border-amber-200 bg-amber-50 p-3', className)}>
+      <p className="mb-2 text-sm text-amber-800">
+        {t('freeShippingRemaining', {
+          amount: formatPrice(remaining, { currency }) as string,
+        })}
+      </p>
+      <div className="h-2 w-full overflow-hidden rounded-full bg-amber-200">
+        <div
+          className="h-full rounded-full bg-amber-500 transition-all duration-500 ease-out"
+          style={{ width: `${progress}%` }}
+        />
+      </div>
+    </div>
+  );
+}