fix(checkout, profile, address): fix Google autocomplete attributes, wallet balance in checkout, order history and pet profile sync
This commit is contained in:
1 parent
a6ae1cf30a
commit
6d6824c3ca
5 files changed
+72
-40
No files matched your search
@@ -153,9 +153,12 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
<div className="space-y-4">
|
||||
{/* Row 1: Title */}
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">عنوان آدرس (مثلاً: خانه، محل کار)</label>
|
||||
<label htmlFor="addr-title" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">عنوان آدرس (مثلاً: خانه، محل کار)</label>
|
||||
<input
|
||||
autoFocus
|
||||
id="addr-title"
|
||||
name="address-line1"
|
||||
autoComplete="address-line1"
|
||||
type="text"
|
||||
value={formData.title}
|
||||
onChange={e => setFormData({...formData, title: e.target.value})}
|
||||
@@ -168,8 +171,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
{/* Row 2: Name & Phone */}
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">نام گیرنده</label>
|
||||
<label htmlFor="addr-name" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">نام گیرنده</label>
|
||||
<input
|
||||
id="addr-name"
|
||||
name="name"
|
||||
autoComplete="name"
|
||||
type="text"
|
||||
value={formData.receptorName}
|
||||
onChange={e => setFormData({...formData, receptorName: e.target.value})}
|
||||
@@ -179,8 +185,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
{errors.receptorName && <p className="text-[10px] text-red-500 font-bold pr-2">{errors.receptorName}</p>}
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">شماره تماس</label>
|
||||
<label htmlFor="addr-tel" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">شماره تماس</label>
|
||||
<input
|
||||
id="addr-tel"
|
||||
name="tel"
|
||||
autoComplete="tel"
|
||||
type="text"
|
||||
value={formData.phone}
|
||||
onChange={e => setFormData({...formData, phone: e.target.value})}
|
||||
@@ -195,8 +204,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
{/* Row 3: Province & City */}
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">استان</label>
|
||||
<label htmlFor="addr-province" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">استان</label>
|
||||
<input
|
||||
id="addr-province"
|
||||
name="address-level1"
|
||||
autoComplete="address-level1"
|
||||
type="text"
|
||||
value={formData.province}
|
||||
onChange={e => setFormData({...formData, province: e.target.value})}
|
||||
@@ -206,8 +218,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
{errors.province && <p className="text-[10px] text-red-500 font-bold pr-2">{errors.province}</p>}
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">شهر</label>
|
||||
<label htmlFor="addr-city" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">شهر</label>
|
||||
<input
|
||||
id="addr-city"
|
||||
name="address-level2"
|
||||
autoComplete="address-level2"
|
||||
type="text"
|
||||
value={formData.city}
|
||||
onChange={e => setFormData({...formData, city: e.target.value})}
|
||||
@@ -220,8 +235,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
|
||||
{/* Row 4: Detail Address */}
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">آدرس دقیق</label>
|
||||
<label htmlFor="addr-street" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">آدرس دقیق</label>
|
||||
<textarea
|
||||
id="addr-street"
|
||||
name="street-address"
|
||||
autoComplete="street-address"
|
||||
rows={2}
|
||||
value={formData.detail}
|
||||
onChange={e => setFormData({...formData, detail: e.target.value})}
|
||||
@@ -233,8 +251,11 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
|
||||
|
||||
{/* Row 5: Zip Code */}
|
||||
<div className="space-y-1">
|
||||
<label className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">کد پستی (۱۰ رقم)</label>
|
||||
<label htmlFor="addr-zip" className="text-[10px] font-black text-medical-gray-400 uppercase tracking-widest block pr-2">کد پستی (۱۰ رقم)</label>
|
||||
<input
|
||||
id="addr-zip"
|
||||
name="postal-code"
|
||||
autoComplete="postal-code"
|
||||
type="text"
|
||||
value={formData.zipCode}
|
||||
onChange={e => setFormData({...formData, zipCode: e.target.value})}
|
||||
|
||||
@@ -74,23 +74,19 @@ export default function CheckoutPage() {
|
||||
|
||||
const handleFinalize = async () => {
|
||||
const totalAmount = getTotal();
|
||||
|
||||
if (paymentMethod === 'wallet' && profile.walletBalance < totalAmount) {
|
||||
toast.error("اعتبار کیف پول شما کافی نیست. لطفاً ابتدا آن را شارژ کنید یا روش پرداخت دیگری انتخاب کنید.");
|
||||
return;
|
||||
}
|
||||
|
||||
setLoading(true);
|
||||
const activePet = getActivePet();
|
||||
|
||||
try {
|
||||
// 1. If using wallet, deduct balance and add purchase transaction
|
||||
if (paymentMethod === 'wallet') {
|
||||
const newBalance = profile.walletBalance - totalAmount;
|
||||
// 1. If using wallet, deduct available balance (up to totalAmount)
|
||||
let walletDeducted = 0;
|
||||
if (paymentMethod === 'wallet' && profile.walletBalance > 0) {
|
||||
walletDeducted = Math.min(profile.walletBalance, totalAmount);
|
||||
const newBalance = profile.walletBalance - walletDeducted;
|
||||
const newTransaction = {
|
||||
id: `TR-${Math.floor(Math.random() * 90000) + 10000}`,
|
||||
type: 'purchase' as const,
|
||||
amount: totalAmount,
|
||||
amount: walletDeducted,
|
||||
date: new Date().toISOString(),
|
||||
status: 'success' as const
|
||||
};
|
||||
@@ -104,11 +100,17 @@ export default function CheckoutPage() {
|
||||
}
|
||||
|
||||
// 2. Register the order in the backend
|
||||
const selectedAddr = profile.addresses?.find(a => a.id === selectedAddressId);
|
||||
const shippingAddressStr = selectedAddr
|
||||
? `${selectedAddr.province}، ${selectedAddr.city}، ${selectedAddr.detail} (گیرنده: ${selectedAddr.receptorName} - ${toPersian(selectedAddr.phone)})`
|
||||
: manualAddress || undefined;
|
||||
|
||||
const orderId = await addOrder({
|
||||
items: [...items],
|
||||
total: totalAmount,
|
||||
charityDonation: charityDonation,
|
||||
petId: activePet?.id
|
||||
petId: activePet?.id,
|
||||
shippingAddress: shippingAddressStr
|
||||
});
|
||||
|
||||
// 3. Update user charity total
|
||||
@@ -121,7 +123,7 @@ export default function CheckoutPage() {
|
||||
}));
|
||||
}
|
||||
|
||||
// 4. Update pet consumptions for the refill logic
|
||||
// 4. Update pet consumptions and charity contributions for active pet
|
||||
if (activePet) {
|
||||
const newConsumptions = [...(activePet.consumptions || [])];
|
||||
|
||||
@@ -139,12 +141,14 @@ export default function CheckoutPage() {
|
||||
}
|
||||
});
|
||||
|
||||
updatePet(activePet.id, { consumptions: newConsumptions });
|
||||
updatePet(activePet.id, {
|
||||
consumptions: newConsumptions
|
||||
});
|
||||
}
|
||||
|
||||
clearCart();
|
||||
toast.success("سفارش شما با موفقیت ثبت شد و به پرونده سلامت همدمتان اضافه شد!");
|
||||
router.push('/dashboard');
|
||||
toast.success("سفارش شما با موفقیت ثبت شد!");
|
||||
router.push(`/checkout/success/${orderId}`);
|
||||
} catch (err: any) {
|
||||
toast.error(err.message || "خطا در ثبت سفارش. لطفاً مجدداً تلاش کنید.");
|
||||
} finally {
|
||||
@@ -310,23 +314,26 @@ export default function CheckoutPage() {
|
||||
|
||||
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3 sm:gap-4">
|
||||
{[
|
||||
{ id: 'online', label: 'پرداخت آنلاین', desc: 'کارتهای بانکی', icon: <CreditCard className="w-5 h-5 sm:w-6 sm:h-6" /> },
|
||||
{ id: 'wallet', label: 'اعتبار حساب', desc: 'شارژ شده اختصاصی', icon: <Wallet className="w-5 h-5 sm:w-6 sm:h-6" /> },
|
||||
{ id: 'online', label: 'پرداخت آنلاین', desc: 'کارتهای بانکی عضو شتاب', icon: <CreditCard className="w-5 h-5 sm:w-6 sm:h-6" /> },
|
||||
{
|
||||
id: 'wallet',
|
||||
label: 'اعتبار حساب (کیف پول)',
|
||||
desc: `موجودی: ${toPersian((profile.walletBalance || 0).toLocaleString())} تومان`,
|
||||
icon: <Wallet className="w-5 h-5 sm:w-6 sm:h-6" />
|
||||
},
|
||||
{ id: 'cod', label: 'پرداخت در محل', desc: 'فقط تهران', icon: <Truck className="w-5 h-5 sm:w-6 sm:h-6" /> }
|
||||
].map((pay) => (
|
||||
<div
|
||||
key={pay.id}
|
||||
onClick={async () => {
|
||||
setPaymentMethod(pay.id);
|
||||
}}
|
||||
onClick={() => setPaymentMethod(pay.id)}
|
||||
className={cn("p-4 sm:p-6 rounded-2xl sm:rounded-3xl border-2 cursor-pointer transition-all group flex sm:flex-col items-center sm:items-start gap-4 sm:gap-0", paymentMethod === pay.id ? "border-canina-blue bg-canina-blue/5" : "border-medical-gray-100 hover:border-canina-blue")}
|
||||
>
|
||||
<div className="w-10 h-10 sm:w-12 sm:h-12 bg-medical-gray-50 rounded-xl sm:rounded-2xl flex items-center justify-center text-medical-gray-400 group-hover:text-canina-blue group-hover:bg-canina-blue/10 sm:mb-4 transition-all flex-shrink-0">
|
||||
{pay.icon}
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="font-black text-xs sm:text-sm text-medical-gray-900 mb-0.5 sm:mb-1">{pay.label}</h4>
|
||||
<p className="text-[10px] text-medical-gray-400 font-bold">{pay.desc}</p>
|
||||
<div className="min-w-0 flex-1">
|
||||
<h4 className="font-black text-xs sm:text-sm text-medical-gray-900 mb-0.5 sm:mb-1 truncate">{pay.label}</h4>
|
||||
<p className={cn("text-[10px] font-bold truncate", pay.id === 'wallet' ? "text-canina-blue" : "text-medical-gray-400")}>{pay.desc}</p>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -218,7 +218,7 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
|
||||
اطلاعات ارسال
|
||||
</h4>
|
||||
<p className="text-xs font-bold text-medical-gray-500 leading-relaxed">
|
||||
تهران، خیابان ولیعصر، بالاتر از میدان ونک، بنبست آفتاب، پلاک ۱۲، واحد ۳
|
||||
{order.shippingAddress || "آدرس ثبتی کاربر در حساب کاربری"}
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
@@ -228,15 +228,17 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
|
||||
</h4>
|
||||
<div className="space-y-2">
|
||||
<div className="flex justify-between text-xs font-bold text-medical-gray-400">
|
||||
<span>جمع ناخالص</span>
|
||||
<span>{toPersian(order.total.toLocaleString())} تومان</span>
|
||||
</div>
|
||||
<div className="flex justify-between text-xs font-bold text-red-500">
|
||||
<span>تخفیف هوشمند</span>
|
||||
<span>{toPersian("۰")} تومان</span>
|
||||
<span>مبلغ محصولات</span>
|
||||
<span>{toPersian(((order.total || 0) - (order.charityDonation || 0)).toLocaleString())} تومان</span>
|
||||
</div>
|
||||
{order.charityDonation > 0 && (
|
||||
<div className="flex justify-between text-xs font-bold text-pink-500">
|
||||
<span>کمک اهدایی (ردپای مهربانی)</span>
|
||||
<span>{toPersian(order.charityDonation.toLocaleString())} تومان</span>
|
||||
</div>
|
||||
)}
|
||||
<div className="flex justify-between text-base font-black text-medical-gray-900 pt-2 border-t border-medical-gray-50 italic">
|
||||
<span>مبلغ نهایی</span>
|
||||
<span>مبلغ نهایی پرداخت شده</span>
|
||||
<span>{toPersian(order.total.toLocaleString())} تومان</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -601,9 +601,10 @@ export default function UserDashboard() {
|
||||
<button
|
||||
onClick={() => { setActiveTab("wallet"); setIsTopUpModalOpen(true); }}
|
||||
disabled={isTopUpModalOpen}
|
||||
className="mt-5 sm:mt-8 bg-canina-blue w-full py-3 sm:py-4 rounded-xl sm:rounded-2xl font-black hover:bg-white hover:text-canina-blue transition-all shadow-lg shadow-black/20 flex items-center justify-center gap-2 text-xs sm:text-sm"
|
||||
className="mt-5 sm:mt-8 bg-canina-blue text-white w-full py-3.5 sm:py-4 px-4 rounded-2xl font-black hover:bg-white hover:text-canina-blue transition-all shadow-lg shadow-black/20 flex items-center justify-center gap-2 text-xs sm:text-sm border border-canina-blue"
|
||||
>
|
||||
شارژ کیف پول
|
||||
<ArrowUpCircle className="w-4 h-4 sm:w-5 sm:h-5 flex-shrink-0" />
|
||||
<span>شارژ کیف پول</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -23,6 +23,7 @@ interface Order {
|
||||
charityDonation?: number;
|
||||
status: 'processing' | 'shipped' | 'delivered';
|
||||
petId?: string;
|
||||
shippingAddress?: string;
|
||||
trackingNumber: string;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user