@djb25/digit-ui-module-ekyc 1.0.7 → 1.0.8

package/src/pages/employee/Review.js

@@ -171,8 +171,6 @@ const Review = () => {
   const propertyDetails = state.propertyDetails || {
     ownerType: sessionStorage.getItem("EKYC_OWNER_TYPE"),
     pidNumber: sessionStorage.getItem("EKYC_PID_NUMBER"),
-    connectionCategory: getSavedData("EKYC_TYPE_OF_CONNECTION_DATA"),
-    connectionType: getSavedData("EKYC_CONNECTION_CATEGORY_DATA"),
     userType: getSavedData("EKYC_USER_TYPE_DATA"),
     noOfFloors: getSavedData("EKYC_NO_OF_FLOORS_DATA"),
     propertyDocument: sessionStorage.getItem("EKYC_PROPERTY_DOC"),
@@ -181,6 +179,19 @@ const Review = () => {
     buildingPhotoFileStoreId: sessionStorage.getItem("EKYC_BUILDING_PHOTO_FILESTORE_ID"),
   };
 
+  const meterDetails = state.meterDetails || {
+    meterStatus: getSavedData("EKYC_METER_STATUS_DATA"),
+    workingStatus: getSavedData("EKYC_METER_WORKING_STATUS_DATA"),
+    meterLocation: sessionStorage.getItem("EKYC_METER_LOCATION"),
+    lastBillRaised: getSavedData("EKYC_LAST_BILL_RAISED_DATA"),
+    noBillReason: sessionStorage.getItem("EKYC_REASON_FOR_NO_BILL"),
+    sewerConnection: getSavedData("EKYC_SEWER_CONNECTION_DATA"),
+    connectionCategory: getSavedData("EKYC_TYPE_OF_CONNECTION_DATA"),
+    connectionType: getSavedData("EKYC_CONNECTION_CATEGORY_DATA"),
+    meterPhoto: sessionStorage.getItem("EKYC_METER_PHOTO"),
+    meterPhotoFileStoreId: sessionStorage.getItem("EKYC_METER_PHOTO_FILESTORE_ID"),
+  };
+
   useEffect(() => {
     sessionStorage.setItem("EKYC_CURRENT_STEP", "REVIEW");
   }, []);
@@ -241,6 +252,13 @@ const Review = () => {
         doorPhotoFileStoreId = await uploadFile(doorFile, tenantId);
       }
 
+      // ── 4. Upload meter photo ──────────────────────────────────────────────
+      let meterImageFileStoreId = meterDetails.meterPhotoFileStoreId || null;
+      if (!meterImageFileStoreId && meterDetails.meterPhoto) {
+        const meterFile = dataUrlToFile(meterDetails.meterPhoto, "meter_photo.jpg");
+        meterImageFileStoreId = await uploadFile(meterFile, tenantId);
+      }
+
       // ── 4. Build optimized request payload ────────────────────────────────
       // Note: RequestInfo is added automatically by the Digit Request utility
       const requestBody = {
@@ -266,6 +284,16 @@ const Review = () => {
         pincode: addressDetails.pincode || null,
         assembly: addressDetails.assembly || null,
         ward: addressDetails.ward || null,
+        // Meter Details
+        meterStatus: meterDetails.meterStatus?.value || null,
+        meterWorkingStatus: meterDetails.workingStatus?.value || null,
+        meterLocation: meterDetails.meterLocation || null,
+        lastBillRaised: meterDetails.lastBillRaised?.value || null,
+        noBillReason: meterDetails.noBillReason || null,
+        sewerConnection: meterDetails.sewerConnection?.value || null,
+        typeOfConnection: meterDetails.connectionCategory?.value || null,
+        connectionCategory: meterDetails.connectionType?.value || null,
+        meterImageFileStoreId: meterImageFileStoreId,
       };
 
       // ── 4. Call the update API using the new Hook ──────────────────────────
@@ -313,9 +341,11 @@ const Review = () => {
     history.push("/digit-ui/employee/ekyc/property-info", location.state);
   };
 
-  return (
-    <div className="ground-container employee-app-container form-container">
+  const handleEditMeter = () => {
+    history.push("/digit-ui/employee/ekyc/meter-details", location.state);
+  };
 
+  return (
       <Fragment>
         <div className="inbox-container">
           <style>{`
@@ -341,13 +371,14 @@ const Review = () => {
                 { label: t("EKYC_STEP_AADHAAR") || "Aadhaar", done: true, active: false },
                 { label: t("EKYC_STEP_ADDRESS") || "Address", done: true, active: false },
                 { label: t("EKYC_STEP_PROPERTY") || "Property", done: true, active: false },
+                { label: t("EKYC_STEP_METER") || "Meter", done: true, active: false },
                 { label: t("EKYC_STEP_REVIEW") || "Review", done: false, active: true },
               ].map((step, i) => (
                 <div key={i} style={{
                   display: "flex", gap: "10px", alignItems: "flex-start",
-                  position: "relative", paddingBottom: i < 3 ? "18px" : 0,
+                  position: "relative", paddingBottom: i < 4 ? "18px" : 0,
                 }}>
-                  {i < 3 && (
+                  {i < 4 && (
                     <div style={{
                       position: "absolute", left: "10px", top: "22px",
                       width: "1px", height: "calc(100% - 10px)", background: "#EAECF0",
@@ -482,6 +513,32 @@ const Review = () => {
                   ]}
                 />
 
+                <hr style={{ margin: "20px 0", border: 0, borderTop: "1px solid #EAECF0" }} />
+
+                {/* ── Meter section head ── */}
+                <SectionHead
+                  icon={<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67V7z" /></svg>}
+                  label={t("EKYC_METER_DETAILS_HEADER") || "Meter details"}
+                />
+
+                <ReviewCard
+                  icon={<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67V7z" /></svg>}
+                  title={t("EKYC_METER_DETAILS_HEADER") || "Meter details"}
+                  onEdit={handleEditMeter}
+                  editLabel={t("CS_COMMON_EDIT") || "Edit"}
+                  t={t}
+                  rows={[
+                    { label: t("EKYC_METER_STATUS") || "Meter status", value: meterDetails.meterStatus?.label || null, isModified: isFieldModified("meterStatus", meterDetails.meterStatus?.value) },
+                    { label: t("EKYC_METER_WORKING_STATUS") || "Meter working status", value: meterDetails.workingStatus?.label || null, isModified: isFieldModified("meterWorkingStatus", meterDetails.workingStatus?.value) },
+                    { label: t("EKYC_METER_LOCATION") || "Meter location", value: meterDetails.meterLocation || null, isModified: isFieldModified("meterLocation", meterDetails.meterLocation) },
+                    { label: t("EKYC_LAST_BILL_RAISED") || "Last bill raised", value: meterDetails.lastBillRaised?.label || null, isModified: isFieldModified("lastBillRaised", meterDetails.lastBillRaised?.value) },
+                    { label: t("EKYC_REASON_FOR_NO_BILL") || "Reason for no bill", value: meterDetails.noBillReason || null, isModified: isFieldModified("noBillReason", meterDetails.noBillReason) },
+                    { label: t("EKYC_SEWER_CONNECTION") || "Sewer connection", value: meterDetails.sewerConnection?.label || null, isModified: isFieldModified("sewerConnection", meterDetails.sewerConnection?.value) },
+                    { label: t("EKYC_TYPE_OF_CONNECTION") || "Type of connection", value: meterDetails.connectionCategory?.label || null, isModified: isFieldModified("typeOfConnection", meterDetails.connectionCategory?.value) },
+                    { label: t("EKYC_CONNECTION_CATEGORY") || "Connection category", value: meterDetails.connectionType?.label || null, isModified: isFieldModified("connectionCategory", meterDetails.connectionType?.value) },
+                  ]}
+                />
+
               </div>
 
               {/* Submit (Non-sticky, at form end) */}
@@ -523,7 +580,6 @@ const Review = () => {
           />
         )}
       </Fragment>
-    </div>
   );
 };
 

package/src/pages/employee/index.js

@@ -3,10 +3,12 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Switch, useLocation } from "react-router-dom";
 import Inbox from "./Inbox";
+//import Mapping from "./Mapping";
 import Create from "./Create";
 import AadhaarVerification from "./AadhaarVerification";
 import AddressDetails from "./AddressDetails";
 import PropertyInfo from "./PropertyInfo";
+import MeterDetails from "./MeterDetails";
 import Review from "./Review";
 
 const EmployeeApp = ({ path }) => {
@@ -23,6 +25,7 @@ const EmployeeApp = ({ path }) => {
         if (pathname.includes("/aadhaar-verification")) return "EKYC_AADHAAR_VERIFICATION";
         if (pathname.includes("/address-details")) return "EKYC_ADDRESS_DETAILS";
         if (pathname.includes("/property-info")) return "EKYC_PROPERTY_INFO";
+        if (pathname.includes("/meter-details")) return "EKYC_METER_DETAILS";
         if (pathname.includes("/review")) return "EKYC_REVIEW";
         return "ES_COMMON_INBOX";
     };
@@ -34,7 +37,7 @@ const EmployeeApp = ({ path }) => {
 
     return (
         <AppContainer>
-            <div className="ground-container employee-app-container">
+            <div className="ground-container employee-app-container employee-app-homepage-container">
                 <ModuleHeader
                     leftContent={
                         <React.Fragment>
@@ -64,6 +67,11 @@ const EmployeeApp = ({ path }) => {
                         component={() => <Create />}
                     />
 
+                    {/* <PrivateRoute
+                        path={`${path}/mapping`}
+                        component={() => <Mapping />}
+                    /> */}
+
                     <PrivateRoute
                         path={`${path}/aadhaar-verification`}
                         component={() => <AadhaarVerification />}
@@ -78,6 +86,11 @@ const EmployeeApp = ({ path }) => {
                         path={`${path}/property-info`}
                         component={() => <PropertyInfo />}
                     />
+
+                    <PrivateRoute
+                        path={`${path}/meter-details`}
+                        component={() => <MeterDetails />}
+                    />
                     
                     <PrivateRoute
                         path={`${path}/review`}