Merge branch 'bugfix/refahi_user' into 'develop'
can request See merge request witel-front-end/loan-facilities/user-v2!24
This commit is contained in:
@@ -9,7 +9,7 @@ import { useFormik } from "formik";
|
|||||||
import PickerWithDynamicField from "@/core/components/EditedDatePicker";
|
import PickerWithDynamicField from "@/core/components/EditedDatePicker";
|
||||||
import UploadImage from "./UploadImage";
|
import UploadImage from "./UploadImage";
|
||||||
|
|
||||||
const BuildRequestDetail = ({ state, handleBack, handleSubmit, submitting, editDisabled }) => {
|
const BuildRequestDetail = ({ state, handleBack, handleSubmit, submitting, canRequest }) => {
|
||||||
const t = useTranslations();
|
const t = useTranslations();
|
||||||
|
|
||||||
const initialValues = {
|
const initialValues = {
|
||||||
@@ -386,7 +386,7 @@ const BuildRequestDetail = ({ state, handleBack, handleSubmit, submitting, editD
|
|||||||
>
|
>
|
||||||
{t("RefahiLoanRequest.back-button")}
|
{t("RefahiLoanRequest.back-button")}
|
||||||
</Button>
|
</Button>
|
||||||
{editDisabled === 17 && (
|
{canRequest && (
|
||||||
<Button
|
<Button
|
||||||
onClick={formik.handleSubmit}
|
onClick={formik.handleSubmit}
|
||||||
endIcon={<BeenhereIcon />}
|
endIcon={<BeenhereIcon />}
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ const BuildForm = ({ setFinishRefahiLoanRequest }) => {
|
|||||||
dispatch={dispatch}
|
dispatch={dispatch}
|
||||||
handleSubmit={handleSubmit}
|
handleSubmit={handleSubmit}
|
||||||
setFinishRefahiLoanRequest={setFinishRefahiLoanRequest}
|
setFinishRefahiLoanRequest={setFinishRefahiLoanRequest}
|
||||||
|
canRequest={true}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { useFormik } from "formik";
|
|||||||
import PickerWithDynamicField from "@/core/components/EditedDatePicker";
|
import PickerWithDynamicField from "@/core/components/EditedDatePicker";
|
||||||
import UploadImage from "@/components/dashboard/refahi/add-request-loan/forms/BuildForm/UploadImage";
|
import UploadImage from "@/components/dashboard/refahi/add-request-loan/forms/BuildForm/UploadImage";
|
||||||
|
|
||||||
const RestoreRequestDetail = ({ state, handleBack, handleSubmit, submitting, editDisabled }) => {
|
const RestoreRequestDetail = ({ state, handleBack, handleSubmit, submitting, canRequest }) => {
|
||||||
const t = useTranslations();
|
const t = useTranslations();
|
||||||
|
|
||||||
const initialValues = {
|
const initialValues = {
|
||||||
@@ -332,7 +332,7 @@ const RestoreRequestDetail = ({ state, handleBack, handleSubmit, submitting, edi
|
|||||||
>
|
>
|
||||||
{t("RefahiLoanRequest.back-button")}
|
{t("RefahiLoanRequest.back-button")}
|
||||||
</Button>
|
</Button>
|
||||||
{editDisabled === 17 && (
|
{canRequest && (
|
||||||
<Button
|
<Button
|
||||||
onClick={formik.handleSubmit}
|
onClick={formik.handleSubmit}
|
||||||
endIcon={<BeenhereIcon />}
|
endIcon={<BeenhereIcon />}
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ const RestoreForm = ({ setFinishRefahiLoanRequest }) => {
|
|||||||
dispatch={dispatch}
|
dispatch={dispatch}
|
||||||
submitting={submitting}
|
submitting={submitting}
|
||||||
state={state}
|
state={state}
|
||||||
|
canRequest={true}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const reducer = (state, action) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const ShowLoanForm = ({ defaultData, refahi_type, queryID, editDisabled }) => {
|
const ShowLoanForm = ({ defaultData, refahi_type, queryID, canRequest }) => {
|
||||||
const [submitting, setSubmitting] = useState(false);
|
const [submitting, setSubmitting] = useState(false);
|
||||||
const requestServer = useRequest();
|
const requestServer = useRequest();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -105,7 +105,7 @@ const ShowLoanForm = ({ defaultData, refahi_type, queryID, editDisabled }) => {
|
|||||||
<>
|
<>
|
||||||
{refahi_type === 1 ? (
|
{refahi_type === 1 ? (
|
||||||
<BuildFormController
|
<BuildFormController
|
||||||
editDisabled={editDisabled}
|
canRequest={canRequest}
|
||||||
submitting={submitting}
|
submitting={submitting}
|
||||||
state={state}
|
state={state}
|
||||||
dispatch={dispatch}
|
dispatch={dispatch}
|
||||||
@@ -113,7 +113,7 @@ const ShowLoanForm = ({ defaultData, refahi_type, queryID, editDisabled }) => {
|
|||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<RestoreFormController
|
<RestoreFormController
|
||||||
editDisabled={editDisabled}
|
canRequest={canRequest}
|
||||||
submitting={submitting}
|
submitting={submitting}
|
||||||
state={state}
|
state={state}
|
||||||
dispatch={dispatch}
|
dispatch={dispatch}
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ const ShowLoan = () => {
|
|||||||
</CenterLayout>
|
</CenterLayout>
|
||||||
) : (
|
) : (
|
||||||
<ShowLoanForm
|
<ShowLoanForm
|
||||||
editDisabled={LoanDetails.state_id}
|
canRequest={LoanDetails.state_id === 17}
|
||||||
queryID={query.id}
|
queryID={query.id}
|
||||||
refahi_type={LoanDetails.refahi_type}
|
refahi_type={LoanDetails.refahi_type}
|
||||||
defaultData={_data}
|
defaultData={_data}
|
||||||
|
|||||||
Reference in New Issue
Block a user