@@ -49,7 +46,11 @@ export default async function CartPage() {
)}
@@ -65,19 +66,23 @@ export default async function CartPage() {
))}
-
-
-
- جمع کل سبد ({cart.groups.length.toLocaleString("fa-IR")} فروشگاه،{" "}
- {totalItemLines.toLocaleString("fa-IR")} کالا)
+
+
+
+
+ جمع کل سبد ({cart.groups.length.toLocaleString("fa-IR")} فروشگاه،{" "}
+ {totalItemLines.toLocaleString("fa-IR")} کالا)
+
+
+
+ هر فروشگاه جداگانه پرداخت و ارسال میشود
+
+
+
+
+ {cart.grand_total.toLocaleString("fa-IR")} تومان
-
- هر فروشگاه جداگانه پرداخت و ارسال میشود
-
-
- {cart.grand_total.toLocaleString("fa-IR")} تومان
-
{/* Same header pattern as /cart and /checkout/[store]. */}
@@ -29,7 +37,11 @@ export default async function ConfirmPaymentPage({ params }: PageProps<"/checkou
تأیید و پرداخت
-
+ {isDelivery && (
+
+ )}
+
+
);
}
diff --git a/src/app/(customer)/(shop)/checkout/page.tsx b/src/app/(customer)/(shop)/checkout/page.tsx
deleted file mode 100644
index 2182a1b..0000000
--- a/src/app/(customer)/(shop)/checkout/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { redirect } from "next/navigation";
-import { getCart } from "@/lib/api/cart";
-import { requireSession } from "@/lib/auth/session";
-import { getAddresses } from "@/lib/api/addresses";
-import { CheckoutForm } from "@/components/customer/checkout-form";
-
-export default async function CheckoutPage() {
- await requireSession("/checkout");
- const [cart, addresses] = await Promise.all([getCart(), getAddresses()]);
-
- if (cart.groups.length === 0) redirect("/cart");
-
- return (
-
- تکمیل سفارش
-
- );
-}
diff --git a/src/components/customer/address-details-form.tsx b/src/components/customer/address-details-form.tsx
new file mode 100644
index 0000000..c745c81
--- /dev/null
+++ b/src/components/customer/address-details-form.tsx
@@ -0,0 +1,240 @@
+"use client";
+
+import { useMemo, useState, useTransition } from "react";
+import { useRouter } from "next/navigation";
+import { createAddress, type AddressInput } from "@/lib/api/addresses";
+import type { AddressLabel, City, Neighborhood } from "@/types/api";
+
+const LABEL_PRESETS: { value: AddressLabel; text: string }[] = [
+ { value: "other", text: "سایر" },
+ { value: "work", text: "محل کار" },
+ { value: "home", text: "خانه جدید" },
+];
+
+export function AddressDetailsForm({
+ fullAddress,
+ latitude,
+ longitude,
+ cityUuid,
+ neighborhoodUuid,
+ cities,
+ neighborhoods,
+ next,
+}: {
+ fullAddress: string;
+ latitude: number;
+ longitude: number;
+ /** Inferred from the customer's current location cookie, if they'd set one manually. */
+ cityUuid: string | null;
+ neighborhoodUuid: string | null;
+ cities: City[];
+ neighborhoods: Neighborhood[];
+ /** Set when this add-address detour started from checkout — see handleSubmit. */
+ next: string | null;
+}) {
+ const router = useRouter();
+ const [address, setAddress] = useState(fullAddress);
+ const [label, setLabel] = useState
("home");
+ const [title, setTitle] = useState("خانه جدید");
+ const [plaque, setPlaque] = useState("");
+ const [floor, setFloor] = useState("");
+ const [unit, setUnit] = useState("");
+ const [recipientName, setRecipientName] = useState("");
+ const [recipientPhone, setRecipientPhone] = useState("");
+ const [manualCityUuid, setManualCityUuid] = useState(cityUuid ?? "");
+ const [manualNeighborhoodUuid, setManualNeighborhoodUuid] = useState(neighborhoodUuid ?? "");
+ const [error, setError] = useState(null);
+ const [isPending, startTransition] = useTransition();
+
+ // city_uuid is a hard requirement on the backend (OpenAPI: Address.city_uuid is
+ // required for writes) but isn't part of this screen's design — it's normally
+ // inferred from the customer's current location cookie. Only show a picker for
+ // it when that inference failed (e.g. they're in "geo" mode, or never set one).
+ const needsCityPicker = !cityUuid;
+ const filteredNeighborhoods = useMemo(
+ () => neighborhoods.filter((n) => n.city.uuid === manualCityUuid),
+ [neighborhoods, manualCityUuid],
+ );
+
+ function handleSubmit(e: React.FormEvent) {
+ e.preventDefault();
+ setError(null);
+
+ const finalCityUuid = cityUuid ?? manualCityUuid;
+ if (!finalCityUuid) {
+ setError("شهر مشخص نیست — لطفاً محله خود را از صفحه اصلی انتخاب کنید یا شهر را زیر مشخص کنید.");
+ return;
+ }
+
+ startTransition(async () => {
+ const input: AddressInput = {
+ label,
+ title,
+ full_address: address,
+ plaque,
+ floor,
+ unit,
+ recipient_name: recipientName,
+ recipient_phone: recipientPhone,
+ city_uuid: finalCityUuid,
+ neighborhood_uuid: (neighborhoodUuid ?? manualNeighborhoodUuid) || undefined,
+ latitude,
+ longitude,
+ // Arriving here from checkout means they had no address at all yet — make
+ // this one the default immediately so it's actually used for the order,
+ // rather than sending them on to /addresses to select it a second time.
+ // A plain profile-driven "add another address" leaves the existing default alone.
+ is_default: next !== null,
+ };
+ const result = await createAddress(input);
+ if (result.ok) {
+ router.push(next ?? "/addresses");
+ } else {
+ setError(result.message);
+ }
+ });
+ }
+
+ function selectPreset(preset: (typeof LABEL_PRESETS)[number]) {
+ setLabel(preset.value);
+ setTitle(preset.text);
+ }
+
+ return (
+
+ );
+}
diff --git a/src/components/customer/address-list.tsx b/src/components/customer/address-list.tsx
deleted file mode 100644
index c80af60..0000000
--- a/src/components/customer/address-list.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-"use client";
-
-import { useMemo, useState, useTransition } from "react";
-import { useRouter } from "next/navigation";
-import { createAddress, deleteAddress, type AddressInput } from "@/lib/api/addresses";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import type { Address, AddressLabel, City, Neighborhood } from "@/types/api";
-
-const LABEL_OPTIONS: { value: AddressLabel; label: string }[] = [
- { value: "home", label: "خانه" },
- { value: "work", label: "محل کار" },
- { value: "other", label: "سایر" },
-];
-
-const emptyForm = {
- label: "home" as AddressLabel,
- title: "",
- full_address: "",
- plaque: "",
- floor: "",
- unit: "",
- recipient_name: "",
- recipient_phone: "",
- city_uuid: "",
- neighborhood_uuid: "",
- is_default: false,
-};
-
-export function AddressList({
- addresses,
- cities,
- neighborhoods,
-}: {
- addresses: Address[];
- cities: City[];
- neighborhoods: Neighborhood[];
-}) {
- const router = useRouter();
- const [isAdding, setIsAdding] = useState(false);
- const [form, setForm] = useState(emptyForm);
- const [error, setError] = useState(null);
- const [isPending, startTransition] = useTransition();
-
- const filteredNeighborhoods = useMemo(
- () => neighborhoods.filter((n) => n.city.uuid === form.city_uuid),
- [neighborhoods, form.city_uuid],
- );
-
- function handleDelete(uuid: string) {
- startTransition(async () => {
- await deleteAddress(uuid);
- router.refresh();
- });
- }
-
- function handleSubmit(e: React.FormEvent) {
- e.preventDefault();
- setError(null);
- startTransition(async () => {
- const input: AddressInput = {
- ...form,
- neighborhood_uuid: form.neighborhood_uuid || undefined,
- latitude: 0,
- longitude: 0,
- };
- const result = await createAddress(input);
- if (result.ok) {
- setForm(emptyForm);
- setIsAdding(false);
- router.refresh();
- } else {
- setError(result.message);
- }
- });
- }
-
- return (
-
-
- {addresses.map((address) => (
-
-
-
- {LABEL_OPTIONS.find((o) => o.value === address.label)?.label} {address.is_default && "· پیشفرض"}
-
- {address.full_address}
-
- {address.recipient_name} — {address.recipient_phone}
-
-
-
handleDelete(address.uuid)}>
- حذف
-
-
- ))}
- {addresses.length === 0 && !isAdding &&
آدرسی ثبت نشده است.
}
-
-
- {isAdding ? (
-
- ) : (
-
setIsAdding(true)}>
- + افزودن آدرس جدید
-
- )}
-
= {
+ home: "خانه",
+ work: "محل کار",
+ other: "سایر",
+};
+
+/**
+ * Doubles as both a plain address-management screen (reached from the profile menu)
+ * and a picker (reached from checkout's "تغییر آدرس" with a `next` return path) —
+ * the radio always reflects/sets which address is the default, "تأیید" just persists
+ * that choice and, if there's somewhere to return to, goes back there.
+ */
+export function AddressSelector({ addresses, next }: { addresses: Address[]; next: string | null }) {
+ const router = useRouter();
+ const [selectedUuid, setSelectedUuid] = useState(
+ () => addresses.find((a) => a.is_default)?.uuid ?? addresses[0]?.uuid ?? null,
+ );
+ const [error, setError] = useState(null);
+ const [isPending, startTransition] = useTransition();
+
+ function handleConfirm() {
+ setError(null);
+ const currentDefaultUuid = addresses.find((a) => a.is_default)?.uuid;
+ if (!selectedUuid || selectedUuid === currentDefaultUuid) {
+ if (next) router.push(next);
+ return;
+ }
+ startTransition(async () => {
+ const result = await updateAddress(selectedUuid, { is_default: true });
+ if (result.ok) {
+ if (next) router.push(next);
+ else router.refresh();
+ } else {
+ setError(result.message);
+ }
+ });
+ }
+
+ return (
+
+
+ {addresses.map((address) => {
+ const isSelected = address.uuid === selectedUuid;
+ return (
+
setSelectedUuid(address.uuid)}
+ className={`flex flex-col gap-1 rounded-2xl border p-4 text-right ${
+ isSelected ? "border-primary-action" : "border-gray-300"
+ }`}
+ >
+ {/* DOM order intentionally mirrors the screenshot's left→right layout —
+ see the inherited dir="rtl" note on the /cart page. */}
+
+
+ {address.title || ADDRESS_LABEL_FA[address.label]}
+
+
+ {isSelected &&
+
+ {address.full_address}
+
+ );
+ })}
+
+ {addresses.length === 0 && (
+
هنوز آدرسی ثبت نکردهاید.
+ )}
+
+
router.push(next ? `/addresses/map?next=${encodeURIComponent(next)}` : "/addresses/map")}
+ className="rounded-2xl border border-primary-action py-4 text-[14px] font-bold text-primary-action"
+ >
+ افزودن آدرس جدید
+
+
+
+ {error &&
{error}
}
+
+ {addresses.length > 0 && (
+
+ {isPending ? "در حال ذخیره..." : "تأیید"}
+
+ )}
+
= {
+ home: "خانه",
+ work: "محل کار",
+ other: "سایر",
+};
+
+/**
+ * Both actions carry `returnTo` (the checkout confirm page's own URL) so the whole
+ * address-management chain — map → details form → address list — comes back here
+ * instead of stranding the customer on /addresses mid-checkout.
+ */
+export function CheckoutAddress({
+ address,
+ returnTo,
+}: {
+ address: Address | null;
+ returnTo: string;
+}) {
+ const next = encodeURIComponent(returnTo);
+ return (
+
+
+ آدرس تحویل
+
+
+ {address ? (
+
+ {/* DOM order intentionally mirrors the screenshot's left→right layout — see the
+ inherited dir="rtl" note on the /cart page. */}
+
+
+
+ {address.title || ADDRESS_LABEL_FA[address.label]}
+
+
+
+ {address.full_address}
+
+
+
+ تغییر آدرس
+
+
+
+
+
+ هنوز آدرسی ثبت نکردهاید. برای ادامه سفارش، لطفاً یک آدرس اضافه
+ کنید.
+
+
+
+ افزودن آدرس
+
+
+
+ );
+}
diff --git a/src/components/customer/checkout-form.tsx b/src/components/customer/checkout-form.tsx
deleted file mode 100644
index a8af62d..0000000
--- a/src/components/customer/checkout-form.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-"use client";
-
-import { useState, useTransition } from "react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { submitCheckout } from "@/lib/api/checkout";
-import { Button } from "@/components/ui/button";
-import type { Address, Cart, DeliveryType, PaymentMethod } from "@/types/api";
-
-const PAYMENT_LABELS_FA: Record = {
- wallet: "کیف پول وینوفای",
- online: "درگاه بانکی",
- cash_on_delivery: "پرداخت در محل",
-};
-
-export function CheckoutForm({ cart, addresses }: { cart: Cart; addresses: Address[] }) {
- const router = useRouter();
- const [addressUuid, setAddressUuid] = useState(addresses.find((a) => a.is_default)?.uuid ?? addresses[0]?.uuid ?? "");
- const [deliveryType, setDeliveryType] = useState("express");
- const [scheduledAt, setScheduledAt] = useState("");
- const [paymentMethod, setPaymentMethod] = useState("cash_on_delivery");
- const [notes, setNotes] = useState("");
- const [error, setError] = useState(null);
- const [isPending, startTransition] = useTransition();
-
- function handleSubmit(e: React.FormEvent) {
- e.preventDefault();
- setError(null);
-
- if (!addressUuid) {
- setError("لطفاً یک آدرس انتخاب کنید.");
- return;
- }
- if (deliveryType === "scheduled" && !scheduledAt) {
- setError("لطفاً زمان ارسال را مشخص کنید.");
- return;
- }
-
- startTransition(async () => {
- const result = await submitCheckout({
- address_uuid: addressUuid,
- delivery_type: deliveryType,
- scheduled_at: deliveryType === "scheduled" ? new Date(scheduledAt).toISOString() : null,
- payment_method: paymentMethod,
- notes,
- });
- if (result.ok) {
- router.push(`/order-groups/${result.data.uuid}`);
- } else {
- setError(result.message);
- }
- });
- }
-
- if (addresses.length === 0) {
- return (
-
-
برای ثبت سفارش ابتدا یک آدرس اضافه کنید.
-
-
افزودن آدرس
-
-