create-brainerce-store 1.87.0 → 1.88.1

package/templates/nextjs/base/src/app/checkout/page.tsx

@@ -15,7 +15,13 @@ import type {
 } from 'brainerce';
 import { formatPrice } from 'brainerce';
 import { getClient } from '@/core/lib/brainerce';
-import { useStoreInfo, useCart, useAuth, useRegion } from '@/core/providers/store-provider';
+import {
+  useStoreInfo,
+  useCart,
+  useAuth,
+  useRegion,
+  useStoreCapabilities,
+} from '@/core/providers/store-provider';
 import { useCurrency } from '@/core/lib/use-currency';
 import { CheckoutForm } from '@/components/checkout/checkout-form';
 import { ShippingStep } from '@/components/checkout/shipping-step';
@@ -31,16 +37,68 @@ import { GiftCardInput } from '@/ui/cart/gift-card-input';
 import { ReservationCountdown } from '@/ui/cart/reservation-countdown';
 import { LoadingSpinner } from '@/ui/shared/loading-spinner';
 import { useTranslations } from '@/core/lib/translations';
-import { toAddToCartError, type AddToCartError } from '@/core/lib/add-to-cart-error';
+import {
+  addToCartErrorMessageKey,
+  toAddToCartError,
+  type AddToCartError,
+} from '@/core/lib/add-to-cart-error';
 import { cn } from '@/core/lib/utils';
 import { isValidCheckoutId } from '@/core/lib/safe-redirect';
 import { trackBeginCheckout } from '@/core/lib/tracking';
 
+// Remembers which checkout belongs to which cart for this browser tab, so a
+// shopper who leaves /checkout and comes back (the bare link has no
+// `?checkout_id=`) resumes the same checkout instead of re-entering everything.
+const CHECKOUT_RESUME_PREFIX = 'brainerce:checkout:';
+
+function readStoredCheckoutId(cartId: string): string | null {
+  try {
+    const raw = window.sessionStorage.getItem(CHECKOUT_RESUME_PREFIX + cartId);
+    return isValidCheckoutId(raw) ? raw : null;
+  } catch {
+    return null;
+  }
+}
+
+function storeCheckoutId(cartId: string, checkoutId: string): void {
+  try {
+    window.sessionStorage.setItem(CHECKOUT_RESUME_PREFIX + cartId, checkoutId);
+  } catch {
+    // Private mode / blocked storage: resuming is a convenience, never required.
+  }
+}
+
+function clearStoredCheckoutId(cartId: string): void {
+  try {
+    window.sessionStorage.removeItem(CHECKOUT_RESUME_PREFIX + cartId);
+  } catch {
+    // ignore
+  }
+}
+
+/**
+ * A remembered checkout is only reused while it is still open AND still
+ * describes the cart: same lines, same quantities. A cart edited since would
+ * otherwise resume a checkout that charges for something else.
+ */
+function matchesCart(
+  prior: Checkout,
+  cart: { items: Array<{ productId: string; variantId?: string | null; quantity: number }> }
+): boolean {
+  if (prior.status !== 'PENDING' && prior.status !== 'SHIPPING_SET') return false;
+  const key = (i: { productId: string; variantId?: string | null; quantity: number }) =>
+    `${i.productId}:${i.variantId ?? ''}:${i.quantity}`;
+  const a = prior.lineItems.map(key).sort();
+  const b = cart.items.map(key).sort();
+  return a.length === b.length && a.every((v, i) => v === b[i]);
+}
+
 type CheckoutStep = 'method' | 'address' | 'shipping' | 'pickup' | 'custom-fields' | 'payment';
 
 function CheckoutContent() {
   const searchParams = useSearchParams();
   const { storeInfo } = useStoreInfo();
+  const { capabilities } = useStoreCapabilities();
   const { cart, refreshCart } = useCart();
   const { isLoggedIn } = useAuth();
   // ⛔ THE call the region feature exists for. Product reads alone and the
@@ -211,9 +269,27 @@ function CheckoutContent() {
         const locations = await client.getPickupLocations().catch(() => [] as PickupLocation[]);
         setPickupLocations(locations);
 
+        // The bare /checkout link carries no id. Look for the one this tab already
+        // opened for this very cart, and use it only while it still matches the
+        // cart. A shopper choosing a subset of lines always starts a fresh one.
+        let resumed: Checkout | null = null;
+        if (!existingCheckoutId && !selectedItemsParam) {
+          const storedId = readStoredCheckoutId(cart.id);
+          if (storedId) {
+            try {
+              const prior = await client.getCheckout(storedId);
+              if (matchesCart(prior, cart)) resumed = prior;
+              else clearStoredCheckoutId(cart.id);
+            } catch {
+              clearStoredCheckoutId(cart.id);
+            }
+          }
+        }
+
         // If returning with existing checkout ID, resume it
-        if (existingCheckoutId) {
-          const existing = await client.getCheckout(existingCheckoutId);
+        if (existingCheckoutId || resumed) {
+          const existing = resumed ?? (await client.getCheckout(existingCheckoutId as string));
+          storeCheckoutId(cart.id, existing.id);
           setCheckout(existing);
 
           // Preload custom field definitions and any existing values so the
@@ -279,6 +355,8 @@ function CheckoutContent() {
           ...(regionId ? { regionId } : {}),
         });
         setCheckout(newCheckout);
+        // A subset checkout belongs to those lines only, never to the whole cart.
+        if (!isStrictSubset) storeCheckoutId(cart.id, newCheckout.id);
 
         // Put the id in the URL so a RELOAD resumes instead of starting over.
         //
@@ -1057,7 +1135,7 @@ function CheckoutContent() {
                 */}
                 {bumpError && (
                   <p className="text-destructive text-xs" role="alert">
-                    {bumpError === 'CART_FULL' ? tp('cartFull') : tp('addToCartFailed')}
+                    {tp(addToCartErrorMessageKey(bumpError))}
                   </p>
                 )}
               </div>
@@ -1077,7 +1155,12 @@ function CheckoutContent() {
                       for an order still worth the same. They look adjacent
                       because a shopper reaches for them at the same moment, and
                       they behave differently because they are different things. */}
-                  {checkout?.id && (
+                  {/* Hidden while the store has gift cards off (`hasGiftCards`), so the
+                      shopper is not offered a box that can never accept a code. A card
+                      already applied keeps the field so it can still be removed. */}
+                  {checkout?.id &&
+                    (capabilities?.features.hasGiftCards === true ||
+                      (checkout.tenders?.length ?? 0) > 0) && (
                     <GiftCardInput
                       className="mt-3"
                       checkoutId={checkout.id}

package/templates/nextjs/base/src/app/products/layout.tsx.ejs

@@ -0,0 +1,18 @@
+import type { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: <%- language === 'he' ? "'מוצרים'" : "'Products'" %>,
+  description: <%- language === 'he' ? "'כל קטלוג המוצרים שלנו.'" : "'Browse our full collection of products.'" %>,
+  alternates: {
+    canonical: '/products',
+  },
+  openGraph: {
+    title: <%- language === 'he' ? "'מוצרים'" : "'Products'" %>,
+    description: <%- language === 'he' ? "'כל קטלוג המוצרים שלנו.'" : "'Browse our full collection of products.'" %>,
+    type: 'website',
+  },
+};
+
+export default function ProductsLayout({ children }: { children: React.ReactNode }) {
+  return <>{children}</>;
+}