diff --git a/example.env.local b/example.env.local index fe9a317..19658da 100644 --- a/example.env.local +++ b/example.env.local @@ -1,5 +1,5 @@ NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard" -NEXT_PUBLIC_API_VERSION = "1.28.5" +NEXT_PUBLIC_API_VERSION = "1.29.0" NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa" NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl" diff --git a/public/config.json.example b/public/config.json.example index ac50d76..7dce39a 100644 --- a/public/config.json.example +++ b/public/config.json.example @@ -14,7 +14,7 @@ "register": { "date": { "from": "1402/10/02", - "to": "1402/10/15" + "to": "1402/11/15" }, "messages": { "before": "ثبت نام هنوز شروع نشده", @@ -47,5 +47,6 @@ "secondary": "فرآیند معرفی ضامن و پرداخت" } } - } + }, + "banner":"سلام" } \ No newline at end of file diff --git a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx index aacb6ac..c8cdcbb 100644 --- a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx +++ b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx @@ -17,7 +17,6 @@ import {useFormik} from "formik"; import {useTranslations} from "next-intl"; import * as Yup from "yup"; import {CenterLayout, useRequest, useUser} from "@witel/webapp-builder"; -import useProvince from "@/lib/app/hooks/useProvince"; import useCities from "@/lib/app/hooks/useCities"; import PlateNumber from "@/core/components/PlateNumber"; import MuiDatePicker from "@/core/components/MuiDatePicker"; @@ -29,6 +28,7 @@ import {NextLinkComposed} from "@witel/webapp-builder/dist/utils/linkRouting"; import SvgDone from "@/core/components/svgs/SvgDone"; import {SEND_LOAN_REQUEST_NAVGAN} from "@/core/data/apiRoutes"; import {useRouter} from "next/router"; +import useLimitedProvince from "@/lib/app/hooks/useLimitedProvince"; const AddFormComponent = () => { const router = useRouter() @@ -37,7 +37,7 @@ const AddFormComponent = () => { const [finishLoanRequest, setFinishLoanRequest] = useState(false) const [checked, setChecked] = useState(false); const requestServer = useRequest() - const {provinceList, isLoadingProvinceList, errorProvinceList} = useProvince() + const {provinceList, isLoadingProvinceList, errorProvinceList} = useLimitedProvince() const {cityTextField, cityList, setProvinceID, isLoadingCityList} = useCities() const {educationsList, isLoadingEducationsList, errorEducationsList} = UseEducations() const {occupationsList, isLoadingOccupationsList, errorOccupationsList} = useOccupations() diff --git a/src/components/dashboard/navgan/show/form/UpdateForm.jsx b/src/components/dashboard/navgan/show/form/UpdateForm.jsx index c4d4434..4c3474e 100644 --- a/src/components/dashboard/navgan/show/form/UpdateForm.jsx +++ b/src/components/dashboard/navgan/show/form/UpdateForm.jsx @@ -116,17 +116,13 @@ const UpdateForm = ({LoanDetails, LoanId}) => { } formData.append("birthday", values.birthday.locale('en').format("YYYY-MM-DD")); formData.append("postal_code", values.postal_code); - formData.append("province_id", values.province_id); - formData.append("city_id", values.city_id); + formData.append("province_id", LoanDetails.province_id); + formData.append("city_id", LoanDetails.city_id); formData.append("telephone_number", values.telephone_number); formData.append("education_id", values.education_id); formData.append("occupation_id", values.occupation_id); formData.append("address", values.address); - for (var pair of formData.entries()) { - console.log(pair[0] + ':' + pair[1]); - } - await requestServer(UPDATE_LOAN + LoanId, "post", { auth: true, notification: true, data: formData }).then(() => { @@ -551,7 +547,8 @@ const UpdateForm = ({LoanDetails, LoanId}) => { name="province_id" label={t("ShowLoan.text_field_province_id")} size="small" - variant="outlined" + variant="standard" + disabled selectType="province_id" schema={{value: "value", name: "name"}} isLoading={provinceStates.isLoadingProvinceList} @@ -572,6 +569,7 @@ const UpdateForm = ({LoanDetails, LoanId}) => { as={TextField} sx={{width: "100%"}} disabled + variant="standard" size="small" label={t("ShowLoan.text_field_province_id")} value={t("text_field_loading")} @@ -592,8 +590,9 @@ const UpdateForm = ({LoanDetails, LoanId}) => { label={citiesStates.cityList.length === 0 ? `${t("ShowLoan.cityList_empty")}` : citiesStates.cityTextField} size="small" selectType="city_id" - disabled={citiesStates.cityList.length === 0} - variant="outlined" + // disabled={citiesStates.cityList.length === 0} + variant="standard" + disabled selectors={citiesStates.cityList} select={props.values.city_id} schema={{value: "value", name: "name"}} @@ -606,6 +605,7 @@ const UpdateForm = ({LoanDetails, LoanId}) => { as={TextField} sx={{width: "100%"}} disabled + variant="standard" size="small" label={t("ShowLoan.cityList_empty")} value={t("text_field_loading")} @@ -773,7 +773,6 @@ const UpdateForm = ({LoanDetails, LoanId}) => { width: {xs: "100%", sm: "30%", md: "25%"}, }} > - {console.log(props.errors)}