diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 5088829..d94082a 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -191,6 +191,8 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -206,6 +208,7 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -282,6 +285,8 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -537,6 +542,17 @@ "update_again": "بروزرسانی مجدد" }, "LoanHistory": { + "id": "کد یکتا", + "name": "نام", + "national_id": "کد ملی", + "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", + "created_at": "تاریخ درخواست", + "updated_at": "تاریخ بروزرسانی", + "navgan_id": "کد ناوگان", + "vehicle_type": "نوع ماشین", + "state_name": "وضعیت درخواست", "history": "تاریخچه", "Table_history_error": "خطا در دریافت اطلاعات", "history_report": "فایل ضمیمه", @@ -547,4 +563,4 @@ "Table_head_file": "فایل پیوست", "empty_history_detail": "سابقه ای برای این وام وجود ندارد" } -} +} \ No newline at end of file diff --git a/src/components/dashboard/loan-history/index.jsx b/src/components/dashboard/loan-history/index.jsx index c2bb293..66f28de 100644 --- a/src/components/dashboard/loan-history/index.jsx +++ b/src/components/dashboard/loan-history/index.jsx @@ -14,7 +14,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.id, id: "id", - header: t("PassengerOffice.id"), + header: t("LoanHistory.id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -33,7 +33,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.name, id: "name", - header: t("MachinaryOffice.name"), + header: t("LoanHistory.name"), enableColumnFilter: true, datatype: "text", filterFn: "contains", @@ -45,7 +45,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.national_id, id: "national_id", - header: t("MachinaryOffice.national_id"), + header: t("LoanHistory.national_id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -64,7 +64,45 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.phone_number, id: "phone_number", - header: t("MachinaryOffice.phone_number"), + header: t("LoanHistory.phone_number"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("LoanHistory.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("LoanHistory.approved_amount"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -84,7 +122,7 @@ function DashboardLoanHistoryComponent() { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), id: "created_at", - header: t("MachinaryOffice.created_at"), + header: t("LoanHistory.created_at"), enableColumnFilter: true, datatype: "date", filterFn: "lessThan", @@ -103,7 +141,7 @@ function DashboardLoanHistoryComponent() { accessorFn: (row) => moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), id: "updated_at", - header: t("MachinaryOffice.updated_at"), + header: t("LoanHistory.updated_at"), enableColumnFilter: false, datatype: "numeric", Cell: ({renderedCellValue}) => ( @@ -113,7 +151,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.navgan_id, id: "navgan_id", - header: t("MachinaryOffice.navgan_id"), + header: t("LoanHistory.navgan_id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -132,7 +170,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.vehicle_type, id: "vehicle_type", - header: t("MachinaryOffice.vehicle_type"), + header: t("LoanHistory.vehicle_type"), enableColumnFilter: true, datatype: "text", filterFn: "contains", @@ -144,7 +182,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.state_name, id: "state_id", - header: t("MachinaryOffice.state_name"), + header: t("LoanHistory.state_name"), enableColumnFilter: false, datatype: "numeric", Cell: ({renderedCellValue}) => ( diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx index 0397fc5..4e2a9ed 100644 --- a/src/components/dashboard/navgan-province-manager/index.jsx +++ b/src/components/dashboard/navgan-province-manager/index.jsx @@ -82,6 +82,44 @@ function DashboardNavganProvinceManagerComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("NavganProvinceManager.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("NavganProvinceManager.approved_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 1a13b3b..13674dc 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -82,6 +82,25 @@ function DashboardPassengerOfficeComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("PassengerBoss.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index a1cdae0..b0acd92 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -82,6 +82,44 @@ function DashboardTransportationAssistanceComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("TransportationAssistance.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("TransportationAssistance.approved_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"),