@@ -465,10 +465,13 @@ const JobFieldInput = ({
{/* btn */}
diff --git a/src/components/jobPopout/PendingJobsPopout.jsx b/src/components/jobPopout/PendingJobsPopout.jsx
index 1c6e172..bc8fe2e 100644
--- a/src/components/jobPopout/PendingJobsPopout.jsx
+++ b/src/components/jobPopout/PendingJobsPopout.jsx
@@ -1,11 +1,11 @@
-import React, { useMemo, useState } from "react";
+import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
import { toast } from "react-toastify";
import usersService from "../../services/UsersService";
import ModalCom from "../Helpers/ModalCom";
import { PriceFormatter } from "../Helpers/PriceFormatter";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import Detail from "./popoutcomponent/Detail";
-import { useNavigate } from "react-router-dom";
import { useDispatch } from "react-redux";
import { tableReload } from "../../store/TableReloads";
@@ -18,85 +18,95 @@ const showSuccessToast = (message) => {
};
function PendingJobsPopout({ details, onClose, situation }) {
-
- const dispatch = useDispatch()
- const navigate = useNavigate()
+ const dispatch = useDispatch();
+ const navigate = useNavigate();
const [pendingJobLoader, setPendingJobLoader] = useState({
extend: false,
offer: false,
});
- let [requestMessage, setRequestMessage] = useState({status: false, message: ''})
+ let [requestMessage, setRequestMessage] = useState({
+ status: false,
+ message: "",
+ });
const apiCall = new usersService();
const handlePendingJobsBtn = ({ target: { name } }) => {
- let { job_uid, offer_code } = details;
+ let { job_uid, offer_code } = details;
- let reqData;
+ let reqData;
- let pendingData = { job_uid, offer_code };
- if(name=='extend'){ // RUNS THIS TO EXTEND JOB EXPIRY BY ONE WEEK
- reqData = { ...pendingData };
- setPendingJobLoader({ extend: true });
- apiCall.pendingJobExtend(reqData).then(res => {
- setRequestMessage({status: true, message: res.data.status})
+ let pendingData = { job_uid, offer_code };
+ if (name == "extend") {
+ // RUNS THIS TO EXTEND JOB EXPIRY BY ONE WEEK
+ reqData = { ...pendingData };
+ setPendingJobLoader({ extend: true });
+ apiCall
+ .pendingJobExtend(reqData)
+ .then((res) => {
+ setRequestMessage({ status: true, message: res.data.status });
setTimeout(() => {
setPendingJobLoader({ extend: false, offer: false });
- setRequestMessage({status: false, message: ''})
+ setRequestMessage({ status: false, message: "" });
onClose();
dispatch(tableReload({ type: "PENDINGTABLE" }));
}, 4000);
- }).catch(error => {
- setRequestMessage({status: false, message:'Try Again'})
- setTimeout(() => {
- setPendingJobLoader({ extend: false, offer: false });
- setRequestMessage({status: false, message: ''})
- }, 3000);
})
- }else if(name=='offer'){ // RUNS THIS IF JOB IS SENT TO USER
- reqData = { ...pendingData };
- setPendingJobLoader({ offer: true });
- apiCall.pendingJobSendTome(reqData).then(res => {
- setRequestMessage({status: true, message: res.data.status})
+ .catch((error) => {
+ setRequestMessage({ status: false, message: "Try Again" });
setTimeout(() => {
setPendingJobLoader({ extend: false, offer: false });
- setRequestMessage({status: false, message: ''})
+ setRequestMessage({ status: false, message: "" });
+ }, 3000);
+ });
+ } else if (name == "offer") {
+ // RUNS THIS IF JOB IS SENT TO USER
+ reqData = { ...pendingData };
+ setPendingJobLoader({ offer: true });
+ apiCall
+ .pendingJobSendTome(reqData)
+ .then((res) => {
+ setRequestMessage({ status: true, message: res.data.status });
+ setTimeout(() => {
+ setPendingJobLoader({ extend: false, offer: false });
+ setRequestMessage({ status: false, message: "" });
}, 4000);
- }).catch(error => {
- setRequestMessage('Try Again')
+ })
+ .catch((error) => {
+ setRequestMessage("Try Again");
setTimeout(() => {
setPendingJobLoader({ extend: false, offer: false });
- setRequestMessage({status: false, message: ''})
+ setRequestMessage({ status: false, message: "" });
}, 3000);
- })
- } else return
- // try {
- // if (name === "extend") {
- // setPendingJobLoader({ extend: true });
- // reqData = { ...pendingData };
- // // let { data } =
- // await apiCall.pendingJobExtend(reqData);
- // showSuccessToast("Job has been extended by a week!");
- // dispatch(tableReload({ type: "PENDINGTABLE" }));
- // } else if (name === "offer") {
- // setPendingJobLoader({ offer: true });
- // reqData = { ...pendingData };
- // // let { data } =
- // await apiCall.pendingJobSendTome(reqData);
- // showSuccessToast("Offer sent, check your email");
- // } else return;
+ });
+ } else return;
+ // try {
+ // if (name === "extend") {
+ // setPendingJobLoader({ extend: true });
+ // reqData = { ...pendingData };
+ // // let { data } =
+ // await apiCall.pendingJobExtend(reqData);
+ // showSuccessToast("Job has been extended by a week!");
+ // dispatch(tableReload({ type: "PENDINGTABLE" }));
+ // } else if (name === "offer") {
+ // setPendingJobLoader({ offer: true });
+ // reqData = { ...pendingData };
+ // // let { data } =
+ // await apiCall.pendingJobSendTome(reqData);
+ // showSuccessToast("Offer sent, check your email");
+ // } else return;
- // setTimeout(() => {
- // setPendingJobLoader({ extend: false, offer: false });
- // onClose();
- // }, 2700);
- // } catch (error) {
- // setPendingJobLoader({ extend: false, offer: false });
- // throw new Error(error);
- // }
- }
+ // setTimeout(() => {
+ // setPendingJobLoader({ extend: false, offer: false });
+ // onClose();
+ // }, 2700);
+ // } catch (error) {
+ // setPendingJobLoader({ extend: false, offer: false });
+ // throw new Error(error);
+ // }
+ };
return (
@@ -131,9 +141,9 @@ function PendingJobsPopout({ details, onClose, situation }) {
-
+
-
+
{details.title}
@@ -177,7 +187,11 @@ function PendingJobsPopout({ details, onClose, situation }) {
@@ -194,19 +208,11 @@ function PendingJobsPopout({ details, onClose, situation }) {
value={details.job_description || details.description}
/>
-
- {/*
-
-
*/}
{/* ACTION SECTION */}
-
Actions
+
Actions
@@ -229,11 +235,15 @@ function PendingJobsPopout({ details, onClose, situation }) {
)}
- {pendingJobLoader.extend && requestMessage.message &&
-
+ {pendingJobLoader.extend && requestMessage.message && (
+
- }
+ )}
- {pendingJobLoader.offer && requestMessage.message &&
-
+ {pendingJobLoader.offer && requestMessage.message && (
+
- }
+ )}