1.3 fsm urc develop

web/micro-ui-internals/packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "license": "MIT",
   "main": "dist/index.css",
   "engines": {

web/micro-ui-internals/packages/modules/common/src/payments/employee/index.js

@@ -26,7 +26,7 @@ const EmployeePayment = ({ stateCode, cityCode, moduleCode }) => {
 
   return (
     <React.Fragment>
-      <p className="breadcrumb" style={{ marginLeft: "15px" }}>
+      <p className="breadcrumb" style={{ marginLeft: "15px", fontSize: "14px", color: "#505a5f", marginBottom: "10px" }}>
         <Link to={`/digit-ui/employee`}>{t("ES_COMMON_HOME")}</Link>
         {isFsm ? <Link to={`/digit-ui/employee/fsm/home`}>/ {t("ES_TITLE_FSM")} </Link> : null}
         {isFsm ? <Link to={`/digit-ui/employee/fsm/inbox`}>/ {t("ES_TITLE_INBOX")}</Link> : null}/ {link}

web/micro-ui-internals/packages/modules/fsm/src/components/RegistrySearch.js

@@ -182,7 +182,7 @@ const SearchApplication = ({ onSearch, type, onClose, onTabChange, isFstpOperato
                 </div>
               </div>
               {showAddMenu && (
-                <Menu localeKeyPrefix={"ES_FSM_ACTION_CREATE"} options={["VENDOR", "DRIVER", "VEHICLE"]} t={t} onSelect={onActionSelect} />
+                <Menu localeKeyPrefix={"ES_FSM_ACTION_CREATE"} options={["VENDOR", "VEHICLE", "DRIVER"]} t={t} onSelect={onActionSelect} />
               )}
             </div>
           </div>

web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectLocalityOrGramPanchayat.js

@@ -177,7 +177,12 @@ const SelectLocalityOrGramPanchayat = ({ t, config, onSelect, userType, formData
   return (
     <React.Fragment>
       <Timeline currentStep={1} flow="APPLY" />
-      <FormStep config={config} onSelect={onSubmit} isDisabled={!selectedGp} t={t}>
+      <FormStep
+        config={config}
+        onSelect={onSubmit}
+        isDisabled={propertyLocation?.code === "WITHIN_ULB_LIMITS" ? !selectedLocality : !selectedGp}
+        t={t}
+      >
         {propertyLocation?.code === "WITHIN_ULB_LIMITS" ? (
           <LabelFieldPair>
             <CardLabel className="card-label-smaller">

web/micro-ui-internals/packages/modules/fsm/src/pages/employee/NewApplication/index.js

@@ -45,7 +45,7 @@ export const NewApplication = ({ parentUrl, heading }) => {
     if (
       formData?.propertyType &&
       formData?.subtype &&
-      formData?.address?.locality?.code &&
+      (formData?.address?.locality?.code || formData.address.propertyLocation?.code === "FROM_GRAM_PANCHAYAT") &&
       formData?.tripData?.vehicleType &&
       formData?.channel &&
       (formData?.tripData?.amountPerTrip || formData?.tripData?.amountPerTrip === 0)
@@ -103,6 +103,8 @@ export const NewApplication = ({ parentUrl, heading }) => {
     const gender = data.applicationData.applicantGender;
     const paymentPreference = amount === 0 ? null : data?.paymentPreference ? data?.paymentPreference : null;
     const advanceAmount = amount === 0 ? null : data?.advancepaymentPreference?.advanceAmount;
+    const gramPanchayat = data?.address.gramPanchayat;
+    const village = data?.address.village;
 
     const formData = {
       fsm: {
@@ -133,13 +135,23 @@ export const NewApplication = ({ parentUrl, heading }) => {
           pincode,
           slumName: slum,
           locality: {
-            code: localityCode,
-            name: localityName,
+            code: localityCode ? localityCode : gramPanchayat?.code,
+            name: localityName ? localityName : gramPanchayat?.name,
           },
           geoLocation: {
             latitude: data?.address?.latitude,
             longitude: data?.address?.longitude,
           },
+          additionalDetails: {
+            gramPanchayat: {
+              code: gramPanchayat?.code,
+              name: gramPanchayat?.name,
+            },
+            village: {
+              code: village?.code,
+              name: village?.name,
+            },
+          },
         },
         noOfTrips,
         paymentPreference,

web/package.json

@@ -9,7 +9,7 @@
     "micro-ui-internals/packages/modules/*"
   ],
   "dependencies": {
-    "@egovernments/digit-ui-css": "1.5.8",
+    "@egovernments/digit-ui-css": "1.5.9",
     "@egovernments/digit-ui-libraries": "1.6.1",
     "@egovernments/digit-ui-module-common": "1.6.1",
     "@egovernments/digit-ui-module-core": "1.6.0",

web/public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8"/>
     <link rel="icon" href="./browser-icon.png"/>
     <link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap" rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.8/dist/index.css"/>
+    <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.9/dist/index.css"/>
     <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta name="theme-color" content="#00BCD1"/>

web/src/Customisations/fsm/pageComponents/SelectTankSize.js

@@ -15,7 +15,6 @@ const SelectTankSize = ({ config, onSelect, t, formData = {}, userType }) => {
   const [disable, setDisable] = useState(true);
   const [images, setImages] = useState(formData?.pitDetail?.images || null);
   const [size, setSize] = useState();
-  debugger;
   useEffect(() => {
     if (!formData?.pitType && userType !== "employee") {
       onSelect(config.key, {}, true);

web/src/Customisations/fsm/pageComponents/SelectTripData.js

@@ -82,7 +82,7 @@ const SelectTripData = ({ t, config, onSelect, formData = {}, userType }) => {
       },
       default: formData?.tripData?.amountPerTrip,
       disable:
-        formData?.address?.propertyLocation.code === "FROM_GRAM_PANCHAYAT"
+        formData?.address?.propertyLocation?.code === "FROM_GRAM_PANCHAYAT"
           ? false
           : true,
       isMandatory: true,
@@ -132,7 +132,7 @@ const SelectTripData = ({ t, config, onSelect, formData = {}, userType }) => {
         formData?.subtype &&
         formData?.address &&
         formData?.tripData?.vehicleType?.capacity &&
-        formData.address.propertyLocation.code === "WITHIN_ULB_LIMITS"
+        formData.address.propertyLocation?.code === "WITHIN_ULB_LIMITS"
       ) {
         const capacity = formData?.tripData?.vehicleType.capacity;
         const { slum: slumDetails } = formData.address;
@@ -163,7 +163,7 @@ const SelectTripData = ({ t, config, onSelect, formData = {}, userType }) => {
         }
       }
       if (
-        formData?.address?.propertyLocation.code === "FROM_GRAM_PANCHAYAT" &&
+        formData?.address?.propertyLocation?.code === "FROM_GRAM_PANCHAYAT" &&
         formData.tripData.noOfTrips &&
         formData.tripData.amountPerTrip
       ) {

web/src/Customisations/fsm/pages/citizen/NewApplication/Response.js

@@ -22,9 +22,9 @@ const BannerPicker = (props) => {
   return (
     <Banner
       message={GetActionMessage()}
-      applicationNumber={props.data?.fsm[0].applicationNo}
+      applicationNumber={props?.data?.fsm[0]?.applicationNo}
       info={props.t("CS_FILE_DESLUDGING_APPLICATION_NO")}
-      successful={props.isSuccess}
+      successful={props?.isSuccess}
     />
   );
 };
@@ -48,7 +48,6 @@ const Response = ({ data, onSuccess }) => {
   const [paymentPreference, setPaymentPreference] = useState(null);
   const [advancePay, setAdvancePay] = useState(null);
   const [zeroPay, setZeroPay] = useState(null);
-
   const Data = mutation?.data || successData;
   const localityCode = Data?.fsm?.[0].address?.locality?.code;
   const slumCode = Data?.fsm?.[0].address?.slumName;
@@ -129,8 +128,8 @@ const Response = ({ data, onSuccess }) => {
               city: city.name,
               pincode,
               locality: {
-                code: locality.code,
-                name: locality.name,
+                code: locality?.code ? locality.code : gramPanchayat?.code,
+                name: locality?.name ? locality?.name : gramPanchayat?.name,
               },
               geoLocation: {
                 latitude: geoLocation?.latitude,