Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6bd2fb1d by jaymehta
Options

.

1 parent 84a7c51d
Inline Side-by-side
Showing 4 changed files with 41 additions and 110 deletions
components/admin/VendorDetails.js
...@@ -18,7 +18,7 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) => ...@@ -18,7 +18,7 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) =>
const dispatch = useDispatch(); const dispatch = useDispatch();
useEffect(() => { useEffect(() => {
dispatch(getActivitiesForAdmin({ vendorId: detail[0].id })); dispatch(getActivitiesForAdmin({ vendorId: detail[0].id }));
console.log("cancel policy", detail[0]) console.log("cancel policy", detail[0]);
}, []); }, []);
useEffect(() => { useEffect(() => {
...@@ -89,22 +89,22 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) => ...@@ -89,22 +89,22 @@ const VendorDetails = ({ id, backClick, setShowDetail, showDetail, detail }) =>
<div className="row"> <div className="row">
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<p className="phead">Business Documents</p> <p className="phead">Business Documents</p>
<div className="row"> {/* <div className="row">
<p className="col-12 col-lg-6">Business PAN No.</p> <p className="col-12 col-lg-6">Business PAN No.</p>
<p className="col-12 col-lg-6">{detail[0].attributes.pan}</p> <p className="col-12 col-lg-6">{detail[0].attributes.pan}</p>
</div> </div> */}
<div className="row"> {/* <div className="row">
<p className="col-12 col-lg-6">PAN</p> <p className="col-12 col-lg-6">PAN</p>
<p className="col-12 col-lg-6 pview">View</p> <p className="col-12 col-lg-6 pview">View</p>
</div> </div> */}
<div className="row"> <div className="row">
<p className="col-12 col-lg-6">GST Number</p> <p className="col-12 col-lg-6">EIN Number</p>
<p className="col-12 col-lg-6">{detail[0].attributes.gst}</p> <p className="col-12 col-lg-6">{detail[0].attributes.einNumber}</p>
</div> </div>
<div className="row"> {/* <div className="row">
<p className="col-12 col-lg-6">GST Certificate</p> <p className="col-12 col-lg-6">GST Certificate</p>
<p className="col-12 col-lg-6 pview">View</p> <p className="col-12 col-lg-6 pview">View</p>
</div> </div> */}
<div className="row"> <div className="row">
<p className="col-12 col-lg-6">Business Name</p> <p className="col-12 col-lg-6">Business Name</p>
<p className="col-12 col-lg-6">{detail[0].attributes.businessName}</p> <p className="col-12 col-lg-6">{detail[0].attributes.businessName}</p>
......
components/admin/VendorListing.js
...@@ -14,7 +14,6 @@ const VendorListing = () => { ...@@ -14,7 +14,6 @@ const VendorListing = () => {
// Hooks // Hooks
const dispatch = useDispatch(); const dispatch = useDispatch();
const router = useRouter(); const router = useRouter();
const array = [1, 2, 3, 4, 5, 6, 7, 8, 9];
// useState // useState
const [session, setSession] = useState(); const [session, setSession] = useState();
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
......
components/detail/GuestReviews.js
...@@ -27,6 +27,8 @@ const GuestReviews = ({ activityById }) => { ...@@ -27,6 +27,8 @@ const GuestReviews = ({ activityById }) => {
setRating(newRating); setRating(newRating);
}; };
console.log("newRating", rating);
return ( return (
<> <>
<section className="guest-reviews-session"> <section className="guest-reviews-session">
...@@ -140,8 +142,8 @@ const GuestReviews = ({ activityById }) => { ...@@ -140,8 +142,8 @@ const GuestReviews = ({ activityById }) => {
<label className=" mb-3 ">Rating: </label>{" "} <label className=" mb-3 ">Rating: </label>{" "}
<StarRatings <StarRatings
className="col-3 mx-2" className="col-3 mx-2"
rating={rating} rating={3}
starRatedColor="#ffe20" // Set the rated color to yellow starRatedColor="#000" // Set the rated color to yellow
starHoverColor="#ffe20" // Set the hover color to yellow starHoverColor="#ffe20" // Set the hover color to yellow
changeRating={handleRatingChange} changeRating={handleRatingChange}
numberOfStars={5} numberOfStars={5}
......
components/vendor/BusinessDetails.js
...@@ -42,11 +42,12 @@ const BusinessDetails = () => { ...@@ -42,11 +42,12 @@ const BusinessDetails = () => {
}, []); }, []);
// console.log("session", loggedInVendor); // console.log("session", loggedInVendor);
const businessDetailsValidationSchema = Yup.object().shape({ const businessDetailsValidationSchema = Yup.object().shape({
panNumber: Yup.string().required("Pan Number is Required"), // panNumber: Yup.string().required("Pan Number is Required"),
panFile: Yup.mixed(), // panFile: Yup.mixed(),
gstNumber: Yup.string().required("GST Number is Required"), // gstNumber: Yup.string().required("GST Number is Required"),
gstCertificateFile: Yup.mixed(), // gstCertificateFile: Yup.mixed(),
businessName: Yup.string().required("Business Name is Required"), businessName: Yup.string().required("Business Name is Required"),
einNumber: Yup.string().required("EIN Number is Required"),
brandLogoFile: Yup.mixed(), brandLogoFile: Yup.mixed(),
pincode: Yup.string().required("Pincode is Required"), pincode: Yup.string().required("Pincode is Required"),
country: Yup.string().required("Country is Required"), country: Yup.string().required("Country is Required"),
...@@ -66,11 +67,12 @@ const BusinessDetails = () => { ...@@ -66,11 +67,12 @@ const BusinessDetails = () => {
if (vendorDetails) { if (vendorDetails) {
vendorData = { vendorData = {
panNumber: vendorDetails.attributes.pan, // panNumber: vendorDetails.attributes.pan,
panFile: vendorDetails.attributes.panImage, // panFile: vendorDetails.attributes.panImage,
gstNumber: vendorDetails.attributes.gst, // gstNumber: vendorDetails.attributes.gst,
gstCertificateFile: vendorDetails.attributes.gstImage, // gstCertificateFile: vendorDetails.attributes.gstImage,
businessName: vendorDetails.attributes.businessName, businessName: vendorDetails.attributes.businessName,
einNumber: vendorDetails.attributes.einNumber,
brandLogoFile: vendorDetails.attributes.logo, brandLogoFile: vendorDetails.attributes.logo,
pincode: vendorDetails.attributes.pincode, pincode: vendorDetails.attributes.pincode,
country: vendorDetails.attributes.country, country: vendorDetails.attributes.country,
...@@ -136,11 +138,10 @@ const BusinessDetails = () => { ...@@ -136,11 +138,10 @@ const BusinessDetails = () => {
<Formik <Formik
enableReinitialize enableReinitialize
initialValues={{ initialValues={{
panNumber: vendorData?.panNumber ? vendorData?.panNumber : "", // panNumber: vendorData?.panNumber ? vendorData?.panNumber : "",
panFile: vendorData?.panImage ? vendorData?.panImage : "",
gstNumber: vendorData?.gstNumber ? vendorData?.gstNumber : "",
gstCertificateFile: vendorData?.gstImage ? vendorData?.gstImage : "",
businessName: vendorData?.businessName ? vendorData?.businessName : "", businessName: vendorData?.businessName ? vendorData?.businessName : "",
einNumber: vendorData?.einNumber ? vendorData?.einNumber : "",
brandLogoFile: vendorData?.logo ? vendorData?.logo : "", brandLogoFile: vendorData?.logo ? vendorData?.logo : "",
pincode: vendorData?.pincode ? vendorData?.pincode : "", pincode: vendorData?.pincode ? vendorData?.pincode : "",
country: vendorData?.country ? vendorData?.country : "", country: vendorData?.country ? vendorData?.country : "",
...@@ -154,9 +155,9 @@ const BusinessDetails = () => { ...@@ -154,9 +155,9 @@ const BusinessDetails = () => {
onSubmit={async values => { onSubmit={async values => {
console.log("business details values", values); console.log("business details values", values);
const businessDetails = { const businessDetails = {
pan: values.panNumber, // pan: values.panNumber,
gst: values.gstNumber,
businessName: values.businessName, businessName: values.businessName,
einNumber: values.einNumber,
state: values.state, state: values.state,
city: values.city, city: values.city,
pincode: values.pincode, pincode: values.pincode,
...@@ -190,95 +191,20 @@ const BusinessDetails = () => { ...@@ -190,95 +191,20 @@ const BusinessDetails = () => {
<div className="row"> <div className="row">
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group"> <div className="input-group">
<label>Enter Business PAN No.</label> <label>Business Name</label>
<input type="text" name="panNumber" onChange={handleChange} onBlur={handleBlur} value={values.panNumber} disabled={disableFields} /> <input disabled={disableFields} type="text" name="businessName" onChange={handleChange} onBlur={handleBlur} value={values.businessName} />
{errors.panNumber && touched.panNumber && <span className="form-error">{errors.panNumber}</span>} {errors.businessName && touched.businessName && <span className="form-error">{errors.businessName}</span>}
</div>
</div>
<div className="col-12 offset-lg-1 col-lg-5">
<div className="input-group">
<label>Upload PAN</label>
<div className="custom-file">
<input
disabled={disableFields}
type="file"
className="custom-file-input"
id="panFile"
name="panFile"
onChange={event => {
if (event) {
const file = event.currentTarget.files[0];
setFieldValue("panFile", file);
}
}}
onBlur={handleBlur}
// value={values.panFile}
onClick={event => {
const { target = {} } = event || {};
target.value = "";
}}
/>
<label className="custom-file-label" htmlFor="panFile">
Upload
</label>
</div>
<p className="textS">Upload in .PNG or .JPG/JPEG format</p>
{errors.panFile && touched.panFile && <span className="form-error">{errors.panFile}</span>}
{values.panFile && (
<div className="d-flex align-items-center justify-content-between p-1" style={{ width: "100%" }}>
<p className="textS m-0">{values.panFile.name}</p>
<FaTimes
style={{ cursor: "pointer" }}
onClick={() => {
setFieldValue("panFile", "");
}}
/>
</div>
)}
</div>
</div> </div>
</div> </div>
<div className="row">
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group"> <div className="input-group">
<label>GST Number</label> <label>EIN Number</label>
<input disabled={disableFields} type="text" name="gstNumber" onChange={handleChange} onBlur={handleBlur} value={values.gstNumber} /> <input disabled={disableFields} type="text" name="einNumber" onChange={handleChange} onBlur={handleBlur} value={values.einNumber} />
{errors.gstNumber && touched.gstNumber && <span className="form-error">{errors.gstNumber}</span>} {errors.einNumber && touched.einNumber && <span className="form-error">{errors.einNumber}</span>}
</div> </div>
</div> </div>
<div className="col-12 offset-lg-1 col-lg-5">
<div className="input-group">
<label>GST Certificate</label>
<div className="custom-file">
<input
disabled={disableFields}
type="file"
className="custom-file-input"
id="gstCertificateFile"
name="gstCertificateFile"
onChange={handleChange}
onBlur={handleBlur}
value={values.gstCertificateFile}
/>
<label className="custom-file-label" htmlFor="gstCertificateFile">
Upload
</label>
</div>
<p className="textS">Upload in .PNG or .JPG/JPEG format</p>
{errors.gstCertificateFile && touched.gstCertificateFile && <span className="form-error">{errors.gstCertificateFile}</span>}
</div>
</div>
</div>
<div className="row">
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group"> <div className="input-group">
<label>Business Name</label>
<input disabled={disableFields} type="text" name="businessName" onChange={handleChange} onBlur={handleBlur} value={values.businessName} />
{errors.businessName && touched.businessName && <span className="form-error">{errors.businessName}</span>}
</div>
</div>
<div className="col-12 offset-lg-1 col-lg-5">
<div className="input-group">
<label>Brand Logo</label> <label>Brand Logo</label>
<div className="custom-file"> <div className="custom-file">
<input <input
...@@ -384,9 +310,13 @@ const BusinessDetails = () => { ...@@ -384,9 +310,13 @@ const BusinessDetails = () => {
</div> </div>
<div className="col-12 col-lg-5"> <div className="col-12 col-lg-5">
<div className="input-group"> <div className="input-group">
<Button disabled={false} onClick={() => { <Button
router.push("/vendor/dashboard") disabled={false}
}} className="btn btn-primary btn-submit"> onClick={() => {
router.push("/vendor/dashboard");
}}
className="btn btn-primary btn-submit"
>
Go to dashboard Go to dashboard
</Button> </Button>
</div> </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!