create-nextblock 0.15.5 → 0.15.9

package/templates/nextblock-template/app/checkout/page.tsx

@@ -1,52 +1,57 @@
-import { Checkout } from '@nextblock-cms/ecommerce';
-import { createClient } from '@nextblock-cms/db/server';
-import { getDefaultUserAddresses } from '@nextblock-cms/ecommerce/server';
-import { getUcpCartCheckoutItems } from '../lib/ucp/server';
-import { UcpCartHydrator } from './UcpCartHydrator';
-
-interface CheckoutPageProps {
-  searchParams?: Promise<{
-    ucp_cart?: string;
-    cart?: string;
-  }>;
-}
-
-export default async function CheckoutPage({ searchParams }: CheckoutPageProps) {
-  const resolvedSearchParams = await searchParams;
-  const ucpCartId = resolvedSearchParams?.ucp_cart || resolvedSearchParams?.cart || null;
-  const ucpCartItems = await getUcpCartCheckoutItems(ucpCartId);
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-
-  if (!user) {
-    return (
-      <>
-        <UcpCartHydrator items={ucpCartItems} />
-        <Checkout initialCustomer={{ isAuthenticated: false }} />
-      </>
-    );
-  }
-
-  const [{ data: profile }, { billingAddress, shippingAddress }] = await Promise.all([
-    supabase.from('profiles').select('full_name, phone').eq('id', user.id).single(),
-    getDefaultUserAddresses(user.id, supabase),
-  ]);
-
-  return (
-    <>
-      <UcpCartHydrator items={ucpCartItems} />
-      <Checkout
-        initialCustomer={{
-          isAuthenticated: true,
-          email: user.email,
-          fullName: profile?.full_name || null,
-          phone: profile?.phone || null,
-          billingAddress,
-          shippingAddress,
-        }}
-      />
-    </>
-  );
-}
+import { Checkout } from '@nextblock-cms/ecommerce';
+import PaymentReadinessBoundary from '../../components/commerce/PaymentReadinessBoundary';
+import { createClient } from '@nextblock-cms/db/server';
+import { getDefaultUserAddresses } from '@nextblock-cms/ecommerce/server';
+import { getUcpCartCheckoutItems } from '../lib/ucp/server';
+import { UcpCartHydrator } from './UcpCartHydrator';
+
+interface CheckoutPageProps {
+  searchParams?: Promise<{
+    ucp_cart?: string;
+    cart?: string;
+  }>;
+}
+
+export default async function CheckoutPage({ searchParams }: CheckoutPageProps) {
+  const resolvedSearchParams = await searchParams;
+  const ucpCartId = resolvedSearchParams?.ucp_cart || resolvedSearchParams?.cart || null;
+  const ucpCartItems = await getUcpCartCheckoutItems(ucpCartId);
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+
+  if (!user) {
+    return (
+      <>
+        <UcpCartHydrator items={ucpCartItems} />
+        <PaymentReadinessBoundary>
+          <Checkout initialCustomer={{ isAuthenticated: false }} />
+        </PaymentReadinessBoundary>
+      </>
+    );
+  }
+
+  const [{ data: profile }, { billingAddress, shippingAddress }] = await Promise.all([
+    supabase.from('profiles').select('full_name, phone').eq('id', user.id).single(),
+    getDefaultUserAddresses(user.id, supabase),
+  ]);
+
+  return (
+    <>
+      <UcpCartHydrator items={ucpCartItems} />
+      <PaymentReadinessBoundary>
+      <Checkout
+        initialCustomer={{
+          isAuthenticated: true,
+          email: user.email,
+          fullName: profile?.full_name || null,
+          phone: profile?.phone || null,
+          billingAddress,
+          shippingAddress,
+        }}
+      />
+      </PaymentReadinessBoundary>
+    </>
+  );
+}