diff --git a/package.json b/package.json index 0f360430..9fc0f721 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "app.salona", "private": true, - "version": "2.74.4", + "version": "2.74.6", "type": "module", "scripts": { "dev": "vite --host", diff --git a/src/apps/new-ui/pages/OpinionSMS/+components/CreatedSurveyCard.tsx b/src/apps/new-ui/pages/OpinionSMS/+components/CreatedSurveyCard.tsx index 57a1d57f..70cf15ca 100644 --- a/src/apps/new-ui/pages/OpinionSMS/+components/CreatedSurveyCard.tsx +++ b/src/apps/new-ui/pages/OpinionSMS/+components/CreatedSurveyCard.tsx @@ -4,6 +4,7 @@ import FormDoneIcon from "@new-ui/assets/waiting-img-done.svg"; import moment from "jalali-moment"; import { Eye, Share2, X } from "lucide-react"; import { CreatedSurvey } from "../types"; +import status from "@new-ui/assets/appointment/status.svg"; type Props = { survey: CreatedSurvey; @@ -45,11 +46,15 @@ const CreatedSurveyCard: React.FC = ({ survey, isPreview, onDelete, onSha {/* user card */}
- {survey?.customer_name +
+ {survey?.customer_name + status +
+

{survey.customer?.name}

{survey.customer?.phone_number}

diff --git a/src/apps/new-ui/pages/OpinionSMS/+components/UserCard.tsx b/src/apps/new-ui/pages/OpinionSMS/+components/UserCard.tsx index 66c0bfb9..9170e516 100644 --- a/src/apps/new-ui/pages/OpinionSMS/+components/UserCard.tsx +++ b/src/apps/new-ui/pages/OpinionSMS/+components/UserCard.tsx @@ -2,6 +2,7 @@ import tick from "@new-ui/assets/appointment/tick.svg"; import emptyTick from "@new-ui/assets/appointment/emptyTick.svg"; import waitingIcon from "@new-ui/assets/waiting-img.svg"; import { Eye } from "lucide-react"; +import status from "@new-ui/assets/appointment/status.svg"; interface Props { img?: string | undefined; @@ -13,7 +14,6 @@ interface Props { } const UserCard: React.FC = ({ img, title, checked, description, onClick, onView }) => { - return (
= ({ img, title, checked, description, onClick, }} >
- {title +
+ {img ? ( + <> + {title + status + + ) : ( + {title + )} +
+

{title}

= ({ img, title, checked, description, onClick, )} {checked ? tick : emptyTick} -

+
); }; -export default UserCard; \ No newline at end of file +export default UserCard; diff --git a/src/apps/new-ui/pages/ReportAll/Accounting/index.tsx b/src/apps/new-ui/pages/ReportAll/Accounting/index.tsx index ed5df28e..86f913fa 100644 --- a/src/apps/new-ui/pages/ReportAll/Accounting/index.tsx +++ b/src/apps/new-ui/pages/ReportAll/Accounting/index.tsx @@ -317,6 +317,7 @@ const Accounting: React.FC = () => { { const val = e.target.value.replace(/[^0-9]/g, ""); @@ -326,7 +327,6 @@ const Accounting: React.FC = () => { placeholder="مثال: 1402" className="w-full p-3 rounded-lg border border-[#E5E7EB] text-right" /> -

عدد سال را به صورت شمسی وارد کنید (مثال: 1402). این مقدار هنگام محاسبه به URL اضافه می‌شود.

)}
diff --git a/src/apps/new-ui/pages/ReportAll/ChartReport/index.tsx b/src/apps/new-ui/pages/ReportAll/ChartReport/index.tsx index 1ac03303..39a32588 100644 --- a/src/apps/new-ui/pages/ReportAll/ChartReport/index.tsx +++ b/src/apps/new-ui/pages/ReportAll/ChartReport/index.tsx @@ -5,249 +5,248 @@ import CostPieChart, { AccountingEntry as PieEntry } from "./+components/CostPie import MonthlyChart from "./+components/MonthlyChart"; import { CalendarDays } from "lucide-react"; import moment from "jalali-moment"; - import { useGetTotalProfitBetweenDates } from "@/apps/new-ui/services/ChartReport"; -import { useGetYearlyReport } from "@/apps/new-ui/services/ChartReport"; // فرض بر این که این هوک در همین فایل سرویس موجوده +import { useGetYearlyReport } from "@/apps/new-ui/services/ChartReport"; export type AccountingEntry = { - id: number; - type: "income" | "cost"; - amount: number; - date: string; // e.g. "1404-07-01" (jYYYY-jMM-jDD) یا هر فرمتی که کامپوننت‌های شما می‌خوان - category?: string; - note?: string; + id: number; + type: "income" | "cost"; + amount: number; + date: string; + category?: string; + note?: string; }; function filterByRange(entries: AccountingEntry[], start: string, end: string) { - if (!start && !end) return entries; - return entries.filter((e) => { - if (start && end) return e.date >= start && e.date <= end; - if (start) return e.date >= start; - if (end) return e.date <= end; - return true; - }); + if (!start && !end) return entries; + return entries.filter((e) => { + if (start && end) return e.date >= start && e.date <= end; + if (start) return e.date >= start; + if (end) return e.date <= end; + return true; + }); } export default function ChartReport() { - const navigate = useNavigate(); - const [searchParams] = useSearchParams(); + const navigate = useNavigate(); + const [searchParams] = useSearchParams(); - const startParam = searchParams.get("start") ?? ""; - const endParam = searchParams.get("end") ?? ""; - const rangeParam = searchParams.get("range") ?? ""; - const isShowMonthly = rangeParam !== "mounth" && rangeParam !== "range"; + const startParam = searchParams.get("start") ?? ""; + const endParam = searchParams.get("end") ?? ""; + const rangeParam = searchParams.get("range") ?? ""; + const isShowMonthly = rangeParam !== "month" && rangeParam !== "range"; - // نمایش تاریخ در header (local state فقط برای نمایش) - const [startInput] = useState(startParam); - const [endInput] = useState(endParam); + const [startInput] = useState(startParam); + const [endInput] = useState(endParam); - const [tab, setTab] = useState<0 | 1>(0); + const [tab, setTab] = useState<0 | 1>(0); - // totals API (همان هوک اصلی شما) - const totalsQuery = useGetTotalProfitBetweenDates( - startParam && endParam ? { startDate: startParam, endDate: endParam } : undefined - ) as any; - const totalsData = totalsQuery?.data; + // === totals API hook === + const totalsQuery = useGetTotalProfitBetweenDates( + startParam && endParam ? { startDate: startParam, endDate: endParam } : undefined + ) as any; + const totalsData = totalsQuery?.data; + const totalsLoading = totalsQuery?.isLoading || totalsQuery?.isFetching; + const totalsError = totalsQuery?.isError; - // fallback mock (همان mock شما) - const mockTotals = useMemo( - () => ({ - net_profit: 2620097, - total_expence: 3950000, - total_income: 6570097, - }), - [] - ); + // parse numbers safely + const parseNum = (v: any): number | null => { + if (v === null || v === undefined) return null; + const n = Number(v); + return Number.isFinite(n) ? n : null; + }; - // parse numbers safely - const parseNum = (v: any): number | null => { - if (v === null || v === undefined) return null; - const n = Number(v); - return Number.isFinite(n) ? n : null; - }; + const parsedIncome = parseNum(totalsData?.total_income); + const parsedExpense = parseNum(totalsData?.total_expence); + const parsedProfit = parseNum(totalsData?.net_profit); - const parsedIncome = parseNum(totalsData?.total_income); - const parsedExpense = parseNum(totalsData?.total_expence); - const parsedProfit = parseNum(totalsData?.net_profit); + // === IMPORTANT: remove mock fallback. + // if totalsData is falsy, we won't create serverTxs (چیزی برای نمایش نیست). + const hasServerTotals = !!totalsData && (parsedIncome !== null || parsedExpense !== null || parsedProfit !== null); - const hasAnyNonZero = - (parsedIncome !== null && parsedIncome !== 0) || - (parsedExpense !== null && parsedExpense !== 0) || - (parsedProfit !== null && parsedProfit !== 0); + // serverTxs only when we have real totals from server + const serverTxs: AccountingEntry[] = useMemo(() => { + if (!hasServerTotals) return []; - const effectiveTotals = hasAnyNonZero ? totalsData : mockTotals; + const baseDate = startParam || endParam || moment().format("jYYYY-jMM-01"); + const incomeAmount = Number(totalsData.total_income ?? 0); + const costAmount = Number(totalsData.total_expence ?? 0); - // serverTxs همان داده‌ای است که برای PieChart استفاده می‌کنیم - const serverTxs: AccountingEntry[] = useMemo(() => { - const baseDate = startParam || endParam || moment().format("jYYYY-jMM-01"); - const incomeAmount = Number(effectiveTotals?.total_income ?? 0); - const costAmount = Number(effectiveTotals?.total_expence ?? 0); + return [ + { + id: 1, + type: "income", + amount: incomeAmount, + date: baseDate, + category: "سود/درآمد", + note: "مجموع درآمد (از totals API)", + }, + { + id: 2, + type: "cost", + amount: costAmount, + date: baseDate, + category: "هزینه‌ها", + note: "مجموع هزینه (از totals API)", + }, + ]; + }, [totalsData, startParam, endParam, hasServerTotals]); - return [ - { - id: 1, - type: "income", - amount: incomeAmount, - date: baseDate, - category: "سود/درآمد", - note: hasAnyNonZero ? "مجموع درآمد (از totals API)" : "مجموع درآمد (mock)", - }, - { - id: 2, - type: "cost", - amount: costAmount, - date: baseDate, - category: "هزینه‌ها", - note: hasAnyNonZero ? "مجموع هزینه (از totals API)" : "مجموع هزینه (mock)", - }, - ]; - }, [effectiveTotals, startParam, endParam, hasAnyNonZero]); + const entriesInRange = useMemo( + () => filterByRange(serverTxs, startParam, endParam), + [serverTxs, startParam, endParam] + ); - const entriesInRange = useMemo( - () => filterByRange(serverTxs, startParam, endParam), - [serverTxs, startParam, endParam] - ); + const incomeTotal = + parseNum(totalsData?.total_income) ?? + entriesInRange.filter((e) => e.type === "income").reduce((s, e) => s + e.amount, 0); - const incomeTotal = - parseNum(effectiveTotals?.total_income) ?? - entriesInRange.filter((e) => e.type === "income").reduce((s, e) => s + e.amount, 0); + const costTotal = + parseNum(totalsData?.total_expence) ?? + entriesInRange.filter((e) => e.type === "cost").reduce((s, e) => s + e.amount, 0); - const costTotal = - parseNum(effectiveTotals?.total_expence) ?? - entriesInRange.filter((e) => e.type === "cost").reduce((s, e) => s + e.amount, 0); + const profitTotal = parseNum(totalsData?.net_profit) ?? incomeTotal - costTotal; - const profitTotal = parseNum(effectiveTotals?.net_profit) ?? incomeTotal - costTotal; + console.log(profitTotal); + // === yearly report (tab 1) === + const shamsiYearFromParam = startParam ? startParam.slice(0, 4) : ""; + const currentJalaliYear = moment().format("jYYYY"); + const shamsiYear = shamsiYearFromParam || currentJalaliYear; - console.log(profitTotal); + const yearlyQuery = useGetYearlyReport(tab === 1 ? shamsiYear : undefined) as any; + const yearlyData = yearlyQuery?.data; + const yearlyLoading = yearlyQuery?.isLoading || yearlyQuery?.isFetching; + const yearlyError = yearlyQuery?.isError; - // === NEW: yearly report fetch when tab === 1 === - // shamsiYear: اگر startParam شامل تاریخ بود (jYYYY-jMM-jDD) از چهار رقم اول استفاده می‌کنیم - const shamsiYearFromParam = startParam ? startParam.slice(0, 4) : ""; - const currentJalaliYear = moment().format("jYYYY"); - const shamsiYear = shamsiYearFromParam || currentJalaliYear; + const monthlyEntries: AccountingEntry[] = useMemo(() => { + if (!yearlyData?.monthly_data || !Array.isArray(yearlyData.monthly_data)) return []; + const yearStr = String(yearlyData.year ?? shamsiYear); + return yearlyData.monthly_data.flatMap((m: any) => { + const monthStr = String(m.month).padStart(2, "0"); + const date = `${yearStr}-${monthStr}-01`; + return [ + { + id: Number(`${yearStr}${monthStr}1`), + type: "income", + amount: Number(m.total_income ?? 0), + date, + category: "درآمد ماهیانه", + note: `ماه ${m.month}`, + } as AccountingEntry, + { + id: Number(`${yearStr}${monthStr}2`), + type: "cost", + amount: Number(m.total_expense ?? 0), + date, + category: "هزینه ماهیانه", + note: `ماه ${m.month}`, + } as AccountingEntry, + ]; + }); + }, [yearlyData, shamsiYear]); - // فقط زمانی که tab === 1 هوک فعال باشه (hook خودتون هم enabled بررسی می‌کنه) - const yearlyQuery = useGetYearlyReport(tab === 1 ? shamsiYear : undefined) as any; - const yearlyData = yearlyQuery?.data; - const yearlyLoading = yearlyQuery?.isLoading || yearlyQuery?.isFetching; - const yearlyError = yearlyQuery?.isError; + useEffect(() => { + const t = setTimeout(() => { + window.dispatchEvent(new Event("resize")); + }, 120); + return () => clearTimeout(t); + }, [tab, startParam, endParam]); - // map monthly_data -> AccountingEntry[] مناسب MonthlyChart - const monthlyEntries: AccountingEntry[] = useMemo(() => { - if (!yearlyData?.monthly_data || !Array.isArray(yearlyData.monthly_data)) return []; + const renderKey = `${tab}-${startParam}-${endParam}`; - // هر ماه دو ورودی income و cost می‌سازیم (ممکنه بخواهی net_profit هم جدا ارسال بشه) - const yearStr = String(yearlyData.year ?? shamsiYear); - return yearlyData.monthly_data.flatMap((m: any) => { - const monthStr = String(m.month).padStart(2, "0"); - // date به صورت jYYYY-jMM-01 قرار می‌گیرد تا در صورت نیاز به نمایش محور ماه‌ها قابل استفاده باشد - const date = `${yearStr}-${monthStr}-01`; - return [ - { - id: Number(`${yearStr}${monthStr}1`), - type: "income", - amount: Number(m.total_income ?? 0), - date, - category: "درآمد ماهیانه", - note: `ماه ${m.month}`, - } as AccountingEntry, - { - id: Number(`${yearStr}${monthStr}2`), - type: "cost", - amount: Number(m.total_expense ?? 0), - date, - category: "هزینه ماهیانه", - note: `ماه ${m.month}`, - } as AccountingEntry, - ]; - }); - }, [yearlyData, shamsiYear]); + return ( + <> +
- // trigger resize after tab change to help charts redraw correctly - useEffect(() => { - const t = setTimeout(() => { - window.dispatchEvent(new Event("resize")); - }, 120); - return () => clearTimeout(t); - }, [tab, startParam, endParam]); +
+
+ + {tab === 0 ? ( + <> + از + {startInput || "-"} + - + تا + {endInput || "-"} + + ) : ( +

سال انتخاب شده : {shamsiYear}

+ )} +
- const renderKey = `${tab}-${startParam}-${endParam}`; +
+ - return ( - <> -
+ {isShowMonthly && ( + + )} +
-
- {/* header & date selector */} -
- - {tab === 0 ? ( - <> - از - {startInput || "-"} - - - تا - {endInput || "-"} - - ) : ( -

سال انتخاب شده : {shamsiYear}

- )} -
+
+ {tab === 0 ? ( +
+ {totalsLoading ? ( +
+ در حال بارگذاری داده‌های کلی... +
+ ) : totalsError ? ( +
خطا در دریافت داده‌های کلی.
+ ) : !hasServerTotals ? ( +
+ داده‌ای برای نمایش موجود نیست. +
+ ) : ( + + )} +
+ ) : ( +
+ {yearlyLoading ? ( +
+ در حال بارگذاری داده‌های ماهیانه... +
+ ) : yearlyError ? ( +
+ خطا در دریافت گزارش سالیانه. +
+ ) : ( + + )} +
+ )} +
- {/* tabs */} -
- - - {isShowMonthly && ( - - )} -
- - {/* content area */} -
- {tab === 0 ? ( -
- {/* Pie */} - +
+ +
- ) : ( -
- {/* Monthly */} - {yearlyLoading ? ( -
در حال بارگذاری داده‌های ماهیانه...
- ) : yearlyError ? ( -
خطا در دریافت گزارش سالیانه.
- ) : ( - - )} -
- )} -
- - {/* fixed close button */} -
- -
-
- - ); + + ); } diff --git a/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/+components/AmountInput.tsx b/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/+components/AmountInput.tsx index bc6e7a0d..8b99f26d 100644 --- a/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/+components/AmountInput.tsx +++ b/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/+components/AmountInput.tsx @@ -1,153 +1,136 @@ import { useEffect, useMemo, useState } from "react"; type Props = { - label?: string; - onChange: (value: number) => void; - value?: number | null; - locale?: string; // پیش‌فرض 'fa-IR' (اعداد فارسی). برای اعداد لاتین از 'en-US' استفاده کنید. + label?: string; + onChange: (value: number) => void; + value?: number | null; + locale?: string; }; const persianNums: Record = { - "۰": "0", - "۱": "1", - "۲": "2", - "۳": "3", - "۴": "4", - "۵": "5", - "۶": "6", - "۷": "7", - "۸": "8", - "۹": "9", + "۰": "0", + "۱": "1", + "۲": "2", + "۳": "3", + "۴": "4", + "۵": "5", + "۶": "6", + "۷": "7", + "۸": "8", + "۹": "9", }; const arabicNums: Record = { - "٠": "0", - "١": "1", - "٢": "2", - "٣": "3", - "٤": "4", - "٥": "5", - "٦": "6", - "٧": "7", - "٨": "8", - "٩": "9", + "٠": "0", + "١": "1", + "٢": "2", + "٣": "3", + "٤": "4", + "٥": "5", + "٦": "6", + "٧": "7", + "٨": "8", + "٩": "9", }; const toLatinDigits = (s: string) => - s.replace(/[۰-۹]/g, (d) => persianNums[d] ?? d).replace(/[٠-٩]/g, (d) => arabicNums[d] ?? d); + s.replace(/[۰-۹]/g, (d) => persianNums[d] ?? d).replace(/[٠-٩]/g, (d) => arabicNums[d] ?? d); const onlyDigits = (s: string) => { - if (!s) return ""; - const latin = toLatinDigits(s); - return latin.replace(/\D/g, ""); + if (!s) return ""; + const latin = toLatinDigits(s); + return latin.replace(/\D/g, ""); }; const formatWithLocale = (digits: string, locale: string) => { - if (!digits) return ""; - // جلوگیری از صفرهای پیشرو (مگر اینکه فقط "0" باشد) - const trimmed = digits.replace(/^0+(?=\d)/, ""); - const n = Number(trimmed || "0"); - try { - return new Intl.NumberFormat(locale).format(n); - } catch { - // fallback به فرمت با کاما (لاتین) - return trimmed.replace(/\B(?=(\d{3})+(?!\d))/g, ","); - } + if (!digits) return ""; + const trimmed = digits.replace(/^0+(?=\d)/, ""); + const n = Number(trimmed || "0"); + try { + return new Intl.NumberFormat(locale).format(n); + } catch { + return trimmed.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + } }; -const AmountInput: React.FC = ({ - label = "مبلغ", - onChange, - value = null, - locale = "fa-IR", -}) => { - // state نگهدارندهٔ RAW digits (فقط اعداد، بدون کاما) - const [raw, setRaw] = useState(value !== null ? String(Math.trunc(value)) : ""); - const [focused, setFocused] = useState(false); +const AmountInput: React.FC = ({ label = "مبلغ", onChange, value = null, locale = "fa-IR" }) => { + const [raw, setRaw] = useState(value !== null ? String(Math.trunc(value)) : ""); + const [focused, setFocused] = useState(false); - // وقتی prop value تغییر کنه، state رو هم بروز کن - useEffect(() => { - if (value !== null && !isNaN(value)) { - setRaw(String(Math.trunc(value))); - } - }, [value]); + useEffect(() => { + if (value !== null && !isNaN(value)) { + setRaw(String(Math.trunc(value))); + } + }, [value]); - // اعلام عدد به والد (همیشه به صورت عدد خام، بدون فرمت) - const emitNumber = (s: string) => { - if (!s) { - onChange(0); - return; - } - const n = Number(s); - if (!isNaN(n)) onChange(n); - else onChange(0); - }; + const emitNumber = (s: string) => { + if (!s) { + onChange(0); + return; + } + const n = Number(s); + if (!isNaN(n)) onChange(n); + else onChange(0); + }; - // نمایش با فرمت (گروه‌بندی هزارگان) — اکنون همیشه نمایش فرمت‌شده است - const displayValue = useMemo(() => formatWithLocale(raw, locale), [raw, locale]); + const displayValue = useMemo(() => formatWithLocale(raw, locale), [raw, locale]); - // هندلر تغییر ورودی (تایپ/حذف) - const handleChange = (e: React.ChangeEvent) => { - const v = e.target.value; - // حذف کاماها قبل از پردازش - const withoutCommas = v.replace(/[,٬\s\u200C]/g, ""); - // تبدیل ارقام فارسی/عربی و حذف هرچیز غیر رقمی - const digits = onlyDigits(withoutCommas); - // می‌تونی محدودیت طول بذاری اگر خواستی: e.g. digits.slice(0, 12) - setRaw(digits); - emitNumber(digits); - }; + const handleChange = (e: React.ChangeEvent) => { + const v = e.target.value; + const withoutCommas = v.replace(/[,٬\s\u200C]/g, ""); + const digits = onlyDigits(withoutCommas); + setRaw(digits); + emitNumber(digits); + }; - // کنترل پیست (paste) - const handlePaste = (e: React.ClipboardEvent) => { - const text = e.clipboardData.getData("text"); - const digits = onlyDigits(text); - if (!digits) { - e.preventDefault(); - return; - } - e.preventDefault(); - setRaw(digits); - emitNumber(digits); - }; + // کنترل پیست (paste) + const handlePaste = (e: React.ClipboardEvent) => { + const text = e.clipboardData.getData("text"); + const digits = onlyDigits(text); + if (!digits) { + e.preventDefault(); + return; + } + e.preventDefault(); + setRaw(digits); + emitNumber(digits); + }; - const hasValue = raw.trim() !== ""; + const hasValue = raw.trim() !== ""; - return ( -
-
- setFocused(true)} - onBlur={() => setFocused(false)} - onPaste={handlePaste} - className={`w-full text-right bg-white outline-none transition-shadow duration-150 border-2 rounded-full py-2 px-6 border-[#6a3f7f] font-medium`} - /> -
- تومان -
+ return ( +
+
+ setFocused(true)} + onBlur={() => setFocused(false)} + onPaste={handlePaste} + className={`w-full text-right bg-white outline-none transition-shadow duration-150 border-2 rounded-full py-2 px-6 border-[#6a3f7f] font-medium`} + /> +
+ تومان +
- {/* فلوٹنگ لیبل — وقتی فوکس یا مقدار وجود داشته باشه کوچک و بالاتر میره (سمت راست) */} - -
-
- ); + > + {label} + +
+
+ ); }; export default AmountInput; diff --git a/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/index.tsx b/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/index.tsx index 8f866242..b775ede9 100644 --- a/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/index.tsx +++ b/src/apps/new-ui/pages/ReportAll/Income&Cost/Create/index.tsx @@ -41,7 +41,12 @@ const CreateIncomeAndCost: React.FC = () => { const navigate = useNavigate(); - const [reportActionsType, setReportActionsType] = useState(null); + // ------------ states -------------- + // selectedActionId => برای نمایش استایل انتخاب‌شده در Card (عدد) + const [selectedActionId, setSelectedActionId] = useState(null); + // reportActionsTypeTitle => عنوان مربوط به آیتم انتخاب شده (string|null) + const [reportActionsTypeTitle, setReportActionsTypeTitle] = useState(null); + const [amount, setAmount] = useState(null); const [date, setDate] = useState(""); const [description, setDescription] = useState(""); @@ -65,6 +70,68 @@ const CreateIncomeAndCost: React.FC = () => { const upsertIncome = upsertIncomeHook.mutate; const upsertExpense = upsertExpenseHook.mutate; + // ---------- helpers ---------- + const findItemById = (idVal: number | string | null) => + pageMode.find((p) => String(p.id) === String(idVal)) ?? null; + const findItemByTitle = (title: string | null) => + pageMode.find((p) => p.title === (title ?? "").trim()) ?? null; + + // ---------- handler for Card fallback ---------- + // Card ممکنه عدد (id)، عنوان (string)، یا شیء ارسال کنه — همه حالت‌ها رو هندل می‌کنیم. + const handleSelectReportAction = (val: any) => { + if (val === null || val === undefined) { + setSelectedActionId(null); + setReportActionsTypeTitle(null); + // اگر خواستی textarea پاک بشه: + setDescription(""); + return; + } + + let resolvedId: number | null = null; + let resolvedTitle: string | null = null; + + if (typeof val === "number") { + resolvedId = val; + const found = findItemById(val); + resolvedTitle = found ? found.title : String(val); + } else if (typeof val === "string") { + // ممکنه string عنوان باشه یا id به صورت رشته + const byId = findItemById(val); + if (byId) { + resolvedId = byId.id; + resolvedTitle = byId.title; + } else { + const byTitle = findItemByTitle(val); + if (byTitle) { + resolvedId = byTitle.id; + resolvedTitle = byTitle.title; + } else { + // fallback: treat as title + resolvedTitle = val; + } + } + } else if (typeof val === "object") { + // اگر آبجکت شامل id یا title باشه + if (val.id !== undefined && val.id !== null) { + resolvedId = Number(val.id); + } + if (val.title) resolvedTitle = String(val.title); + if (!resolvedTitle && resolvedId !== null) { + const f = findItemById(resolvedId); + if (f) resolvedTitle = f.title; + } + } else { + // fallback stringify + resolvedTitle = String(val); + } + + setSelectedActionId(resolvedId); + setReportActionsTypeTitle(resolvedTitle); + // وقتی کاربر روی کارت زد، عنوان بیاد توی textarea (طبق خواست شما) + if (resolvedTitle) setDescription(resolvedTitle); + }; + + // ---------- populate edit values from server ---------- useEffect(() => { const source = mode === "cost" ? expenseData : mode === "income" ? incomeData : undefined; if (!id || !source) return; @@ -81,7 +148,36 @@ const CreateIncomeAndCost: React.FC = () => { setAmount(parsedAmount); setDate(srcDate); setDescription(srcDescription); - setReportActionsType(srcReportActionsType); + + // srcReportActionsType ممکنه id یا title باشه: + let resolvedId: number | null = null; + let resolvedTitle: string | null = null; + + // try id + const byId = findItemById(srcReportActionsType); + if (byId) { + resolvedId = byId.id; + resolvedTitle = byId.title; + } else { + // try title + const byTitle = findItemByTitle(srcReportActionsType); + if (byTitle) { + resolvedId = byTitle.id; + resolvedTitle = byTitle.title; + } + } + + // اگر سرور reportActionsType نداشت، ولی description دقیقا یک title هست، اون رو انتخاب کن + if (!resolvedTitle) { + const matchFromDesc = findItemByTitle(srcDescription); + if (matchFromDesc) { + resolvedId = matchFromDesc.id; + resolvedTitle = matchFromDesc.title; + } + } + + setSelectedActionId(resolvedId); + setReportActionsTypeTitle(resolvedTitle); setInitialValues({ amount: parsedAmount, @@ -89,7 +185,25 @@ const CreateIncomeAndCost: React.FC = () => { description: srcDescription, reportActionsType: srcReportActionsType, }); - }, [id, mode, expenseData, incomeData]); + }, [id, mode, expenseData, incomeData, pageMode]); + + // ---------- وقتی کاربر تایپ کرد و متن دقیقا با یک title برابر شد، id را ست کن ---------- + useEffect(() => { + const trimmed = description.trim(); + if (trimmed === "") { + setSelectedActionId(null); + setReportActionsTypeTitle(null); + return; + } + const match = findItemByTitle(trimmed); + if (match) { + setSelectedActionId(match.id); + setReportActionsTypeTitle(match.title); + } else { + setSelectedActionId(null); + setReportActionsTypeTitle(null); + } + }, [description, pageMode]); const trimmedDescription = description.trim(); @@ -97,10 +211,10 @@ const CreateIncomeAndCost: React.FC = () => { amount !== initialValues.amount || date !== initialValues.date || trimmedDescription !== initialValues.description || - reportActionsType !== initialValues.reportActionsType; + reportActionsTypeTitle !== initialValues.reportActionsType; const canSubmit = - Boolean(amount && date && trimmedDescription !== "" && reportActionsType) && (id ? isChanged : true); + Boolean(amount && date && trimmedDescription !== "") && (id ? isChanged : true); const submitHandler = () => { if (!canSubmit) return; @@ -137,11 +251,12 @@ const CreateIncomeAndCost: React.FC = () => {
+ {/* به Card عدد id رو می‌دیم تا استایل انتخابی نمایش داده بشه */}
diff --git a/vite.config.ts.timestamp-1760862718890-42cf24eefc95d.mjs b/vite.config.ts.timestamp-1760862718890-42cf24eefc95d.mjs new file mode 100644 index 00000000..91b01586 --- /dev/null +++ b/vite.config.ts.timestamp-1760862718890-42cf24eefc95d.mjs @@ -0,0 +1,211 @@ +// vite.config.ts +import { VitePWA } from "file:///D:/Programming/Web/react/Salona-new-version/node_modules/.pnpm/vite-plugin-pwa@0.21.0_@vit_7b4554c40dbd6718eec754f594d7dff5/node_modules/vite-plugin-pwa/dist/index.js"; +import react from "file:///D:/Programming/Web/react/Salona-new-version/node_modules/.pnpm/@vitejs+plugin-react-swc@3._4951458e7c610861b13cb5e14fda6531/node_modules/@vitejs/plugin-react-swc/index.mjs"; +import { defineConfig } from "file:///D:/Programming/Web/react/Salona-new-version/node_modules/.pnpm/vite@5.4.10_@types+node@22._af8e64f0dfb3fff02f0a6040c7895f8b/node_modules/vite/dist/node/index.js"; +import path from "path"; + +// package.json +var package_default = { + name: "app.salona", + private: true, + version: "2.74.6", + type: "module", + scripts: { + dev: "vite --host", + build: "tsc -b && vite build", + lint: "eslint .", + preview: "vite preview", + "generate-pwa-icons": "pwa-assets-generator" + }, + dependencies: { + "@emoji-mart/data": "^1.2.1", + "@emoji-mart/react": "^1.1.1", + "@heroicons/react": "^2.2.0", + "@lottiefiles/dotlottie-react": "^0.13.5", + "@radix-ui/react-accordion": "1.2.1", + "@radix-ui/react-avatar": "1.1.1", + "@radix-ui/react-dialog": "1.1.2", + "@radix-ui/react-label": "2.1.0", + "@radix-ui/react-popover": "^1.1.15", + "@radix-ui/react-select": "2.1.2", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-switch": "1.1.1", + "@radix-ui/react-tabs": "1.1.2", + "@radix-ui/react-tooltip": "1.1.3", + "@tabler/icons-react": "^3.35.0", + "@tailwindcss/vite": "^4.1.14", + "@tanstack/react-query": "5.59.20", + "@zxing/browser": "^0.1.5", + aos: "2.3.4", + axios: "1.7.7", + "class-variance-authority": "0.7.0", + clsx: "2.1.1", + "date-fns": "^4.1.0", + dayjs: "^1.11.18", + "emoji-mart": "^5.6.0", + "emoji-picker-react": "^4.14.0", + firebase: "^11.10.0", + "html-to-image": "^1.11.13", + "input-otp": "1.4.1", + "jalaali-js": "^1.2.8", + "jalali-moment": "3.3.11", + jalaliday: "^3.1.1", + leaflet: "1.9.4", + "lucide-react": "0.456.0", + motion: "^12.23.24", + "qr-scanner": "^1.4.2", + "qrcode.react": "^4.2.0", + react: "18.3.1", + "react-date-object": "2.1.9", + "react-datetime-picker": "^7.0.1", + "react-day-picker": "^9.11.1", + "react-device-detect": "^2.2.3", + "react-dom": "18.3.1", + "react-element-to-jsx-string": "^17.0.1", + "react-error-boundary": "4.1.2", + "react-fast-marquee": "^1.6.5", + "react-h5-audio-player": "^3.10.1", + "react-hook-form": "7.53.2", + "react-hot-toast": "2.4.1", + "react-html-parser": "^2.0.2", + "react-icons": "^5.5.0", + "react-image-crop": "11.0.7", + "react-leaflet": "4.2.1", + "react-multi-date-picker": "4.5.2", + "react-player": "^3.3.3", + "react-qr-reader": "3.0.0-beta-1", + "react-qr-scanner": "1.0.0-alpha.11", + "react-router-dom": "6.28.0", + "react-select": "^5.10.2", + "react-simple-captcha": "^9.3.1", + "react-spinners": "0.14.1", + "react-time-picker": "^8.0.2", + "react-type-animation": "^3.2.0", + "react-video-player": "^1.0.0", + recharts: "^2.15.4", + sweetalert2: "11.14.5", + swiper: "11.2.2", + "tailwind-merge": "2.5.4", + "tailwindcss-animate": "1.0.7", + "use-local-storage": "3.0.0", + vaul: "1.1.1", + "video-react": "^0.16.0", + "workbox-precaching": "^7.3.0", + "workbox-window": "^7.3.0" + }, + devDependencies: { + "@eslint/js": "9.13.0", + "@svgr/webpack": "^8.1.0", + "@types/aos": "3.0.7", + "@types/leaflet": "1.9.14", + "@types/node": "22.9.0", + "@types/react": "18.3.12", + "@types/react-dom": "18.3.1", + "@types/react-html-parser": "^2.0.7", + "@types/swiper": "^6.0.0", + "@vite-pwa/assets-generator": "0.2.6", + "@vitejs/plugin-react-swc": "3.5.0", + autoprefixer: "10.4.20", + eslint: "9.13.0", + "eslint-plugin-react-hooks": "5.0.0", + "eslint-plugin-react-refresh": "0.4.14", + globals: "15.11.0", + postcss: "8.4.47", + tailwindcss: "3.4.14", + typescript: "~5.6.3", + "typescript-eslint": "8.11.0", + vite: "5.4.10", + "vite-plugin-pwa": "0.21.0" + }, + resolutions: { + sharp: "0.32.6", + "sharp-ico": "0.1.5" + } +}; + +// vite.config.ts +var __vite_injected_original_dirname = "D:\\Programming\\Web\\react\\Salona-new-version"; +var vite_config_default = defineConfig({ + plugins: [ + react(), + VitePWA({ + strategies: "injectManifest", + srcDir: "src", + filename: "sw.js", + registerType: "autoUpdate", + injectRegister: "auto", + // injectRegister: false, + manifest: { + name: "Salona", + short_name: "Salona", + theme_color: "rgb(171,37,192)", + background_color: "rgb(171,37,192)", + dir: "rtl", + lang: "fa", + description: "Salona is a platform to provide innovative tools to hairdressers and beauty salons.", + display_override: ["standalone", "fullscreen", "window-controls-overlay", "browser"], + icons: [ + { + src: "pwa-64x64.png", + sizes: "64x64", + type: "image/png" + }, + { + src: "pwa-192x192.png", + sizes: "192x192", + type: "image/png" + }, + { + src: "pwa-512x512.png", + sizes: "512x512", + type: "image/png" + }, + { + src: "maskable-icon-512x512.png", + sizes: "512x512", + type: "image/png", + purpose: "maskable" + } + ] + }, + injectManifest: { + globPatterns: ["**/*.{js,css,html,svg,png,ico}"], + maximumFileSizeToCacheInBytes: 10 * 1024 * 1024 + }, + devOptions: { + enabled: false, + navigateFallback: "index.html", + suppressWarnings: true, + type: "module" + } + }) + ], + resolve: { + alias: { + "@": path.resolve(__vite_injected_original_dirname, "./src"), + "@package.json": path.resolve(__vite_injected_original_dirname, "./package.json"), + "@appointment": path.resolve(__vite_injected_original_dirname, "./src/apps/appointment"), + "@card": path.resolve(__vite_injected_original_dirname, "./src/apps/card"), + "@new-ui": path.resolve(__vite_injected_original_dirname, "./src/apps/new-ui") + } + }, + // مهم: server settings برای dev/tunnel + server: { + host: true, + // bind به 0.0.0.0 (مهم برای تونل) + port: 5173 + // مطمئن شو با پورتی که تونل بهش متصل میشه یکیه + }, + build: { + rollupOptions: { + external: ["workbox-window"] + } + }, + define: { + "import.meta.env.VITE_APP_VERSION": JSON.stringify(package_default.version) + } +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "package.json"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\Programming\\\\Web\\\\react\\\\Salona-new-version\";const __vite_injected_original_filename = \"D:\\\\Programming\\\\Web\\\\react\\\\Salona-new-version\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/Programming/Web/react/Salona-new-version/vite.config.ts\";import { VitePWA } from \"vite-plugin-pwa\";\r\nimport react from \"@vitejs/plugin-react-swc\";\r\nimport { defineConfig } from \"vite\";\r\nimport path from \"path\";\r\nimport pkg from \"./package.json\" assert { type: \"json\" };\r\n\r\n// https://vitejs.dev/config/\r\nexport default defineConfig({\r\n    plugins: [\r\n        react(),\r\n        VitePWA({\r\n            strategies: \"injectManifest\",\r\n            srcDir: \"src\",\r\n            filename: \"sw.js\",\r\n            registerType: \"autoUpdate\",\r\n            injectRegister: \"auto\",\r\n            // injectRegister: false,\r\n            manifest: {\r\n                name: \"Salona\",\r\n                short_name: \"Salona\",\r\n                theme_color: \"rgb(171,37,192)\",\r\n                background_color: \"rgb(171,37,192)\",\r\n                dir: \"rtl\",\r\n                lang: \"fa\",\r\n                description: \"Salona is a platform to provide innovative tools to hairdressers and beauty salons.\",\r\n                display_override: [\"standalone\", \"fullscreen\", \"window-controls-overlay\", \"browser\"],\r\n                icons: [\r\n                    {\r\n                        src: \"pwa-64x64.png\",\r\n                        sizes: \"64x64\",\r\n                        type: \"image/png\",\r\n                    },\r\n                    {\r\n                        src: \"pwa-192x192.png\",\r\n                        sizes: \"192x192\",\r\n                        type: \"image/png\",\r\n                    },\r\n                    {\r\n                        src: \"pwa-512x512.png\",\r\n                        sizes: \"512x512\",\r\n                        type: \"image/png\",\r\n                    },\r\n                    {\r\n                        src: \"maskable-icon-512x512.png\",\r\n                        sizes: \"512x512\",\r\n                        type: \"image/png\",\r\n                        purpose: \"maskable\",\r\n                    },\r\n                ],\r\n            },\r\n\r\n            injectManifest: {\r\n                globPatterns: [\"**/*.{js,css,html,svg,png,ico}\"],\r\n                maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,\r\n            },\r\n\r\n            devOptions: {\r\n                enabled: false,\r\n                navigateFallback: \"index.html\",\r\n                suppressWarnings: true,\r\n                type: \"module\",\r\n            },\r\n        }),\r\n    ],\r\n    resolve: {\r\n        alias: {\r\n            \"@\": path.resolve(__dirname, \"./src\"),\r\n            \"@package.json\": path.resolve(__dirname, \"./package.json\"),\r\n            \"@appointment\": path.resolve(__dirname, \"./src/apps/appointment\"),\r\n            \"@card\": path.resolve(__dirname, \"./src/apps/card\"),\r\n            \"@new-ui\": path.resolve(__dirname, \"./src/apps/new-ui\"),\r\n        },\r\n    },\r\n    // \u0645\u0647\u0645: server settings \u0628\u0631\u0627\u06CC dev/tunnel\r\n    server: {\r\n        host: true, // bind \u0628\u0647 0.0.0.0 (\u0645\u0647\u0645 \u0628\u0631\u0627\u06CC \u062A\u0648\u0646\u0644)\r\n        port: 5173, // \u0645\u0637\u0645\u0626\u0646 \u0634\u0648 \u0628\u0627 \u067E\u0648\u0631\u062A\u06CC \u06A9\u0647 \u062A\u0648\u0646\u0644 \u0628\u0647\u0634 \u0645\u062A\u0635\u0644 \u0645\u06CC\u0634\u0647 \u06CC\u06A9\u06CC\u0647\r\n    },\r\n    build: {\r\n        rollupOptions: {\r\n            external: [\"workbox-window\"],\r\n        },\r\n    },\r\n    define: {\r\n        \"import.meta.env.VITE_APP_VERSION\": JSON.stringify(pkg.version),\r\n    },\r\n});\r\n", "{\r\n  \"name\": \"app.salona\",\r\n  \"private\": true,\r\n  \"version\": \"2.74.6\",\r\n  \"type\": \"module\",\r\n  \"scripts\": {\r\n    \"dev\": \"vite --host\",\r\n    \"build\": \"tsc -b && vite build\",\r\n    \"lint\": \"eslint .\",\r\n    \"preview\": \"vite preview\",\r\n    \"generate-pwa-icons\": \"pwa-assets-generator\"\r\n  },\r\n  \"dependencies\": {\r\n    \"@emoji-mart/data\": \"^1.2.1\",\r\n    \"@emoji-mart/react\": \"^1.1.1\",\r\n    \"@heroicons/react\": \"^2.2.0\",\r\n    \"@lottiefiles/dotlottie-react\": \"^0.13.5\",\r\n    \"@radix-ui/react-accordion\": \"1.2.1\",\r\n    \"@radix-ui/react-avatar\": \"1.1.1\",\r\n    \"@radix-ui/react-dialog\": \"1.1.2\",\r\n    \"@radix-ui/react-label\": \"2.1.0\",\r\n    \"@radix-ui/react-popover\": \"^1.1.15\",\r\n    \"@radix-ui/react-select\": \"2.1.2\",\r\n    \"@radix-ui/react-slot\": \"1.1.0\",\r\n    \"@radix-ui/react-switch\": \"1.1.1\",\r\n    \"@radix-ui/react-tabs\": \"1.1.2\",\r\n    \"@radix-ui/react-tooltip\": \"1.1.3\",\r\n    \"@tabler/icons-react\": \"^3.35.0\",\r\n    \"@tailwindcss/vite\": \"^4.1.14\",\r\n    \"@tanstack/react-query\": \"5.59.20\",\r\n    \"@zxing/browser\": \"^0.1.5\",\r\n    \"aos\": \"2.3.4\",\r\n    \"axios\": \"1.7.7\",\r\n    \"class-variance-authority\": \"0.7.0\",\r\n    \"clsx\": \"2.1.1\",\r\n    \"date-fns\": \"^4.1.0\",\r\n    \"dayjs\": \"^1.11.18\",\r\n    \"emoji-mart\": \"^5.6.0\",\r\n    \"emoji-picker-react\": \"^4.14.0\",\r\n    \"firebase\": \"^11.10.0\",\r\n    \"html-to-image\": \"^1.11.13\",\r\n    \"input-otp\": \"1.4.1\",\r\n    \"jalaali-js\": \"^1.2.8\",\r\n    \"jalali-moment\": \"3.3.11\",\r\n    \"jalaliday\": \"^3.1.1\",\r\n    \"leaflet\": \"1.9.4\",\r\n    \"lucide-react\": \"0.456.0\",\r\n    \"motion\": \"^12.23.24\",\r\n    \"qr-scanner\": \"^1.4.2\",\r\n    \"qrcode.react\": \"^4.2.0\",\r\n    \"react\": \"18.3.1\",\r\n    \"react-date-object\": \"2.1.9\",\r\n    \"react-datetime-picker\": \"^7.0.1\",\r\n    \"react-day-picker\": \"^9.11.1\",\r\n    \"react-device-detect\": \"^2.2.3\",\r\n    \"react-dom\": \"18.3.1\",\r\n    \"react-element-to-jsx-string\": \"^17.0.1\",\r\n    \"react-error-boundary\": \"4.1.2\",\r\n    \"react-fast-marquee\": \"^1.6.5\",\r\n    \"react-h5-audio-player\": \"^3.10.1\",\r\n    \"react-hook-form\": \"7.53.2\",\r\n    \"react-hot-toast\": \"2.4.1\",\r\n    \"react-html-parser\": \"^2.0.2\",\r\n    \"react-icons\": \"^5.5.0\",\r\n    \"react-image-crop\": \"11.0.7\",\r\n    \"react-leaflet\": \"4.2.1\",\r\n    \"react-multi-date-picker\": \"4.5.2\",\r\n    \"react-player\": \"^3.3.3\",\r\n    \"react-qr-reader\": \"3.0.0-beta-1\",\r\n    \"react-qr-scanner\": \"1.0.0-alpha.11\",\r\n    \"react-router-dom\": \"6.28.0\",\r\n    \"react-select\": \"^5.10.2\",\r\n    \"react-simple-captcha\": \"^9.3.1\",\r\n    \"react-spinners\": \"0.14.1\",\r\n    \"react-time-picker\": \"^8.0.2\",\r\n    \"react-type-animation\": \"^3.2.0\",\r\n    \"react-video-player\": \"^1.0.0\",\r\n    \"recharts\": \"^2.15.4\",\r\n    \"sweetalert2\": \"11.14.5\",\r\n    \"swiper\": \"11.2.2\",\r\n    \"tailwind-merge\": \"2.5.4\",\r\n    \"tailwindcss-animate\": \"1.0.7\",\r\n    \"use-local-storage\": \"3.0.0\",\r\n    \"vaul\": \"1.1.1\",\r\n    \"video-react\": \"^0.16.0\",\r\n    \"workbox-precaching\": \"^7.3.0\",\r\n    \"workbox-window\": \"^7.3.0\"\r\n  },\r\n  \"devDependencies\": {\r\n    \"@eslint/js\": \"9.13.0\",\r\n    \"@svgr/webpack\": \"^8.1.0\",\r\n    \"@types/aos\": \"3.0.7\",\r\n    \"@types/leaflet\": \"1.9.14\",\r\n    \"@types/node\": \"22.9.0\",\r\n    \"@types/react\": \"18.3.12\",\r\n    \"@types/react-dom\": \"18.3.1\",\r\n    \"@types/react-html-parser\": \"^2.0.7\",\r\n    \"@types/swiper\": \"^6.0.0\",\r\n    \"@vite-pwa/assets-generator\": \"0.2.6\",\r\n    \"@vitejs/plugin-react-swc\": \"3.5.0\",\r\n    \"autoprefixer\": \"10.4.20\",\r\n    \"eslint\": \"9.13.0\",\r\n    \"eslint-plugin-react-hooks\": \"5.0.0\",\r\n    \"eslint-plugin-react-refresh\": \"0.4.14\",\r\n    \"globals\": \"15.11.0\",\r\n    \"postcss\": \"8.4.47\",\r\n    \"tailwindcss\": \"3.4.14\",\r\n    \"typescript\": \"~5.6.3\",\r\n    \"typescript-eslint\": \"8.11.0\",\r\n    \"vite\": \"5.4.10\",\r\n    \"vite-plugin-pwa\": \"0.21.0\"\r\n  },\r\n  \"resolutions\": {\r\n    \"sharp\": \"0.32.6\",\r\n    \"sharp-ico\": \"0.1.5\"\r\n  }\r\n}\r\n"],
  "mappings": "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",
  "names": []
}
