diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 824f252..5283808 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -300,6 +300,8 @@
"birthday": "تاریخ تولد",
"approved_amount": "مبلغ مصوب",
"branch_name": "نام شعبه",
+ "first_name": "نام",
+ "last_name": "نام خانوادگی",
"bank_state": "وضعیت پیگیری بانک",
"button-reserve-confirm": "رزرو",
"reserve-loan-title": "رزرو وام",
@@ -429,6 +431,8 @@
},
"NavganLoanManagement": {
"name": "نام",
+ "first_name": "نام",
+ "last_name": "نام خانوادگی",
"id": "کد یکتا",
"excel_report": "گزارش اکسل",
"city_name": "شهرستان",
@@ -543,6 +547,8 @@
"hoghoghi": "حقوقی",
"haghighi": "حقیقی",
"city_name": "شهرستان",
+ "first_name": "نام",
+ "last_name": "نام خانوادگی",
"plate_number": "پلاک",
"id": "کد یکتا",
"existing_employment": "اشتغال موجود",
@@ -597,6 +603,8 @@
"BankManagement": {
"name": "نام",
"id": "کد یکتا",
+ "first_name": "نام",
+ "last_name": "نام خانوادگی",
"national_serial_number": "سریال پشت کارت ملی",
"birthday": "تاریخ تولد",
"approved_amount": "مبلغ مصوب",
diff --git a/src/components/dashboard/navgan/bank-management/index.jsx b/src/components/dashboard/navgan/bank-management/index.jsx
index 388fb55..3f6a54a 100644
--- a/src/components/dashboard/navgan/bank-management/index.jsx
+++ b/src/components/dashboard/navgan/bank-management/index.jsx
@@ -32,9 +32,19 @@ function DashboardBankManagementComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("BankManagement.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("BankManagement.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("BankManagement.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/loan-followup/index.jsx b/src/components/dashboard/navgan/loan-followup/index.jsx
index a2533b2..92ccd9e 100644
--- a/src/components/dashboard/navgan/loan-followup/index.jsx
+++ b/src/components/dashboard/navgan/loan-followup/index.jsx
@@ -33,9 +33,19 @@ function DashboardLoanFollowUpComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("LoanFollowUp.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("LoanFollowUp.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("LoanFollowUp.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/navgan-loan-management/index.jsx b/src/components/dashboard/navgan/navgan-loan-management/index.jsx
index d171673..b0b244d 100644
--- a/src/components/dashboard/navgan/navgan-loan-management/index.jsx
+++ b/src/components/dashboard/navgan/navgan-loan-management/index.jsx
@@ -50,9 +50,19 @@ function DashboardNavganLoanManagementComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("NavganLoanManagement.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("NavganLoanManagement.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("NavganLoanManagement.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/navgan-province-manager/index.jsx b/src/components/dashboard/navgan/navgan-province-manager/index.jsx
index bc04113..2de65d3 100644
--- a/src/components/dashboard/navgan/navgan-province-manager/index.jsx
+++ b/src/components/dashboard/navgan/navgan-province-manager/index.jsx
@@ -50,9 +50,19 @@ function DashboardNavganProvinceManagerComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("NavganProvinceManager.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("NavganProvinceManager.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("NavganProvinceManager.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/passenger-boss/index.jsx b/src/components/dashboard/navgan/passenger-boss/index.jsx
index fb1becb..fa3cc5e 100644
--- a/src/components/dashboard/navgan/passenger-boss/index.jsx
+++ b/src/components/dashboard/navgan/passenger-boss/index.jsx
@@ -48,9 +48,19 @@ function DashboardPassengerOfficeComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("PassengerBoss.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("PassengerBoss.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("PassengerBoss.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/reserve-loan/index.jsx b/src/components/dashboard/navgan/reserve-loan/index.jsx
index d2380e0..43986f6 100644
--- a/src/components/dashboard/navgan/reserve-loan/index.jsx
+++ b/src/components/dashboard/navgan/reserve-loan/index.jsx
@@ -47,9 +47,19 @@ function DashboardReserveLoan() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("ReserveLoan.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("ReserveLoan.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("ReserveLoan.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
diff --git a/src/components/dashboard/navgan/transportation-assistance/index.jsx b/src/components/dashboard/navgan/transportation-assistance/index.jsx
index bf6168e..327d52a 100644
--- a/src/components/dashboard/navgan/transportation-assistance/index.jsx
+++ b/src/components/dashboard/navgan/transportation-assistance/index.jsx
@@ -49,16 +49,25 @@ function DashboardTransportationAssistanceComponent() {
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
{
- accessorFn: (row) => row.name,
- id: "name",
- header: t("TransportationAssistance.name"),
+ accessorFn: (row) => row.first_name,
+ id: "first_name",
+ header: t("TransportationAssistance.first_name"),
+ enableColumnFilter: true,
+ datatype: "text",
+ filterFn: "contains",
+ columnFilterModeOptions: ["contains", "equals", "notEquals"],
+ Cell: ({ renderedCellValue }) => {renderedCellValue},
+ },
+ {
+ accessorFn: (row) => row.last_name,
+ id: "last_name",
+ header: t("TransportationAssistance.last_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
columnFilterModeOptions: ["contains", "equals", "notEquals"],
Cell: ({ renderedCellValue }) => {renderedCellValue},
},
-
{
accessorFn: (row) => row.national_id,
id: "national_id",
diff --git a/src/core/data/sidebarMenu.jsx b/src/core/data/sidebarMenu.jsx
index fdb9ab2..e23e256 100644
--- a/src/core/data/sidebarMenu.jsx
+++ b/src/core/data/sidebarMenu.jsx
@@ -168,7 +168,7 @@ const sidebarMenu = [
route: "/dashboard/refahi/refahi-province-manager",
icon: ,
selected: false,
- permissions: ["manage_province_affairs_navgan"],
+ permissions: ["manage_province_affairs_refahi"],
},
// {
// key: "sidebar.build-province-manager",
diff --git a/src/pages/dashboard/refahi/refahi-province-manager/index.jsx b/src/pages/dashboard/refahi/refahi-province-manager/index.jsx
index 0942b3d..0b71a64 100644
--- a/src/pages/dashboard/refahi/refahi-province-manager/index.jsx
+++ b/src/pages/dashboard/refahi/refahi-province-manager/index.jsx
@@ -13,7 +13,7 @@ export async function getServerSideProps({ req, locale }) {
title: "Dashboard.province_manager_page",
isBot,
locale,
- layout: { name: "DashboardLayout", props: { permissions: ["manage_province_affairs_navgan"] } }, //پرمیشن باید عوض بشه
+ layout: { name: "DashboardLayout", props: { permissions: ["manage_province_affairs_refahi"] } },
},
};
}