@djb25/digit-ui-module-vendor 1.0.75 → 1.0.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1723,20 +1723,6 @@ const VendorInbox = props => {
1723
1723
  }
1724
1724
  });
1725
1725
  };
1726
- const onSelectAdd = () => {
1727
- switch (props.selectedTab) {
1728
- case "VENDOR":
1729
- return history.push("/digit-ui/" + userType + "/vendor/registry/new-vendor");
1730
- case "VEHICLE":
1731
- return history.push("/digit-ui/" + userType + "/vendor/registry/new-vehicle");
1732
- case "DRIVER":
1733
- return history.push("/digit-ui/" + userType + "/vendor/registry/new-driver");
1734
- case "SUPERVISOR":
1735
- return history.push("/digit-ui/" + userType + "/vendor/registry/new-supervisor");
1736
- case "SURVEYOR":
1737
- return history.push("/digit-ui/" + userType + "/vendor/registry/new-surveyor");
1738
- }
1739
- };
1740
1726
  const vendorIds = React.useMemo(() => {
1741
1727
  if (props.selectedTab === "VENDOR") {
1742
1728
  return (tableData === null || tableData === void 0 ? void 0 : tableData.map(row => row.id)) || [];
@@ -2166,7 +2152,8 @@ const VendorInbox = props => {
2166
2152
  Cell: _ref28 => {
2167
2153
  var _row$original16;
2168
2154
  let row = _ref28.row;
2169
- return /*#__PURE__*/React.createElement("div", null, ((_row$original16 = row.original) === null || _row$original16 === void 0 ? void 0 : _row$original16.assignedZoneId) || "NA");
2155
+ const zoneId = (_row$original16 = row.original) === null || _row$original16 === void 0 ? void 0 : _row$original16.assignedZoneId;
2156
+ return /*#__PURE__*/React.createElement("div", null, zoneId ? t(zoneId) : "NA");
2170
2157
  }
2171
2158
  }, {
2172
2159
  Header: t("ES_VENDOR_SUPERVISOR_AGENCY_NAME") || "Agency Name",
@@ -2512,17 +2499,14 @@ const VendorInbox = props => {
2512
2499
  let emptyButtonText = "";
2513
2500
  if (props.selectedTab === "VENDOR") {
2514
2501
  emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_VENDOR";
2515
- emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_VENDOR";
2516
2502
  } else if (props.selectedTab === "VEHICLE") {
2517
2503
  emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_VEHICLE";
2518
- emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_VEHICLE";
2519
2504
  } else if (props.selectedTab === "SUPERVISOR") {
2520
2505
  emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_SUPERVISOR";
2521
2506
  } else if (props.selectedTab === "SURVEYOR") {
2522
2507
  emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_SURVEYOR";
2523
2508
  } else {
2524
2509
  emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_DRIVER";
2525
- emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_DRIVER";
2526
2510
  }
2527
2511
  result = /*#__PURE__*/React.createElement(Card, {
2528
2512
  className: "flex-center flex-box"
@@ -2531,11 +2515,7 @@ const VendorInbox = props => {
2531
2515
  marginTop: "50px",
2532
2516
  marginBottom: "25px"
2533
2517
  }
2534
- }, t(emptyCardText)), emptyButtonText && /*#__PURE__*/React.createElement(SubmitBar, {
2535
- className: "",
2536
- label: t(emptyButtonText),
2537
- onSubmit: onSelectAdd
2538
- }));
2518
+ }, t(emptyCardText)), emptyButtonText );
2539
2519
  } else if (tableData.length > 0) {
2540
2520
  result = /*#__PURE__*/React.createElement(ApplicationTable, {
2541
2521
  className: "table",
@@ -4675,7 +4655,7 @@ const stringReplaceAll = function (str, searcher, replaceWith) {
4675
4655
  return str;
4676
4656
  };
4677
4657
 
4678
- const VendorConfig = function (t, module, genderMenu, update) {
4658
+ const VendorConfig = function (t, module, genderMenu, update, addressHeader) {
4679
4659
  var _module;
4680
4660
  if (module === void 0) {
4681
4661
  module = "";
@@ -4705,7 +4685,7 @@ const VendorConfig = function (t, module, genderMenu, update) {
4705
4685
  isMandatory: true,
4706
4686
  type: "mobileNumber",
4707
4687
  key: "phone",
4708
- disable: false,
4688
+ disable: update,
4709
4689
  populators: {
4710
4690
  name: "phone",
4711
4691
  validation: {
@@ -4855,17 +4835,18 @@ const VendorConfig = function (t, module, genderMenu, update) {
4855
4835
  withoutLabel: true,
4856
4836
  props: {
4857
4837
  hidePropertySearch: true,
4858
- hideZRO: true
4838
+ hideZRO: true,
4839
+ isVendor: true
4859
4840
  },
4860
4841
  texts: {
4861
- header: "PT_LOCATION_DETAILS"
4842
+ header: addressHeader
4862
4843
  }
4863
4844
  }]
4864
4845
  }];
4865
4846
  };
4866
4847
 
4867
4848
  const AddVendor = () => {
4868
- var _Digit$UserService$ge, _formData$serviceType2;
4849
+ var _Digit$UserService$ge, _formData$serviceType3;
4869
4850
  const rawTenantId = Digit.ULBService.getCurrentTenantId();
4870
4851
  const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : rawTenantId + ".djb";
4871
4852
  const _useTranslation = useTranslation(),
@@ -4926,15 +4907,16 @@ const AddVendor = () => {
4926
4907
  formData = _useState4[0],
4927
4908
  setFormData = _useState4[1];
4928
4909
  const Config = React.useMemo(() => {
4929
- var _formData$serviceType;
4930
- return VendorConfig(t, (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code, genderMenu);
4931
- }, [t, formData === null || formData === void 0 ? void 0 : (_formData$serviceType2 = formData.serviceType) === null || _formData$serviceType2 === void 0 ? void 0 : _formData$serviceType2.i18nKey, genderMenu]);
4910
+ var _formData$serviceType, _formData$serviceType2;
4911
+ const addressHeader = (formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code) === "EKYC" ? "PT_LOCATION_DETAILS_EKYC" : "PT_LOCATION_DETAILS";
4912
+ return VendorConfig(t, (_formData$serviceType2 = formData.serviceType) === null || _formData$serviceType2 === void 0 ? void 0 : _formData$serviceType2.code, genderMenu, false, addressHeader);
4913
+ }, [t, formData === null || formData === void 0 ? void 0 : (_formData$serviceType3 = formData.serviceType) === null || _formData$serviceType3 === void 0 ? void 0 : _formData$serviceType3.i18nKey, genderMenu]);
4932
4914
  const onFormValueChange = (setValue, data) => {
4933
- var _data$zoneIds, _data$serviceType, _formData$serviceType3, _data$serviceType2;
4915
+ var _data$zoneIds, _data$serviceType, _formData$serviceType4, _data$serviceType2;
4934
4916
  const currentZoneCodes = (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.map(item => item === null || item === void 0 ? void 0 : item.code)) || [];
4935
4917
  const previousZoneCodes = (formData === null || formData === void 0 ? void 0 : formData.zoneIds) || [];
4936
4918
  const zoneChanged = currentZoneCodes.join(",") !== previousZoneCodes.join(",");
4937
- if ((data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code) !== (formData === null || formData === void 0 ? void 0 : (_formData$serviceType3 = formData.serviceType) === null || _formData$serviceType3 === void 0 ? void 0 : _formData$serviceType3.code) || zoneChanged) {
4919
+ if ((data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code) !== (formData === null || formData === void 0 ? void 0 : (_formData$serviceType4 = formData.serviceType) === null || _formData$serviceType4 === void 0 ? void 0 : _formData$serviceType4.code) || zoneChanged) {
4938
4920
  setFormData(prev => _extends({}, prev, {
4939
4921
  serviceType: data === null || data === void 0 ? void 0 : data.serviceType
4940
4922
  }));
@@ -4992,7 +4974,7 @@ const AddVendor = () => {
4992
4974
  setShowToast(null);
4993
4975
  };
4994
4976
  const onSubmit = data => {
4995
- var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy2;
4977
+ var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _address$subLocality, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy2;
4996
4978
  const mergedData = data;
4997
4979
  const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
4998
4980
  const pincode = address === null || address === void 0 ? void 0 : address.pincode;
@@ -5008,6 +4990,12 @@ const AddVendor = () => {
5008
4990
  const localityArea = address === null || address === void 0 ? void 0 : address.subLocality;
5009
4991
  const wardCode = address === null || address === void 0 ? void 0 : (_address$ward = address.ward) === null || _address$ward === void 0 ? void 0 : _address$ward.code;
5010
4992
  const wardName = address === null || address === void 0 ? void 0 : (_address$ward2 = address.ward) === null || _address$ward2 === void 0 ? void 0 : _address$ward2.name;
4993
+ const subLocality = (address === null || address === void 0 ? void 0 : address.subLocality) || (address === null || address === void 0 ? void 0 : (_address$subLocality = address.subLocality) === null || _address$subLocality === void 0 ? void 0 : _address$subLocality.name) || (address === null || address === void 0 ? void 0 : address.subLocality);
4994
+ const addressLine1 = address === null || address === void 0 ? void 0 : address.addressLine1;
4995
+ const addressLine2 = address === null || address === void 0 ? void 0 : address.addressLine2;
4996
+ const actualAssembly = address === null || address === void 0 ? void 0 : address.actualAssembly;
4997
+ const actualWard = address === null || address === void 0 ? void 0 : address.actualWard;
4998
+ const actualZone = address === null || address === void 0 ? void 0 : address.actualZone;
5011
4999
  const name = mergedData === null || mergedData === void 0 ? void 0 : mergedData.vendorName;
5012
5000
  const plotNo = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$plotNo = mergedData.plotNo) === null || _mergedData$plotNo === void 0 ? void 0 : _mergedData$plotNo.trim();
5013
5001
  const buildingName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$buildingN = mergedData.buildingName) === null || _mergedData$buildingN === void 0 ? void 0 : _mergedData$buildingN.trim();
@@ -5038,6 +5026,12 @@ const AddVendor = () => {
5038
5026
  label: "Locality",
5039
5027
  area: localityArea || ""
5040
5028
  },
5029
+ subLocality: subLocality,
5030
+ addressLine1: addressLine1,
5031
+ addressLine2: addressLine2,
5032
+ actualAssembly,
5033
+ actualWard,
5034
+ actualZone,
5041
5035
  ward: wardCode ? {
5042
5036
  code: wardCode,
5043
5037
  name: wardName
@@ -6025,8 +6019,9 @@ const VENDORCreate = _ref => {
6025
6019
  };
6026
6020
 
6027
6021
  const EditVendor = () => {
6028
- var _Digit$UserService$ge, _dsoDetails$owner1, _defaultValues$servic2;
6029
- const tenantId = Digit.ULBService.getCurrentTenantId();
6022
+ var _Digit$UserService$ge, _defaultValues$servic2;
6023
+ const rawTenantId = Digit.ULBService.getCurrentTenantId();
6024
+ const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : rawTenantId + ".djb";
6030
6025
  const _useTranslation = useTranslation(),
6031
6026
  t = _useTranslation.t;
6032
6027
  const history = useHistory();
@@ -6106,12 +6101,12 @@ const EditVendor = () => {
6106
6101
  }, []);
6107
6102
  useEffect(() => {
6108
6103
  if (dsoData && dsoData[0]) {
6109
- var _dsoData$, _dsoDetails$additiona, _dsoDetails$additiona2, _dsoDetails$address, _dsoDetails$address2, _dsoDetails$address3, _dsoDetails$address4, _dsoDetails$address4$, _dsoDetails$address5, _dsoDetails$address6, _dsoDetails$address7, _dsoDetails$address8, _dsoDetails$address8$, _dsoDetails$address9, _dsoDetails$address9$, _dsoDetails$address$g, _dsoDetails$address$g2, _dsoDetails$owner, _dsoDetails$owner2, _dsoDetails$owner3, _dsoDetails$owner4, _dsoDetails$owner5, _dsoDetails$owner6, _dsoDetails$owner7, _dsoDetails$owner8, _dsoDetails$owner9, _dsoDetails$additiona3;
6104
+ var _dsoData$, _dsoDetails$additiona, _dsoDetails$additiona2, _dsoDetails$additiona3, _dsoDetails$address, _dsoDetails$address2, _dsoDetails$address3, _dsoDetails$address4, _dsoDetails$address4$, _dsoDetails$address5, _dsoDetails$address6, _dsoDetails$address7, _dsoDetails$address8, _dsoDetails$address8$, _dsoDetails$address9, _dsoDetails$address9$, _dsoDetails$address$g, _dsoDetails$address$g2, _dsoDetails$owner, _dsoDetails$owner2, _dsoDetails$owner3, _dsoDetails$owner4, _dsoDetails$owner5, _dsoDetails$owner6, _dsoDetails$owner7, _dsoDetails$owner8, _dsoDetails$owner9, _dsoDetails$owner0, _dsoDetails$additiona4;
6110
6105
  const dsoDetails = (_dsoData$ = dsoData[0]) === null || _dsoData$ === void 0 ? void 0 : _dsoData$.dsoDetails;
6111
6106
  setDsoDetails(dsoDetails);
6112
6107
  const serviceType = {
6113
- i18nKey: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona = dsoDetails.additionalDetails) === null || _dsoDetails$additiona === void 0 ? void 0 : _dsoDetails$additiona.serviceType.toUpperCase(),
6114
- code: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona2 = dsoDetails.additionalDetails) === null || _dsoDetails$additiona2 === void 0 ? void 0 : _dsoDetails$additiona2.serviceType
6108
+ i18nKey: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona = dsoDetails.additionalDetails) === null || _dsoDetails$additiona === void 0 ? void 0 : (_dsoDetails$additiona2 = _dsoDetails$additiona.serviceType) === null || _dsoDetails$additiona2 === void 0 ? void 0 : _dsoDetails$additiona2.toUpperCase(),
6109
+ code: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona3 = dsoDetails.additionalDetails) === null || _dsoDetails$additiona3 === void 0 ? void 0 : _dsoDetails$additiona3.serviceType
6115
6110
  };
6116
6111
  const values = {
6117
6112
  vendorName: dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.name,
@@ -6127,6 +6122,12 @@ const EditVendor = () => {
6127
6122
  }),
6128
6123
  houseNo: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$address5 = dsoDetails.address) === null || _dsoDetails$address5 === void 0 ? void 0 : _dsoDetails$address5.doorNo) || "",
6129
6124
  streetName: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$address6 = dsoDetails.address) === null || _dsoDetails$address6 === void 0 ? void 0 : _dsoDetails$address6.street) || "",
6125
+ subLocality: dsoDetails.address.subLocality,
6126
+ addressLine1: dsoDetails.address.addressLine1,
6127
+ addressLine2: dsoDetails.address.addressLine2,
6128
+ actualAssembly: dsoDetails.address.actualAssembly,
6129
+ actualWard: dsoDetails.address.actualWard,
6130
+ actualZone: dsoDetails.address.actualZone,
6130
6131
  landmark: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$address7 = dsoDetails.address) === null || _dsoDetails$address7 === void 0 ? void 0 : _dsoDetails$address7.landmark) || "",
6131
6132
  latitude: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$address8 = dsoDetails.address) === null || _dsoDetails$address8 === void 0 ? void 0 : (_dsoDetails$address8$ = _dsoDetails$address8.geoLocation) === null || _dsoDetails$address8$ === void 0 ? void 0 : _dsoDetails$address8$.latitude) || "",
6132
6133
  longitude: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$address9 = dsoDetails.address) === null || _dsoDetails$address9 === void 0 ? void 0 : (_dsoDetails$address9$ = _dsoDetails$address9.geoLocation) === null || _dsoDetails$address9$ === void 0 ? void 0 : _dsoDetails$address9$.longitude) || ""
@@ -6145,6 +6146,12 @@ const EditVendor = () => {
6145
6146
  }),
6146
6147
  houseNo: dsoDetails.address.doorNo,
6147
6148
  street: dsoDetails.address.street,
6149
+ subLocality: dsoDetails.address.subLocality,
6150
+ addressLine1: dsoDetails.address.addressLine1,
6151
+ addressLine2: dsoDetails.address.addressLine2,
6152
+ actualAssembly: dsoDetails.address.actualAssembly,
6153
+ actualWard: dsoDetails.address.actualWard,
6154
+ actualZone: dsoDetails.address.actualZone,
6148
6155
  landmark: dsoDetails.address.landmark,
6149
6156
  geoLocation: {
6150
6157
  latitude: (_dsoDetails$address$g = dsoDetails.address.geoLocation) === null || _dsoDetails$address$g === void 0 ? void 0 : _dsoDetails$address$g.latitude,
@@ -6164,11 +6171,15 @@ const EditVendor = () => {
6164
6171
  contractStartDate: Digit.DateUtils.ConvertTimestampToDate(dsoDetails.contractStartDate, "yyyy-MM-dd"),
6165
6172
  fatherOrHusbandName: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.fatherOrHusbandName,
6166
6173
  relationship: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner4 = dsoDetails.owner) === null || _dsoDetails$owner4 === void 0 ? void 0 : _dsoDetails$owner4.relationship,
6167
- gender: genderMenu.find(ele => ele.code === dsoDetails.owner.gender),
6168
- dob: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner5 = dsoDetails.owner) === null || _dsoDetails$owner5 === void 0 ? void 0 : _dsoDetails$owner5.dob) && Digit.DateUtils.ConvertTimestampToDate(dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner6 = dsoDetails.owner) === null || _dsoDetails$owner6 === void 0 ? void 0 : _dsoDetails$owner6.dob, "yyyy-MM-dd"),
6169
- emailId: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner7 = dsoDetails.owner) === null || _dsoDetails$owner7 === void 0 ? void 0 : _dsoDetails$owner7.emailId) === "abc@egov.com" ? "" : dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner8 = dsoDetails.owner) === null || _dsoDetails$owner8 === void 0 ? void 0 : _dsoDetails$owner8.emailId,
6170
- correspondenceAddress: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner9 = dsoDetails.owner) === null || _dsoDetails$owner9 === void 0 ? void 0 : _dsoDetails$owner9.correspondenceAddress,
6171
- additionalDetails: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona3 = dsoDetails.additionalDetails) === null || _dsoDetails$additiona3 === void 0 ? void 0 : _dsoDetails$additiona3.description,
6174
+ gender: dsoDetails !== null && dsoDetails !== void 0 && (_dsoDetails$owner5 = dsoDetails.owner) !== null && _dsoDetails$owner5 !== void 0 && _dsoDetails$owner5.gender ? {
6175
+ code: dsoDetails.owner.gender,
6176
+ value: dsoDetails.owner.gender,
6177
+ i18nKey: "COMMON_GENDER_" + dsoDetails.owner.gender
6178
+ } : null,
6179
+ dob: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner6 = dsoDetails.owner) === null || _dsoDetails$owner6 === void 0 ? void 0 : _dsoDetails$owner6.dob) && Digit.DateUtils.ConvertTimestampToDate(dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner7 = dsoDetails.owner) === null || _dsoDetails$owner7 === void 0 ? void 0 : _dsoDetails$owner7.dob, "yyyy-MM-dd"),
6180
+ emailId: (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner8 = dsoDetails.owner) === null || _dsoDetails$owner8 === void 0 ? void 0 : _dsoDetails$owner8.emailId) === "abc@egov.com" ? "" : dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner9 = dsoDetails.owner) === null || _dsoDetails$owner9 === void 0 ? void 0 : _dsoDetails$owner9.emailId,
6181
+ correspondenceAddress: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner0 = dsoDetails.owner) === null || _dsoDetails$owner0 === void 0 ? void 0 : _dsoDetails$owner0.correspondenceAddress,
6182
+ additionalDetails: dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona4 = dsoDetails.additionalDetails) === null || _dsoDetails$additiona4 === void 0 ? void 0 : _dsoDetails$additiona4.description,
6172
6183
  vendorId: dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vendor_id,
6173
6184
  serviceType: serviceType,
6174
6185
  zoneIds: dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.zoneIds
@@ -6187,16 +6198,6 @@ const EditVendor = () => {
6187
6198
  })
6188
6199
  }));
6189
6200
  }, [dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.zoneIds, zones]);
6190
- useEffect(() => {
6191
- var _dsoDetails$owner0;
6192
- if (!genderMenu.length || !(dsoDetails !== null && dsoDetails !== void 0 && (_dsoDetails$owner0 = dsoDetails.owner) !== null && _dsoDetails$owner0 !== void 0 && _dsoDetails$owner0.gender)) return;
6193
- const matchedGender = genderMenu.find(ele => ele.code === dsoDetails.owner.gender);
6194
- if (matchedGender) {
6195
- setDefaultValues(prev => _extends({}, prev, {
6196
- gender: matchedGender
6197
- }));
6198
- }
6199
- }, [genderMenu, dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner1 = dsoDetails.owner) === null || _dsoDetails$owner1 === void 0 ? void 0 : _dsoDetails$owner1.gender]);
6200
6201
  const onFormValueChange = (setValue, data) => {
6201
6202
  var _data$serviceType, _data$serviceType2, _data$serviceType2$co, _data$serviceType3, _data$serviceType3$i;
6202
6203
  const isVendorDetailsFilled = (data === null || data === void 0 ? void 0 : data.vendorName) && (data === null || data === void 0 ? void 0 : data.phone) && (data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code);
@@ -6216,8 +6217,8 @@ const EditVendor = () => {
6216
6217
  setShowToast(null);
6217
6218
  };
6218
6219
  const onSubmit = data => {
6219
- var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$serviceTy2, _mergedData$serviceTy3, _mergedData$serviceTy4, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy5;
6220
- const mergedData = data;
6220
+ var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _address$subLocality, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$serviceTy2, _mergedData$serviceTy3, _mergedData$serviceTy4, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _defaultValues$gender, _mergedData$serviceTy5;
6221
+ const mergedData = _extends({}, data);
6221
6222
  const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
6222
6223
  const pincode = address === null || address === void 0 ? void 0 : address.pincode;
6223
6224
  const street = address === null || address === void 0 ? void 0 : address.streetName;
@@ -6232,6 +6233,12 @@ const EditVendor = () => {
6232
6233
  const localityArea = address === null || address === void 0 ? void 0 : address.subLocality;
6233
6234
  const wardCode = address === null || address === void 0 ? void 0 : (_address$ward = address.ward) === null || _address$ward === void 0 ? void 0 : _address$ward.code;
6234
6235
  const wardName = address === null || address === void 0 ? void 0 : (_address$ward2 = address.ward) === null || _address$ward2 === void 0 ? void 0 : _address$ward2.name;
6236
+ const subLocality = (address === null || address === void 0 ? void 0 : address.subLocality) || (address === null || address === void 0 ? void 0 : (_address$subLocality = address.subLocality) === null || _address$subLocality === void 0 ? void 0 : _address$subLocality.name) || (address === null || address === void 0 ? void 0 : address.subLocality);
6237
+ const addressLine1 = address === null || address === void 0 ? void 0 : address.addressLine1;
6238
+ const addressLine2 = address === null || address === void 0 ? void 0 : address.addressLine2;
6239
+ const actualAssembly = address === null || address === void 0 ? void 0 : address.actualAssembly;
6240
+ const actualWard = address === null || address === void 0 ? void 0 : address.actualWard;
6241
+ const actualZone = address === null || address === void 0 ? void 0 : address.actualZone;
6235
6242
  const name = mergedData === null || mergedData === void 0 ? void 0 : mergedData.vendorName;
6236
6243
  const plotNo = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$plotNo = mergedData.plotNo) === null || _mergedData$plotNo === void 0 ? void 0 : _mergedData$plotNo.trim();
6237
6244
  const buildingName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$buildingN = mergedData.buildingName) === null || _mergedData$buildingN === void 0 ? void 0 : _mergedData$buildingN.trim();
@@ -6262,6 +6269,12 @@ const EditVendor = () => {
6262
6269
  label: "Locality",
6263
6270
  area: localityArea || ""
6264
6271
  }),
6272
+ subLocality,
6273
+ addressLine1,
6274
+ addressLine2,
6275
+ actualAssembly,
6276
+ actualWard,
6277
+ actualZone,
6265
6278
  ward: wardCode ? {
6266
6279
  code: wardCode,
6267
6280
  name: wardName
@@ -6276,7 +6289,7 @@ const EditVendor = () => {
6276
6289
  name: (mergedData === null || mergedData === void 0 ? void 0 : mergedData.ownerName) || name,
6277
6290
  fatherOrHusbandName: (mergedData === null || mergedData === void 0 ? void 0 : mergedData.fatherOrHusbandName) || name,
6278
6291
  relationship: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$relations = mergedData.relationship) === null || _mergedData$relations === void 0 ? void 0 : _mergedData$relations.code) || "OTHER",
6279
- gender: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$gender = mergedData.gender) === null || _mergedData$gender === void 0 ? void 0 : _mergedData$gender.code) || (mergedData === null || mergedData === void 0 ? void 0 : mergedData.gender),
6292
+ gender: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$gender = mergedData.gender) === null || _mergedData$gender === void 0 ? void 0 : _mergedData$gender.code) || (mergedData === null || mergedData === void 0 ? void 0 : mergedData.gender) || (defaultValues === null || defaultValues === void 0 ? void 0 : (_defaultValues$gender = defaultValues.gender) === null || _defaultValues$gender === void 0 ? void 0 : _defaultValues$gender.code),
6280
6293
  dob: mergedData !== null && mergedData !== void 0 && mergedData.dob ? new Date(mergedData.dob).getTime() : new Date("1/1/1970").getTime(),
6281
6294
  emailId: emailId || "",
6282
6295
  mobileNumber: phone
@@ -6327,8 +6340,9 @@ const EditVendor = () => {
6327
6340
  });
6328
6341
  };
6329
6342
  const config = React.useMemo(() => {
6330
- var _defaultValues$servic;
6331
- return VendorConfig(t, (defaultValues === null || defaultValues === void 0 ? void 0 : (_defaultValues$servic = defaultValues.serviceType) === null || _defaultValues$servic === void 0 ? void 0 : _defaultValues$servic.i18nKey) || "", genderMenu, true);
6343
+ var _dsoDetails$additiona5, _defaultValues$servic;
6344
+ const addressHeader = (dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$additiona5 = dsoDetails.additionalDetails) === null || _dsoDetails$additiona5 === void 0 ? void 0 : _dsoDetails$additiona5.serviceType) === "ekyc" ? "PT_LOCATION_DETAILS_EKYC" : "PT_LOCATION_DETAILS";
6345
+ return VendorConfig(t, (defaultValues === null || defaultValues === void 0 ? void 0 : (_defaultValues$servic = defaultValues.serviceType) === null || _defaultValues$servic === void 0 ? void 0 : _defaultValues$servic.i18nKey) || "", genderMenu, true, addressHeader);
6332
6346
  }, [t, defaultValues === null || defaultValues === void 0 ? void 0 : (_defaultValues$servic2 = defaultValues.serviceType) === null || _defaultValues$servic2 === void 0 ? void 0 : _defaultValues$servic2.i18nKey, genderMenu]);
6333
6347
  if (daoDataLoading || isLoading || Object.keys(defaultValues).length === 0) {
6334
6348
  return /*#__PURE__*/React.createElement(Loader, null);