- {paymentMethod === 'card' && (
+ {isCardToCardEnabled && paymentMethod === 'card' && (
diff --git a/frontend/application/components/Header.tsx b/frontend/application/components/Header.tsx
index 3f7c44c5..5cb66124 100644
--- a/frontend/application/components/Header.tsx
+++ b/frontend/application/components/Header.tsx
@@ -234,7 +234,7 @@ export default function Header({
پتهای من ({pets.length})
- setIsProfileMenuOpen(false)} className="text-canina-blue hover:underline text-[10px]">
+ setIsProfileMenuOpen(false)} className="text-canina-blue hover:underline text-[10px]">
مدیریت
diff --git a/frontend/application/components/PetProfile.tsx b/frontend/application/components/PetProfile.tsx
index 1d750ab0..230dcdfe 100644
--- a/frontend/application/components/PetProfile.tsx
+++ b/frontend/application/components/PetProfile.tsx
@@ -488,14 +488,23 @@ export default function PetProfile({ initialView }: {
const fd = new FormData();
fd.append('file', file);
try {
- const res = await api.post('/upload', fd, { headers: { 'Content-Type': 'multipart/form-data' } });
+ const res = await api.post('/pets/upload-image', fd, { headers: { 'Content-Type': 'multipart/form-data' } });
const url = res.data?.url || res.data?.path || res.data?.data?.url;
if (url) {
setFormData({ ...formData, imageUrl: url });
toast.success("تصویر با موفقیت آپلود شد");
}
} catch {
- toast.error("خطا در آپلود تصویر");
+ try {
+ const res = await api.post('/upload', fd, { headers: { 'Content-Type': 'multipart/form-data' } });
+ const url = res.data?.url || res.data?.path || res.data?.data?.url;
+ if (url) {
+ setFormData({ ...formData, imageUrl: url });
+ toast.success("تصویر با موفقیت آپلود شد");
+ }
+ } catch {
+ toast.error("خطا در آپلود تصویر");
+ }
}
}}
/>
diff --git a/frontend/application/components/SmartAdvisor.tsx b/frontend/application/components/SmartAdvisor.tsx
index 4ed8a50e..b9fb1b5e 100644
--- a/frontend/application/components/SmartAdvisor.tsx
+++ b/frontend/application/components/SmartAdvisor.tsx
@@ -56,21 +56,27 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
const { addPet, setActivePet } = usePetStore();
const getText = useSettingsStore(state => state.getText);
- const [advisorRules, setAdvisorRules] = useState
(rules);
+ const [advisorRules, setAdvisorRules] = useState(rules || []);
useEffect(() => {
if (rules && rules.length > 0) {
- Promise.resolve().then(() => setAdvisorRules(rules));
- } else {
- api.get('/smart-advisor/rules')
- .then(res => {
- if (Array.isArray(res.data)) {
- setAdvisorRules(res.data);
- }
- })
- .catch(err => console.error("[SmartAdvisor] Failed to fetch rules:", err));
+ setAdvisorRules(rules);
+ return;
}
- }, [rules]);
+
+ let isMounted = true;
+ api.get('/smart-advisor/rules')
+ .then(res => {
+ if (isMounted && Array.isArray(res.data)) {
+ setAdvisorRules(res.data);
+ }
+ })
+ .catch(err => console.error("[SmartAdvisor] Failed to fetch rules:", err));
+
+ return () => {
+ isMounted = false;
+ };
+ }, [rules?.length]);
const [step, setStep] = useState(1);
diff --git a/frontend/application/components/UserDashboard.tsx b/frontend/application/components/UserDashboard.tsx
index d8156ecb..a6334fe0 100644
--- a/frontend/application/components/UserDashboard.tsx
+++ b/frontend/application/components/UserDashboard.tsx
@@ -1,10 +1,11 @@
"use client";
-import React, { useState } from "react";
-import { motion } from "motion/react";
-import { User, ShoppingBag, Wallet, MapPin, LogOut, ChevronRight, Package, Calendar, UserCircle, ShoppingCart, Trash2, Edit2, Phone, Hash, CheckCircle2, ArrowUpCircle, ArrowDownCircle, Info, Clock, CheckCircle, Heart, Sparkles, MessageSquare, Send, Stethoscope, FileText, Lock, Key, Eye, EyeOff, ShieldCheck } from "lucide-react";
+import React, { useState, useEffect } from "react";
+import { motion, AnimatePresence } from "motion/react";
+import { User, ShoppingBag, Wallet, MapPin, LogOut, ChevronRight, Package, Calendar, UserCircle, ShoppingCart, Trash2, Edit2, Phone, Hash, CheckCircle2, ArrowUpCircle, ArrowDownCircle, Info, Clock, CheckCircle, Heart, Sparkles, MessageSquare, Send, Stethoscope, FileText, Lock, Key, Eye, EyeOff, ShieldCheck, Dog, X, Plus, CreditCard, Activity } from "lucide-react";
import { OrderRowSkeleton } from "./Skeleton";
import { useUserStore, Address } from "../lib/store/userStore";
import { useCartStore } from "../lib/store/cartStore";
+import { useSettingsStore } from "../lib/store/settingsStore";
import { toPersian, toEnglishDigits, cn } from "../lib/utils";
import { toast } from "sonner";
import OrderDetailsModal from "./OrderDetailsModal";
@@ -14,12 +15,14 @@ import TopUpModal from "./TopUpModal";
import { ticketService, Ticket, TicketMessage } from "../lib/services/ticketService";
import { usePetStore } from "../lib/store/usePetStore";
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
export default function UserDashboard() {
const router = useRouter();
+ const searchParams = useSearchParams();
const { profile, isLoggedIn, logout, updateProfile, addAddress, updateAddress, deleteAddress, setDefaultAddress, topUpWallet } = useUserStore();
- const { pets } = usePetStore();
+ const { pets, activePetId, setActivePet, removePet } = usePetStore();
+ const isWithdrawalEnabled = useSettingsStore((s) => s.getBoolean('wallet_withdrawal_enabled', false));
React.useEffect(() => {
if (!isLoggedIn && typeof window !== "undefined") {
@@ -29,7 +32,16 @@ export default function UserDashboard() {
}, [isLoggedIn, router]);
const { orders } = useCartStore();
- const [activeTab, setActiveTab] = React.useState<"profile" | "orders" | "wallet" | "addresses" | "tickets" | "overview">("profile");
+ const [activeTab, setActiveTab] = React.useState<"profile" | "orders" | "wallet" | "addresses" | "tickets" | "pets" | "overview">("profile");
+
+ // Set tab from URL query param if present
+ useEffect(() => {
+ const tabParam = searchParams.get('tab');
+ if (tabParam && ['profile', 'orders', 'wallet', 'addresses', 'tickets', 'pets'].includes(tabParam)) {
+ setActiveTab(tabParam as "profile" | "orders" | "wallet" | "addresses" | "tickets" | "pets");
+ }
+ }, [searchParams]);
+
const [isLoadingOrders, setIsLoadingOrders] = useState(false);
// Tickets State
@@ -138,6 +150,13 @@ export default function UserDashboard() {
// Wallet State
const [isTopUpModalOpen, setIsTopUpModalOpen] = useState(false);
+ const [isWithdrawModalOpen, setIsWithdrawModalOpen] = useState(false);
+ const [withdrawAmount, setWithdrawAmount] = useState("");
+ const [withdrawIban, setWithdrawIban] = useState("");
+ const [isSubmittingWithdrawal, setIsSubmittingWithdrawal] = useState(false);
+
+ // Pet Delete State
+ const [petToDelete, setPetToDelete] = useState<{ id: string; name: string } | null>(null);
// Profile State
const [isEditing, setIsEditing] = useState(false);
@@ -278,8 +297,44 @@ export default function UserDashboard() {
setIsAddressModalOpen(true);
};
+ const handleWithdrawSubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+ const numAmount = parseInt(toEnglishDigits(withdrawAmount));
+ if (!numAmount || numAmount < 50000) {
+ toast.error("حداقل مبلغ قابل برداشت ۵۰,۰۰۰ تومان است.");
+ return;
+ }
+ if (numAmount > (profile.walletBalance || 0)) {
+ toast.error("مبلغ درخواستی از موجودی کیف پول شما بیشتر است.");
+ return;
+ }
+ if (!withdrawIban.trim() || withdrawIban.trim().length < 10) {
+ toast.error("لطفاً شماره شبا یا شماره کارت معتبر وارد نمایید.");
+ return;
+ }
+ try {
+ setIsSubmittingWithdrawal(true);
+ await ticketService.createTicket({
+ subject: `درخواست تسویه و برداشت وجه (${toPersian(numAmount.toLocaleString())} تومان)`,
+ message: `درخواست برداشت وجه از کیف پول کاربری:\nمبلغ: ${numAmount.toLocaleString('fa-IR')} تومان\nشماره شبا/کارت: ${withdrawIban}\nشماره همراه کاربر: ${profile.mobile || ''}`,
+ category: 'FINANCIAL',
+ priority: 'HIGH'
+ });
+ toast.success(`درخواست برداشت ${toPersian(numAmount.toLocaleString())} تومان با موفقیت ثبت شد و پس از بررسی واحد مالی واریز خواهد شد.`);
+ setIsWithdrawModalOpen(false);
+ setWithdrawAmount("");
+ setWithdrawIban("");
+ fetchTickets();
+ } catch {
+ toast.error("خطا در ثبت درخواست برداشت. لطفاً با پشتیبانی تماس بگیرید.");
+ } finally {
+ setIsSubmittingWithdrawal(false);
+ }
+ };
+
const tabs = [
{ id: "profile", label: "اطلاعات فردی", icon: },
+ { id: "pets", label: "پتهای من", icon: },
{ id: "orders", label: "سفارشات من", icon: },
{ id: "wallet", label: "کیف پول", icon: },
{ id: "addresses", label: "آدرسها", icon: },
@@ -596,9 +651,139 @@ export default function UserDashboard() {