Skip to content

Review the upgrade before entering payment details #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ostenbom wants to merge 1 commit into from
Closed

Review the upgrade before entering payment details #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 106 additions & 4 deletions app/(dashboard)/pricing/checkout/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,120 @@
import { Check } from "lucide-react";
import { Suspense, use } from "react";
import { processPayment } from "@/lib/payments/actions";

function CheckoutForm({
type CheckoutSearchParams = {
plan?: string;
amount?: string;
step?: string;
};

const PLAN_HIGHLIGHTS: Record<string, string[]> = {
Base: ["Unlimited usage", "Unlimited workspace members", "Email support"],
Plus: [
"Everything in Base",
"Early access to new features",
"24/7 support and Slack access",
],
};

function Checkout({
searchParams,
}: {
searchParams: Promise<{ plan?: string; amount?: string }>;
searchParams: Promise<CheckoutSearchParams>;
}) {
const resolvedParams = use(searchParams);
const planName = resolvedParams.plan || "Unknown Plan";
const amount = Number(resolvedParams.amount) || 0;

if (resolvedParams.step === "payment") {
return <CheckoutForm planName={planName} amount={amount} />;
}

return <ReviewUpgrade planName={planName} amount={amount} />;
}

function ReviewUpgrade({
planName,
amount,
}: {
planName: string;
amount: number;
}) {
const paymentHref = `/pricing/checkout?plan=${encodeURIComponent(planName)}&amount=${amount}&step=payment`;

return (
<main className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
<div className="bg-white shadow-lg rounded-lg p-8">
<p className="text-sm font-medium text-orange-600 mb-2">Step 1 of 2</p>
<h1 className="text-3xl font-bold text-gray-900 mb-6">
Review your upgrade
</h1>

<div className="rounded-lg border border-gray-200 p-6 mb-6">
<div className="flex items-baseline justify-between mb-4">
<h2 className="text-xl font-semibold text-gray-900">
{planName} plan
</h2>
<p className="text-xl font-semibold text-gray-900">
${amount / 100}
<span className="text-sm font-normal text-gray-600">/month</span>
</p>
</div>
<ul className="space-y-2">
{(PLAN_HIGHLIGHTS[planName] ?? []).map((highlight) => (
<li key={highlight} className="flex items-center text-gray-700">
<Check className="h-4 w-4 text-orange-500 mr-2 shrink-0" />
{highlight}
</li>
))}
</ul>
</div>

<dl className="space-y-2 text-sm mb-8">
<div className="flex justify-between">
<dt className="text-gray-600">Billed</dt>
<dd className="text-gray-900">Monthly, starting today</dd>
</div>
<div className="flex justify-between">
<dt className="text-gray-600">Cancel</dt>
<dd className="text-gray-900">Anytime from Team Settings</dd>
</div>
<div className="flex justify-between border-t border-gray-200 pt-2 font-medium">
<dt className="text-gray-900">Due today</dt>
<dd className="text-gray-900">${amount / 100}.00</dd>
</div>
</dl>

<div className="flex justify-between items-center pt-6 border-t border-gray-200">
<a
href="/pricing"
className="text-orange-600 hover:text-orange-500 font-medium"
>
← Back to plans
</a>
<a
href={paymentHref}
className="bg-orange-500 hover:bg-orange-600 text-white font-medium py-2 px-6 rounded-md"
>
Continue to payment
</a>
</div>
</div>
</main>
);
}

function CheckoutForm({
planName,
amount,
}: {
planName: string;
amount: number;
}) {
return (
<main className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
<div className="bg-white shadow-lg rounded-lg p-8">
<p className="text-sm font-medium text-orange-600 mb-2">Step 2 of 2</p>
<h1 className="text-3xl font-bold text-gray-900 mb-2">
Complete Your Purchase
</h1>
Expand Down Expand Up @@ -241,11 +343,11 @@ function CheckoutForm({
export default function CheckoutPage({
searchParams,
}: {
searchParams: Promise<{ plan?: string; amount?: string }>;
searchParams: Promise<CheckoutSearchParams>;
}) {
return (
<Suspense fallback={<div>Loading...</div>}>
<CheckoutForm searchParams={searchParams} />
<Checkout searchParams={searchParams} />
</Suspense>
);
}
2 changes: 2 additions & 0 deletions tests/payment-history.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ test.describe("Payment history", () => {
await expect(page).toHaveURL(
/.*\/pricing\/checkout\?plan=Plus&amount=1200$/,
);
await page.getByRole("link", { name: "Continue to payment" }).click();
await expect(page).toHaveURL(/.*&step=payment$/);

await page
.getByRole("textbox", { name: "Card Holder Name" })
Expand Down
16 changes: 15 additions & 1 deletion tests/plan-upgrade.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,24 @@ test.describe("Plan Upgrade Flow", () => {
await page.getByRole("button", { name: "Get Started" }).nth(1).click();
});

await test.step("Verify checkout page for Plus plan", async () => {
await test.step("Review the Plus upgrade", async () => {
await expect(page).toHaveURL(
/.*\/pricing\/checkout\?plan=Plus&amount=1200$/,
);
await expect(
page.getByRole("heading", { name: "Review your upgrade" }),
).toBeVisible();
await expect(
page.getByRole("heading", { name: "Plus plan" }),
).toBeVisible();
await expect(page.getByText("Due today")).toBeVisible();
await page.getByRole("link", { name: "Continue to payment" }).click();
});

await test.step("Verify checkout page for Plus plan", async () => {
await expect(page).toHaveURL(
/.*\/pricing\/checkout\?plan=Plus&amount=1200&step=payment$/,
);
await expect(
page.getByRole("heading", { name: "Complete Your Purchase" }),
).toBeVisible();
Expand Down
Loading