loan/expert-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'feature/Amin_sakht_tanafos_period'

Browse Source 
# Conflicts:
#   src/components/dashboard/loan-history/index.jsx
This commit is contained in:
AmirHossein Mahmoodi
2023-12-25 09:56:58 +00:00
parent 65a1ed2716 f8da988e17
commit aafebe8ec8
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/dashboard/loan-history/index.jsx
View File

@@ -137,17 +137,6 @@ function DashboardLoanHistoryComponent() {
);
},
},
{
accessorFn: (row) =>
moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
id: "updated_at",
header: t("LoanHistory.updated_at"),
enableColumnFilter: false,
datatype: "numeric",
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.navgan_id,
id: "navgan_id",
@@ -195,6 +184,18 @@ function DashboardLoanHistoryComponent() {
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.province_name,
id: "province_name",
header: t("LoanHistory.province_name"),
enableColumnFilter: true,
datatype: "text",
filterFn: "contains",
columnFilterModeOptions: ["contains", "equals", "notEquals"],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.vehicle_type,
id: "vehicle_type",