From 6bfaf6f73b693691b04effbc84cacc2c30f8cd2d Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 10:43:43 +0330 Subject: [PATCH] confirm transportation assistance show tanafos and sakht period --- public/locales/fa/app.json | 1 + .../Form/ConfirmForm/ConfirmContent.jsx | 51 ++++++++----------- .../transportation-assistance/index.jsx | 5 ++ 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 60a17b5..1da70b3 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -369,6 +369,7 @@ "tanafos_amount_number": "دوره تنفس باید عدد باشد", "toman": "میلیون تومان", "tanafos_amount_month": "ماه", + "approved_amount_title": "مبلغ تصویب شده کارگروه", "sakht_amount_day": "روز", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "proposed_amount": "مبلغ پیشنهادی", diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 9480f7a..654f0ed 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -2,7 +2,6 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import { - Box, Button, DialogActions, DialogContent, @@ -20,6 +19,7 @@ import {useEffect, useState} from "react"; import * as Yup from "yup"; import CustomAccordion from "@/core/components/CustomAccordion"; import ImageContent from "@/core/components/ImageContent"; +import NumberShowBox from "@/core/components/NumberShowBox"; const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeClick}) => { const t = useTranslations(); @@ -142,34 +142,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl } return null; }; - const numberShowBox = () => { - return ( - <> - - {t("ConfirmDialog.proposed_amount")} - - {isNaN((detailsList?.data?.proposed_amount) / 10) - ? "" - : ((detailsList?.data?.proposed_amount) / 10).toLocaleString()}{" "} - {t("ConfirmDialog.unit")} - - - - {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")} - - {isNaN((detailsList?.data?.approved_amount) / 10) - ? "" - : ((detailsList?.data?.approved_amount) / 10).toLocaleString()}{" "} - {t("ConfirmDialog.unit")} - - - - ); - }; return ( <> @@ -177,7 +149,26 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {loading ? : <> - {numberShowBox()} + + + + {renderCustomAccordions()} } diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index 2ff3796..41fb7ad 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -194,9 +194,14 @@ function DashboardTransportationAssistanceComponent() { ], [] ); + const data = [{ + id: 1, + vehicle_type: "مینی بوس" + }] return (