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

Merge branch 'release/v1.31.4'

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2024-02-12 16:52:17 +03:30
parent f00afcc233 e463a14bfd
commit daa8432f6f
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example.env.local
View File

@@ -1,5 +1,5 @@
NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard"
NEXT_PUBLIC_API_VERSION = "1.31.2"
NEXT_PUBLIC_API_VERSION = "1.31.4"
NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"

4
src/components/dashboard/bank-management/index.jsx
View File

@@ -159,8 +159,8 @@ function DashboardBankManagementComponent() {
),
},
{
accessorFn: (row) => row.bank_state,
id: "bank_state",
accessorFn: (row) => row.bank_state_name,
id: "bank_state_name",
header: t("BankManagement.bank_state"),
enableColumnFilter: true,
datatype: "text",

2
src/components/dashboard/machinary-office/Form/ReserveForm/index.jsx
View File

@@ -17,7 +17,7 @@ import {RESERVE_MACHINARY_LOAN} from "@/core/data/apiRoutes";
const ReserveForm = ({rowId, mutate}) => {
const t = useTranslations();
const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
const requestServer = useRequest({auth: true, notification: false});
const requestServer = useRequest({auth: true, notification: true});
const [isSubmitting, setIsSubmitting] = useState(false);
const {update_notification} = useNotification()

8
src/components/dashboard/reserve-loan/Form/CanselReserve/index.jsx
View File

@@ -12,16 +12,18 @@ import {useState} from "react";
import KeyboardReturnSharpIcon from '@mui/icons-material/KeyboardReturnSharp';
import useRequest from "@/lib/app/hooks/useRequest";
import {CANSEL_RESERVE_MACHINARY_LOAN} from "@/core/data/apiRoutes";
import useNotification from "@/lib/app/hooks/useNotification";
const CanselReserve = ({rowId, mutate}) => {
const t = useTranslations();
const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
const requestServer = useRequest({auth: true, notification: false});
const [isSubmitting, setIsSubmitting] = useState(false)
const requestServer = useRequest({auth: true, notification: true});
const [isSubmitting, setIsSubmitting] = useState(false);
const {update_notification} = useNotification()
const handleSubmit = () => {
setIsSubmitting(true)
requestServer(`${CANSEL_RESERVE_MACHINARY_LOAN}/${rowId}`, 'get').then((response) => {
requestServer(`${CANSEL_RESERVE_MACHINARY_LOAN}/${rowId}`, 'post').then((response) => {
setOpenConfirmDialog(false)
mutate()
update_notification()

8
src/components/dashboard/reserve-loan/TableRowActions.jsx
View File

@@ -4,10 +4,10 @@ import CanselReserve from "./Form/CanselReserve";
const TableRow = ({row, mutate}) => {
return (
<Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
{/*<CanselReserve*/}
{/* rowId={row.getValue("id")}*/}
{/* mutate={mutate}*/}
{/*/>*/}
<CanselReserve
rowId={row.getValue("id")}
mutate={mutate}
/>
</Box>
);
};

4
src/core/data/apiRoutes.js
View File

@@ -76,12 +76,12 @@ export const EXPORT_MACHINARY_OFFICE =
export const GET_RESERVE_MACHINARY_LOAN =
BASE_URL + "/dashboard/machinery_expert/reserved/show";
BASE_URL + "/dashboard/reserved_loan/show";
export const RESERVE_MACHINARY_LOAN =
BASE_URL + "/dashboard/machinery_expert/reserve";
export const CANSEL_RESERVE_MACHINARY_LOAN =
BASE_URL + "/dashboard/machinery_expert/unreserved";
BASE_URL + "/dashboard/reserved_loan/unreserve";
//machinary office
//commercial chief