From 41f7e98d9780ee1ce639ecb9d416950fe286956d Mon Sep 17 00:00:00 2001 From: parsa aghaei Date: Wed, 26 Aug 2026 13:48:41 +0330 Subject: [PATCH] feat(checkout): unify manual address form with AddressModal, auto-save address and sync user profile on order --- .../application/components/AddressModal.tsx | 91 +- .../application/components/CheckoutPage.tsx | 320 +- graphify-out/.graphify_labels.json | 49 +- graphify-out/.graphify_labels.json.sig | 2 +- graphify-out/2026-08-26/.graphify_labels.json | 43 +- graphify-out/2026-08-26/GRAPH_REPORT.md | 225 +- graphify-out/2026-08-26/graph.json | 7382 ++++++++------- graphify-out/2026-08-26/manifest.json | 1242 +-- graphify-out/GRAPH_REPORT.md | 250 +- graphify-out/cache/stat-index.json | 2 +- graphify-out/graph.html | 8 +- graphify-out/graph.json | 8428 +++++++++-------- graphify-out/manifest.json | 1226 +-- 13 files changed, 9829 insertions(+), 9439 deletions(-) diff --git a/frontend/application/components/AddressModal.tsx b/frontend/application/components/AddressModal.tsx index a0d5073e..ab3622ce 100644 --- a/frontend/application/components/AddressModal.tsx +++ b/frontend/application/components/AddressModal.tsx @@ -8,6 +8,53 @@ import { IRAN_PROVINCES, PROVINCE_CITIES } from "../lib/data/provinces"; import SearchableSelect from "./SearchableSelect"; import { toast } from "sonner"; +export interface AddressFormData { + title: string; + receptorName: string; + phone: string; + province: string; + city: string; + detail: string; + zipCode: string; + isDefault: boolean; +} + +export const normalizeDigits = (str: string) => { + if (!str) return ""; + const persianDigits = [/۰/g, /۱/g, /۲/g, /۳/g, /۴/g, /۵/g, /۶/g, /۷/g, /۸/g, /۹/g]; + const arabicDigits = [/٠/g, /١/g, /٢/g, /٣/g, /٤/g, /٥/g, /٦/g, /٧/g, /٨/g, /٩/g]; + for (let i = 0; i < 10; i++) { + str = str.replace(persianDigits[i], i.toString()).replace(arabicDigits[i], i.toString()); + } + return str; +}; + +export const validateAddressForm = (formData: AddressFormData): Record => { + const newErrors: Record = {}; + if (!formData.title?.trim()) newErrors.title = "لطفاً عنوان آدرس را وارد کنید"; + if (!formData.receptorName?.trim()) newErrors.receptorName = "نام گیرنده را وارد کنید"; + + const normalizedPhone = normalizeDigits(formData.phone || ""); + if (!normalizedPhone) { + newErrors.phone = "شماره تماس الزامی است"; + } else if (!/^09\d{9}$/.test(normalizedPhone)) { + newErrors.phone = "شماره موبایل وارد شده معتبر نیست"; + } + + if (!formData.province?.trim()) newErrors.province = "استان را مشخص کنید"; + if (!formData.city?.trim()) newErrors.city = "شهر را مشخص کنید"; + if (!formData.detail?.trim()) newErrors.detail = "آدرس دقیق پستی را وارد کنید"; + + const normalizedZip = normalizeDigits(formData.zipCode || ""); + if (!normalizedZip) { + newErrors.zipCode = "کد پستی الزامی است"; + } else if (!/^\d{10}$/.test(normalizedZip)) { + newErrors.zipCode = "کد پستی باید ۱۰ رقم باشد"; + } + + return newErrors; +}; + interface AddressModalProps { isOpen: boolean; onClose: () => void; @@ -16,7 +63,7 @@ interface AddressModalProps { } export default function AddressModal({ isOpen, onClose, onSave, editingAddress }: AddressModalProps) { - const [formData, setFormData] = useState>({ + const [formData, setFormData] = useState({ title: "", receptorName: "", phone: "", @@ -60,45 +107,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress } }); }, [editingAddress, isOpen]); - const normalizeDigits = (str: string) => { - const persianDigits = [/۰/g, /۱/g, /۲/g, /۳/g, /۴/g, /۵/g, /۶/g, /۷/g, /۸/g, /۹/g]; - const arabicDigits = [/٠/g, /١/g, /٢/g, /٣/g, /٤/g, /٥/g, /٦/g, /٧/g, /٨/g, /٩/g]; - for (let i = 0; i < 10; i++) { - str = str.replace(persianDigits[i], i.toString()).replace(arabicDigits[i], i.toString()); - } - return str; - }; - - const validate = () => { - const newErrors: Record = {}; - if (!formData.title) newErrors.title = "لطفاً عنوان آدرس را وارد کنید"; - if (!formData.receptorName) newErrors.receptorName = "نام گیرنده را وارد کنید"; - - const normalizedPhone = normalizeDigits(formData.phone); - if (!normalizedPhone) { - newErrors.phone = "شماره تماس الزامی است"; - } else if (!/^09\d{9}$/.test(normalizedPhone)) { - newErrors.phone = "شماره موبایل وارد شده معتبر نیست"; - } - - if (!formData.province) newErrors.province = "استان را مشخص کنید"; - if (!formData.city) newErrors.city = "شهر را مشخص کنید"; - if (!formData.detail) newErrors.detail = "آدرس دقیق پستی را وارد کنید"; - - const normalizedZip = normalizeDigits(formData.zipCode); - if (!normalizedZip) { - newErrors.zipCode = "کد پستی الزامی است"; - } else if (!/^\d{10}$/.test(normalizedZip)) { - newErrors.zipCode = "کد پستی باید ۱۰ رقم باشد"; - } - - setErrors(newErrors); - return Object.keys(newErrors).length === 0; - }; - const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (validate()) { + const newErrors = validateAddressForm(formData); + setErrors(newErrors); + if (Object.keys(newErrors).length === 0) { setIsSubmitting(true); // Simulate small delay for UX setTimeout(() => { @@ -112,7 +125,7 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress } toast.success(editingAddress ? "تغییرات آدرس با موفقیت ذخیره شد" : "آدرس جدید با موفقیت اضافه شد"); setIsSubmitting(false); onClose(); - }, 600); + }, 300); } else { toast.error("لطفاً موارد خطای فرم را اصلاح کنید"); } diff --git a/frontend/application/components/CheckoutPage.tsx b/frontend/application/components/CheckoutPage.tsx index d29c75c3..9f1b935f 100644 --- a/frontend/application/components/CheckoutPage.tsx +++ b/frontend/application/components/CheckoutPage.tsx @@ -23,7 +23,7 @@ import { usePetStore } from "../lib/store/usePetStore"; import { useUserStore } from "../lib/store/userStore"; import { useSettingsStore } from "../lib/store/settingsStore"; import TopUpModal from "./TopUpModal"; -import AddressModal from "./AddressModal"; +import AddressModal, { AddressFormData, validateAddressForm, normalizeDigits } from "./AddressModal"; import SearchableSelect from "./SearchableSelect"; import { IRAN_PROVINCES, PROVINCE_CITIES } from "../lib/data/provinces"; import { toast } from "sonner"; @@ -52,13 +52,18 @@ export default function CheckoutPage() { const [selectedPetId, setSelectedPetId] = useState(activePetId || (pets[0]?.id ?? null)); const [selectedAddressId, setSelectedAddressId] = useState(''); - // Custom manual address state if guest or not using stored addresses - const [manualName, setManualName] = useState(''); - const [manualPhone, setManualPhone] = useState(''); - const [manualProvince, setManualProvince] = useState(''); - const [manualCity, setManualCity] = useState(''); - const [manualZipCode, setManualZipCode] = useState(''); - const [manualAddress, setManualAddress] = useState(''); + // Custom manual address state matching AddressModal if guest or not using stored addresses + const [manualAddressData, setManualAddressData] = useState({ + title: 'منزل اصلی', + receptorName: '', + phone: '', + province: '', + city: '', + detail: '', + zipCode: '', + isDefault: true + }); + const [manualErrors, setManualErrors] = useState>({}); const handleCopy = (text: string, title: string) => { navigator.clipboard.writeText(text); @@ -71,10 +76,13 @@ export default function CheckoutPage() { if (isLoggedIn && profile.addresses && profile.addresses.length > 0) { const def = profile.addresses.find(a => a.isDefault) || profile.addresses[0]; setSelectedAddressId(def.id); - } else if (isLoggedIn && profile.firstName) { + } else if (isLoggedIn && (profile.firstName || profile.mobile)) { // Pre-fill profile info for manual fields - setManualName(`${profile.firstName} ${profile.lastName}`.trim()); - setManualPhone(profile.mobile || ''); + setManualAddressData(prev => ({ + ...prev, + receptorName: prev.receptorName || `${profile.firstName || ''} ${profile.lastName || ''}`.trim(), + phone: prev.phone || profile.mobile || '' + })); } }); }, [isLoggedIn, profile]); @@ -109,19 +117,65 @@ export default function CheckoutPage() { const totalAmount = getTotal() + shippingFee; const activePet = getActivePet(); - // 1. Validate shipping address - const selectedAddr = profile.addresses?.find(a => a.id === selectedAddressId); - let shippingAddressStr = ''; - if (selectedAddr) { - shippingAddressStr = `${selectedAddr.province}، ${selectedAddr.city}، ${selectedAddr.detail}${selectedAddr.zipCode ? ` (کد پستی: ${selectedAddr.zipCode})` : ''} (گیرنده: ${selectedAddr.receptorName} - ${toPersian(selectedAddr.phone)})`; - } else if (manualAddress) { - const provCity = [manualProvince, manualCity].filter(Boolean).join('، '); - shippingAddressStr = `${provCity ? provCity + '، ' : ''}${manualAddress}${manualZipCode ? ` (کد پستی: ${manualZipCode})` : ''}${manualName ? ` (گیرنده: ${manualName}${manualPhone ? ` - ${toPersian(manualPhone)}` : ''})` : ''}`; + // 0. Ensure user is logged in before placing order + if (!isLoggedIn) { + toast.error("جهت تکمیل خرید و ثبت سفارش، لطفاً ابتدا وارد حساب کاربری خود شوید."); + useUserStore.getState().setAuthModalOpen(true); + return; } - if (!selectedAddressId && !manualAddress) { - toast.error("لطفاً یک آدرس برای ارسال سفارش انتخاب کرده یا آدرس جدید وارد کنید."); - return; + // 1. Validate and resolve shipping address + const selectedAddr = profile.addresses?.find(a => a.id === selectedAddressId); + let shippingAddressStr = ''; + + if (selectedAddr) { + shippingAddressStr = `${selectedAddr.province}، ${selectedAddr.city}، ${selectedAddr.detail}${selectedAddr.zipCode ? ` (کد پستی: ${selectedAddr.zipCode})` : ''} (گیرنده: ${selectedAddr.receptorName} - ${toPersian(selectedAddr.phone)})`; + } else { + const addrErrors = validateAddressForm(manualAddressData); + setManualErrors(addrErrors); + if (Object.keys(addrErrors).length > 0) { + toast.error("لطفاً اطلاعات آدرس و گیرنده را به صورت کامل و صحیح تکمیل کنید."); + return; + } + + const cleanPhone = normalizeDigits(manualAddressData.phone); + const cleanZip = normalizeDigits(manualAddressData.zipCode); + + shippingAddressStr = `${manualAddressData.province}، ${manualAddressData.city}، ${manualAddressData.detail}${cleanZip ? ` (کد پستی: ${cleanZip})` : ''} (گیرنده: ${manualAddressData.receptorName} - ${toPersian(cleanPhone)})`; + + // Auto-save the new manual address to user's permanent address list + try { + await useUserStore.getState().addAddress({ + id: Math.random().toString(36).substring(2, 9), + title: manualAddressData.title || 'منزل اصلی', + receptorName: manualAddressData.receptorName, + phone: cleanPhone, + province: manualAddressData.province, + city: manualAddressData.city, + detail: manualAddressData.detail, + zipCode: cleanZip, + isDefault: manualAddressData.isDefault + }); + } catch (e) { + console.error('Failed to save manual address to user account:', e); + } + + // Auto-sync user's first and last name if not set or default + const currentFirst = profile.firstName?.trim() || ''; + const currentLast = profile.lastName?.trim() || ''; + if (!currentFirst || currentFirst === 'کاربر' || !currentLast || currentLast === 'جدید') { + const nameParts = manualAddressData.receptorName.trim().split(/\s+/); + const newFirst = nameParts[0] || 'کاربر'; + const newLast = nameParts.slice(1).join(' ') || 'گرامی'; + try { + await useUserStore.getState().updateProfile({ + firstName: newFirst, + lastName: newLast + }); + } catch (e) { + console.error('Failed to update profile names:', e); + } + } } // 2. Validate wallet balance if payment method is wallet @@ -347,95 +401,138 @@ export default function CheckoutPage() { ) : ( -
-
- - setManualName(e.target.value)} - className="w-full bg-medical-gray-50/70 border border-medical-gray-200 rounded-xl py-2 px-3 text-xs focus:ring-1 focus:ring-canina-blue outline-none" - placeholder="مثلاً: پارسا آقایی" - /> -
-
- - setManualPhone(e.target.value.replace(/[^0-9]/g, ''))} - className="w-full bg-medical-gray-50/70 border border-medical-gray-200 rounded-xl py-2 px-3 text-xs focus:ring-1 focus:ring-canina-blue outline-none dir-ltr text-right" - placeholder="۰۹۱۲XXXXXXX" - /> -
-
- - { - const cities = PROVINCE_CITIES[prov] || []; - setManualProvince(prov); - setManualCity(cities[0] || ''); - }} - /> -
-
- - {manualProvince && PROVINCE_CITIES[manualProvince] ? ( - setManualCity(c)} - /> - ) : ( - setManualCity(e.target.value)} - className="w-full bg-medical-gray-50/70 border border-medical-gray-200 rounded-xl py-2 px-3 text-xs focus:ring-1 focus:ring-canina-blue outline-none" - placeholder="نام شهر..." - /> - )} -
-
- - setManualAddress(e.target.value)} - className="w-full bg-medical-gray-50/70 border border-medical-gray-200 rounded-xl py-2 px-3 text-xs focus:ring-1 focus:ring-canina-blue outline-none" - placeholder="خیابان، کوچه، پلاک، واحد..." - /> -
-
- - setManualZipCode(e.target.value.replace(/[^0-9]/g, ''))} - className="w-full bg-medical-gray-50/70 border border-medical-gray-200 rounded-xl py-2 px-3 text-xs focus:ring-1 focus:ring-canina-blue outline-none dir-ltr text-right" - placeholder="۱۲۳۴۵۶۷۸۹۰" - /> -
-
+
+ {/* Row 1: Title */} +
+ + setManualAddressData({...manualAddressData, title: e.target.value})} + className={cn("w-full bg-medical-gray-50 border rounded-2xl py-3 px-5 outline-none font-bold transition-all focus:ring-2 focus:ring-canina-blue/20 text-xs", manualErrors.title ? "border-red-300" : "border-medical-gray-100")} + placeholder="مثال: منزل اصلی" + /> + {manualErrors.title &&

{manualErrors.title}

} +
+ +
+ {/* Row 2: Name & Phone */} +
+ + setManualAddressData({...manualAddressData, receptorName: e.target.value})} + className={cn("w-full bg-medical-gray-50 border rounded-2xl py-3 px-5 outline-none font-bold transition-all focus:ring-2 focus:ring-canina-blue/20 text-xs", manualErrors.receptorName ? "border-red-300" : "border-medical-gray-100")} + placeholder="نام و نام خانوادگی..." + /> + {manualErrors.receptorName &&

{manualErrors.receptorName}

} +
+
+ + setManualAddressData({...manualAddressData, phone: e.target.value})} + className={cn("w-full bg-medical-gray-50 border rounded-2xl py-3 px-5 outline-none font-bold transition-all focus:ring-2 focus:ring-canina-blue/20 text-left text-xs", manualErrors.phone ? "border-red-300" : "border-medical-gray-100")} + placeholder="09120000000" + dir="ltr" + /> + {manualErrors.phone &&

{manualErrors.phone}

} +
+
+ +
+ {/* Row 3: Province & City */} +
+ + { + const cities = PROVINCE_CITIES[newProv] || []; + setManualAddressData({ + ...manualAddressData, + province: newProv, + city: cities[0] || "" + }); + }} + /> + {manualErrors.province &&

{manualErrors.province}

} +
+ +
+ + {manualAddressData.province && PROVINCE_CITIES[manualAddressData.province] ? ( + setManualAddressData({...manualAddressData, city: c})} + /> + ) : ( + setManualAddressData({...manualAddressData, city: e.target.value})} + className={cn("w-full bg-medical-gray-50 border rounded-2xl py-3 px-5 outline-none font-bold transition-all focus:ring-2 focus:ring-canina-blue/20 text-xs", manualErrors.city ? "border-red-300" : "border-medical-gray-100")} + placeholder="نام شهر..." + /> + )} + {manualErrors.city &&

{manualErrors.city}

} +
+
+ + {/* Row 4: Detail Address */} +
+ +