Merge branch 'bugfix/edit_button_TF-93' into 'develop'
TF-93 All "Niyaz Be Viraish" button styles and text need to be edited in the Expert panel See merge request witel3/loan-facilities-expert!76
This commit is contained in:
19
package-lock.json
generated
19
package-lock.json
generated
@@ -43,7 +43,8 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@faker-js/faker": "^7.6.0",
|
"@faker-js/faker": "^7.6.0",
|
||||||
"eslint-config-next": "^13.3.0"
|
"eslint-config-next": "^13.3.0",
|
||||||
|
"run-script-os": "^1.1.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
@@ -4789,6 +4790,16 @@
|
|||||||
"queue-microtask": "^1.2.2"
|
"queue-microtask": "^1.2.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/run-script-os": {
|
||||||
|
"version": "1.1.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
|
||||||
|
"integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
|
||||||
|
"dev": true,
|
||||||
|
"bin": {
|
||||||
|
"run-os": "index.js",
|
||||||
|
"run-script-os": "index.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/rxjs": {
|
"node_modules/rxjs": {
|
||||||
"version": "7.8.1",
|
"version": "7.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
||||||
@@ -8841,6 +8852,12 @@
|
|||||||
"queue-microtask": "^1.2.2"
|
"queue-microtask": "^1.2.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"run-script-os": {
|
||||||
|
"version": "1.1.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
|
||||||
|
"integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"rxjs": {
|
"rxjs": {
|
||||||
"version": "7.8.1",
|
"version": "7.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
||||||
|
|||||||
@@ -270,11 +270,11 @@
|
|||||||
"proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد"
|
"proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد"
|
||||||
},
|
},
|
||||||
"ReviseDialog": {
|
"ReviseDialog": {
|
||||||
"revise": "ویرایش",
|
"revise": " نیاز به ویرایش",
|
||||||
"description_error": "وارد کردن توضیحات الزامی است!",
|
"description_error": "وارد کردن توضیحات الزامی است!",
|
||||||
"optional": " (اختیاری)",
|
"optional": " (اختیاری)",
|
||||||
"button-cancel": "بستن",
|
"button-cancel": "بستن",
|
||||||
"button-revise": "ویرایش",
|
"button-revise": "ارسال",
|
||||||
"description": "توضیحات خود را وارد نمائید"
|
"description": "توضیحات خود را وارد نمائید"
|
||||||
},
|
},
|
||||||
"RejectDialog": {
|
"RejectDialog": {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import {useFormik} from "formik";
|
|||||||
import * as Yup from "yup";
|
import * as Yup from "yup";
|
||||||
import {useState} from "react";
|
import {useState} from "react";
|
||||||
import useRequest from "@/lib/app/hooks/useRequest";
|
import useRequest from "@/lib/app/hooks/useRequest";
|
||||||
import EditIcon from "@mui/icons-material/Edit";
|
import ReplyIcon from '@mui/icons-material/Reply';
|
||||||
import useNotification from "@/lib/app/hooks/useNotification";
|
import useNotification from "@/lib/app/hooks/useNotification";
|
||||||
|
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => {
|
|||||||
<>
|
<>
|
||||||
<Tooltip title={t("ReviseDialog.revise")}>
|
<Tooltip title={t("ReviseDialog.revise")}>
|
||||||
<IconButton color="primary" onClick={() => setOpenRejectDialog(true)}>
|
<IconButton color="primary" onClick={() => setOpenRejectDialog(true)}>
|
||||||
<EditIcon/>
|
<ReplyIcon/>
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Dialog fullWidth open={openRejectDialog}
|
<Dialog fullWidth open={openRejectDialog}
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ import {
|
|||||||
TextField,
|
TextField,
|
||||||
Tooltip,
|
Tooltip,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import EditIcon from '@mui/icons-material/Edit';
|
|
||||||
import {useFormik} from "formik";
|
import {useFormik} from "formik";
|
||||||
|
import ReplyIcon from '@mui/icons-material/Reply';
|
||||||
import {REVISE_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes";
|
import {REVISE_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes";
|
||||||
import useRequest from "@/lib/app/hooks/useRequest";
|
import useRequest from "@/lib/app/hooks/useRequest";
|
||||||
import * as Yup from "yup";
|
import * as Yup from "yup";
|
||||||
@@ -63,7 +63,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => {
|
|||||||
setOpenConfirmDialog(true)
|
setOpenConfirmDialog(true)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<EditIcon/>
|
<ReplyIcon/>
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Dialog fullWidth open={openConfirmDialog}
|
<Dialog fullWidth open={openConfirmDialog}
|
||||||
|
|||||||
Reference in New Issue
Block a user