{productPrice} تومان
-
+
{!rulesAccepted && (
{
+ completeProfule(product?.termId);
+ }}
>
تکمیل اطلاعات کاربری و رزرو پیش ثبت نام
diff --git a/src/components/ShoppingCart/index.js b/src/components/ShoppingCart/index.js
index 0622b79..eeff14e 100644
--- a/src/components/ShoppingCart/index.js
+++ b/src/components/ShoppingCart/index.js
@@ -117,7 +117,7 @@ function ShoppingCart({
className="w-full px-1 h-12 mt-1 text-white bg-red52 rounded-lg text-sm font-semibold"
onClick={() =>
paySchool({
- redirectUrl: "https://new.andishmand.ir/services",
+ redirectUrl: "https://new.andishmand.ir/myServices",
})
}
>
@@ -260,7 +260,7 @@ function ShoppingCart({
style={{ fontSize: "0.65vw" }}
onClick={() =>
paySchool({
- redirectUrl: "http://localhost:3000/myServices",
+ redirectUrl: "https://new.andishmand.ir/myServices",
})
}
>
diff --git a/src/redux/actions/index.js b/src/redux/actions/index.js
index 3103410..c20ce14 100644
--- a/src/redux/actions/index.js
+++ b/src/redux/actions/index.js
@@ -12,6 +12,8 @@ export { default as file } from "./file";
export {default as scrollAction} from "./scroll";
export {default as qr} from "./qr";
export { default as userTransaction } from "./userTransaction";
+export { default as term } from "./term";
+
diff --git a/src/redux/actions/term.js b/src/redux/actions/term.js
new file mode 100644
index 0000000..fb7cd7e
--- /dev/null
+++ b/src/redux/actions/term.js
@@ -0,0 +1,13 @@
+
+
+
+import proxy from "../proxy";
+
+const term = {
+ info:
+ (data = {}) =>
+ async (dispatch) =>
+ await proxy.get("term/info", data, { dispatch }),
+};
+
+export default term;
\ No newline at end of file
diff --git a/src/redux/actions/user.js b/src/redux/actions/user.js
index 02d3e1e..2ebe53c 100644
--- a/src/redux/actions/user.js
+++ b/src/redux/actions/user.js
@@ -40,6 +40,10 @@ const user = {
(data = {}) =>
async (dispatch) =>
await proxy.get("user/getProfile", data, { dispatch }),
+ info:
+ (data = {}) =>
+ async (dispatch) =>
+ await proxy.get("user/info", data, { dispatch }),
setProfile:
(data = {}, data2 = {}) =>
async (dispatch) => {
@@ -58,13 +62,13 @@ const user = {
await proxy.delete("user/delete", data);
await proxy.get("user/list", data2, { dispatch });
},
- bnLogin: (data) => async (dispatch) =>
+ bnLogin: (data) => async (dispatch) =>
await proxy.login("user/login", data, { dispatch }),
- setUserStatus: () => async (dispatch) => {
- let userDataString = localStorage.getItem('userData');
- let userData = JSON.parse(userDataString);
- dispatch({type: 'SET_USER_STATUS', data: userData})
- }
+ setUserStatus: () => async (dispatch) => {
+ let userDataString = localStorage.getItem("userData");
+ let userData = JSON.parse(userDataString);
+ dispatch({ type: "SET_USER_STATUS", data: userData });
+ },
};
export default user;
diff --git a/src/redux/reducers/index.js b/src/redux/reducers/index.js
index f08a431..f37336a 100644
--- a/src/redux/reducers/index.js
+++ b/src/redux/reducers/index.js
@@ -12,3 +12,4 @@ export {default as scrollAction} from "./scroll";
export {default as qr} from "./qr";
export {default as addExamReduser} from "./exam";
export { default as userTransaction } from "./userTransaction";
+export { default as term } from "./term";
diff --git a/src/redux/reducers/term.js b/src/redux/reducers/term.js
new file mode 100644
index 0000000..62bfb35
--- /dev/null
+++ b/src/redux/reducers/term.js
@@ -0,0 +1,24 @@
+import proxy from "../proxy";
+import { toast } from "react-toastify";
+
+const initialState = {
+ loading: false,
+ error: null,
+ info:null
+};
+
+export default function term(state = initialState, action) {
+ let { type, data } = action;
+
+ switch (type) {
+ case "term/info":
+ return {
+ ...state,
+ loading: false,
+ info: data.rules,
+ error: null,
+ };
+ default:
+ return state;
+ }
+}
diff --git a/src/redux/reducers/user.js b/src/redux/reducers/user.js
index 435e694..b6fa98b 100644
--- a/src/redux/reducers/user.js
+++ b/src/redux/reducers/user.js
@@ -53,23 +53,30 @@ export default function user(state = initialState, action) {
setLogin: !state.setLogin,
};
case "user/getProfile":
+ case "user/info":
localStorage.setItem("userData", JSON.stringify(data));
- return { ...state, loading: false, status: data, error: null, setDone: false, };
+ return {
+ ...state,
+ loading: false,
+ status: data,
+ error: null,
+ setDone: false,
+ };
case "user/logout":
- window.location.reload()
+ window.location.reload();
return { ...state, loading: false, status: proxy.status(), error: null };
case "user/getUserRole":
return { ...state, loading: false, userRoles: data, error: null };
case "user/setProfile":
toast.success("تغییرات اعمال شد.");
- window.location.replace("/services");
+ // window.location.replace("/services");
return { ...state, loading: false, error: null, setDone: true };
case "loading":
return { ...state, loading: true };
case "error":
return { ...state, loading: false, error: data.message };
- case 'SET_USER_STATUS':
- return {...state, status: data};
+ case "SET_USER_STATUS":
+ return { ...state, status: data };
default:
return state;
}
diff --git a/src/view/register/index.js b/src/view/register/index.js
index 00fe844..5a5d307 100644
--- a/src/view/register/index.js
+++ b/src/view/register/index.js
@@ -20,11 +20,13 @@ import Checkbox from "../../components/Checkbox";
import { ostan } from "../../constants/states";
import { cities } from "../../constants/cities";
import _onInput from "../../utils/onInput";
-import { file, publicApi, user } from "../../redux/actions";
+import { file, publicApi, user,term } from "../../redux/actions";
import { VscDebugBreakpointUnsupported } from "react-icons/vsc";
import axios from "axios";
import { ApiConfig } from "../../constants/defaultValues";
import { toast } from "react-toastify";
+import moment from "jalali-moment";
+import loadingGiff from "../../assets/img/Rolling-2s-223px.gif";
const Register = ({
activeLogin,
@@ -36,6 +38,9 @@ const Register = ({
city,
user,
getUserInfo,
+ loading,
+ getRulse,
+ termInfo
}) => {
const [steps, setSteps] = useState(0);
console.log("user:&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
@@ -47,13 +52,16 @@ const Register = ({
getUserInfo();
getProvince();
getCity();
+ getRulse({ id: localStorage.getItem("termId") });
}, []);
+ console.log("termInfo:^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
+ console.log(termInfo);
useEffect(() => {
if (user?.firstName !== null) {
setUserInfo(user);
}
- if(user?.rulesAccepted){
+ if (user?.rulesAccepted) {
setActiveStep([true, true, true, true]);
setSteps(3);
}
@@ -115,46 +123,19 @@ const Register = ({
});
//ark added
- const [userInfo, setUserInfo]=useState(user);
+ const [userInfo, setUserInfo] = useState(user);
//ark added
- // const [userInfo, setUserInfo] = useState({
- // firstName: null,
- // lastName: null,
- // nationalId: null,
- // birthDate: null,
- // gender: null,
- // gradeIds: null,
- // previousSchoolName: null,
- // previousSchoolType: null,
- // cityId: null,
- // provinceId: null,
- // zone: null,
- // fatherInfo: {
- // firstName: null,
- // nationalId: null,
- // lastName: null,
- // job: null,
- // education: null,
- // cellphone: null,
- // workPlace: null,
- // workPhone: null,
- // },
- // motherInfo: {
- // firstName: null,
- // nationalId: null,
- // lastName: null,
- // job: null,
- // education: null,
- // cellphone: null,
- // workPlace: null,
- // workPhone: null,
- // },
-
- // familyMemberCount: null,
- // address: null,
- // phone: null,
- // rulesAccepted: false,
- // });
+ const findCity = (id) => {
+ let cityName = "";
+ console.log("province:");
+ console.log(province);
+ for (let i = 0; i < province?.length; i++) {
+ if (province[i].id === id) {
+ cityName = province[i].name;
+ }
+ }
+ return cityName;
+ };
const finalViewInfo = [
{
title: "نام",
@@ -175,6 +156,11 @@ const Register = ({
{
title: "تاریخ تولد",
// value: userInfo?.birthDate?.toLocaleDateString("fa-IR"),
+ value: userInfo?.birthDate
+ ? moment(userInfo?.birthDate, "YYYY/MM/DD")
+ .locale("fa")
+ .format("YYYY/MM/DD")
+ : "",
},
{
title: "نام مدرسه ",
@@ -182,7 +168,7 @@ const Register = ({
},
{
title: "شهر",
- value: userInfo?.cityId,
+ value: findCity(userInfo?.provinceId),
},
{
title: "منطقه",
@@ -399,24 +385,87 @@ const Register = ({
const [selectedCity, setSelectedCity] = useState(null);
const firstStepSubmit = () => {
- if (
- userInfo.firstName &&
- userInfo.lastName &&
- userInfo.birthDate &&
- userInfo.gradeIds &&
- userInfo.nationalId &&
- userInfo.gender &&
- // userInfo.previousSchoolName &&
- // userInfo.previousSchoolType &&
- // userInfo.zone &&
- files.personalPic &&
- files.shenasNameh
- ) {
+ // if (
+ // userInfo.firstName &&
+ // userInfo.lastName &&
+ // userInfo.birthDate &&
+ // userInfo.gradeIds &&
+ // userInfo.nationalId &&
+ // userInfo.gender &&
+ // // userInfo.previousSchoolName &&
+ // // userInfo.previousSchoolType &&
+ // // userInfo.zone &&
+ // files.personalPic &&
+ // files.shenasNameh
+ // ) {
+ // setSteps(1);
+ // setActiveStep([true, true, false, false]);
+ // setError("");
+ // } else {
+ // toast.warning("لطفا تمامی فیلد ها را پر کنید");
+ // }
+ if (!userInfo.firstName && !userInfo.lastName) {
+ toast.warning("لطفا نام و نام خانوادگی خود را وارد کنید");
+ } else if (!userInfo.birthDate) {
+ toast.warning("لطفا تاریخ تولد خود را وارد کنید");
+ } else if (!userInfo.gradeIds) {
+ toast.warning("لطفا پایه تحصیلی خود را وارد کنید");
+ } else if (!userInfo.nationalId) {
+ toast.warning("لطفا کد ملی خود را وارد کنید");
+ } else if (!userInfo.gender) {
+ toast.warning("لطفا جنسیت خود را مشخص کنید");
+ } else if (!files.personalPic && !files.shenasNameh) {
+ toast.warning("لطفا عکس شناسنامه و عکس پرسنلی خود را وارد کنید");
+ } else {
setSteps(1);
setActiveStep([true, true, false, false]);
setError("");
- } else {
- toast.warning("لطفا تمامی فیلد ها را پر کنید");
+ }
+ };
+
+ //submitHandler--------------------------------
+ const submitHandler = async () => {
+ try {
+ let access = window.localStorage.getItem("access");
+ const formData = new FormData();
+ formData.append("file", files.shenasNameh);
+ let res = await axios.post(ApiConfig.baseUrl + "/file/upload", formData, {
+ headers: {
+ "content-type": "multipart/form-data",
+ Authorization: `Bearer ${access}`,
+ },
+ });
+ if (res.data) {
+ try {
+ const personalPic = new FormData();
+ personalPic.append("file", files.personalPic);
+ let resp = await axios.post(
+ ApiConfig.baseUrl + "/file/upload",
+ personalPic,
+ {
+ headers: {
+ "content-type": "multipart/form-data",
+ Authorization: `Bearer ${access}`,
+ },
+ }
+ );
+ if (resp.data) {
+ console.log("userInfo:");
+ console.log(userInfo);
+ setProfile({
+ ...userInfo,
+ shenasnamehFileId: res.data?.data?.id,
+ personalPicFileId: resp.data?.data?.id,
+ });
+ }
+ } catch (err) {
+ console.error(err);
+ toast.error(err);
+ }
+ }
+ } catch (error) {
+ console.error(error);
+ toast.error(error);
}
};
@@ -435,7 +484,6 @@ const Register = ({
>
{/* form */}
- {console.log(userInfo)}
{/* 
*/}
@@ -454,7 +502,7 @@ const Register = ({
{steps == 0 && (
-
@@ -1324,10 +1397,13 @@ const Register = ({
/>
-
+
@@ -1389,12 +1478,16 @@ const mapStateToProps = (state) => ({
province: state.publicApi.province,
city: state.publicApi.city,
user: state.user.status,
+ // loading: state.user.loading,
+ loading: state.file.loading,
+ termInfo:state.term.info
});
const mapDispatchToProps = {
setProfile: user.setProfile,
getProvince: publicApi.getProvince,
getCity: publicApi.getCity,
- getUserInfo: user.getProfile,
+ getUserInfo: user.info,
+ getRulse: term.info
};
export default connect(mapStateToProps, mapDispatchToProps)(Register);
diff --git a/src/view/services/index.js b/src/view/services/index.js
index a10ab8d..77c1469 100644
--- a/src/view/services/index.js
+++ b/src/view/services/index.js
@@ -7,6 +7,7 @@ import Product from "../../components/Product";
import { CgDanger } from "react-icons/cg";
import { BsFillCheckCircleFill } from "react-icons/bs";
import filterIcon from "../../assets/img/vuesax-linear-filter-tick.svg";
+import underCicon from "../../assets/img/Group 2275.svg";
// import ScrollContainer from 'react-indiana-drag-scroll'
import img1 from "../../assets/img/Group 1344.svg";
@@ -350,6 +351,7 @@ const Services = ({
gameId !== 6 && (
+ {/* {!loading && ( */}
این بخش هنوز فعال نشده است.