@mseva/digit-ui-module-garbagecollection 1.0.23 → 1.0.24

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.
Files changed (5) hide show
  1. package/dist/index.js +226 -98
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.modern.js +213 -94
  4. package/dist/index.modern.js.map +1 -1
  5. package/package.json +1 -1
package/dist/index.modern.js CHANGED
@@ -2780,6 +2780,8 @@ const CHBCitizenSecond = ({
2780
2780
  const isCitizen = window.location.href.includes("citizen");
2781
2781
  const [getPropertyId, setPropertyId] = useState(null);
2782
2782
  const [loader, setLoader] = useState(false);
2783
+ const [showToast, setShowToast] = useState(false);
2784
+ const [error, setError] = useState("");
2783
2785
  const {
2784
2786
  data: GCData = [],
2785
2787
  isLoading: GCLoading
@@ -2824,47 +2826,100 @@ const CHBCitizenSecond = ({
2824
2826
  }
2825
2827
  });
2826
2828
  const onSubmit = async data => {
2827
- var _data$frequency, _data$typeOfWaste, _data$propertyType, _data$connectionCateg, _data$connectionCateg2;
2828
- setLoader(true);
2829
- console.log("data", data);
2830
- console.log("currentStepData", currentStepData);
2831
- const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2832
- const payload = {
2833
- GarbageConnection: {
2834
- tenantId: tenantId,
2835
- propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2836
- frequency: data === null || data === void 0 ? void 0 : (_data$frequency = data.frequency) === null || _data$frequency === void 0 ? void 0 : _data$frequency.name,
2837
- typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste = data.typeOfWaste) === null || _data$typeOfWaste === void 0 ? void 0 : _data$typeOfWaste.name,
2838
- propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType = data.propertyType) === null || _data$propertyType === void 0 ? void 0 : _data$propertyType.name,
2839
- plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2840
- location: data === null || data === void 0 ? void 0 : data.location,
2841
- applicationType: "NEW_GARBAGE_CONNECTION",
2842
- connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg = data.connectionCategory) === null || _data$connectionCateg === void 0 ? void 0 : _data$connectionCateg.name,
2843
- connectionHolders: [{
2844
- name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2845
- mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2846
- address: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2847
- emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2848
- type: "CITIZEN"
2849
- }],
2850
- processInstance: {
2851
- businessService: "NewGC",
2852
- action: "INITIATE",
2853
- moduleName: "gc-services"
2854
- },
2855
- additionalDetails: {
2856
- connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg2 = data.connectionCategory) === null || _data$connectionCateg2 === void 0 ? void 0 : _data$connectionCateg2.name
2829
+ var _currentStepData$venu, _currentStepData$apiR;
2830
+ if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$venu = currentStepData.venueDetails) !== null && _currentStepData$venu !== void 0 && _currentStepData$venu.applicationNo || currentStepData !== null && currentStepData !== void 0 && (_currentStepData$apiR = currentStepData.apiResponseData) !== null && _currentStepData$apiR !== void 0 && _currentStepData$apiR.applicationNo) {
2831
+ var _data$frequency, _data$typeOfWaste, _data$propertyType, _data$connectionCateg, _currentStepData$venu2, _data$connectionCateg2;
2832
+ const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2833
+ const updatedDatacheck = (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData);
2834
+ const payload = {
2835
+ GarbageConnection: {
2836
+ ...updatedDatacheck,
2837
+ tenantId: tenantId,
2838
+ propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2839
+ frequency: data === null || data === void 0 ? void 0 : (_data$frequency = data.frequency) === null || _data$frequency === void 0 ? void 0 : _data$frequency.name,
2840
+ typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste = data.typeOfWaste) === null || _data$typeOfWaste === void 0 ? void 0 : _data$typeOfWaste.name,
2841
+ propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType = data.propertyType) === null || _data$propertyType === void 0 ? void 0 : _data$propertyType.name,
2842
+ plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2843
+ location: data === null || data === void 0 ? void 0 : data.location,
2844
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg = data.connectionCategory) === null || _data$connectionCateg === void 0 ? void 0 : _data$connectionCateg.name,
2845
+ connectionHolders: [{
2846
+ name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2847
+ mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2848
+ permanentAddress: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2849
+ emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2850
+ type: "CITIZEN"
2851
+ }],
2852
+ processInstance: {
2853
+ ...(currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$venu2 = currentStepData.venueDetails) === null || _currentStepData$venu2 === void 0 ? void 0 : _currentStepData$venu2.processInstance),
2854
+ action: "DRAFT"
2855
+ },
2856
+ additionalDetails: {
2857
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg2 = data.connectionCategory) === null || _data$connectionCateg2 === void 0 ? void 0 : _data$connectionCateg2.name
2858
+ }
2857
2859
  }
2860
+ };
2861
+ console.log("payload check", payload);
2862
+ setLoader(true);
2863
+ try {
2864
+ var _response$GarbageConn;
2865
+ const response = await Digit.GCService.update(payload);
2866
+ setLoader(false);
2867
+ console.log("response", response);
2868
+ goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]);
2869
+ } catch (error) {
2870
+ var _error$response$data, _error$response$data$, _error$response$data$2;
2871
+ setLoader(false);
2872
+ console.log("Response Data:", error.response.data);
2873
+ setShowToast(true);
2874
+ setError((_error$response$data = error.response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message);
2875
+ }
2876
+ } else {
2877
+ var _data$frequency2, _data$typeOfWaste2, _data$propertyType2, _data$connectionCateg3, _data$connectionCateg4;
2878
+ setLoader(true);
2879
+ console.log("data", data);
2880
+ console.log("currentStepData", currentStepData);
2881
+ const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2882
+ const payload = {
2883
+ GarbageConnection: {
2884
+ tenantId: tenantId,
2885
+ propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2886
+ frequency: data === null || data === void 0 ? void 0 : (_data$frequency2 = data.frequency) === null || _data$frequency2 === void 0 ? void 0 : _data$frequency2.name,
2887
+ typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste2 = data.typeOfWaste) === null || _data$typeOfWaste2 === void 0 ? void 0 : _data$typeOfWaste2.name,
2888
+ propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType2 = data.propertyType) === null || _data$propertyType2 === void 0 ? void 0 : _data$propertyType2.name,
2889
+ plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2890
+ location: data === null || data === void 0 ? void 0 : data.location,
2891
+ applicationType: "NEW_GARBAGE_CONNECTION",
2892
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg3 = data.connectionCategory) === null || _data$connectionCateg3 === void 0 ? void 0 : _data$connectionCateg3.name,
2893
+ connectionHolders: [{
2894
+ name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2895
+ mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2896
+ permanentAddress: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2897
+ emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2898
+ type: "CITIZEN"
2899
+ }],
2900
+ processInstance: {
2901
+ businessService: "NewGC",
2902
+ action: "INITIATE",
2903
+ moduleName: "gc-services"
2904
+ },
2905
+ additionalDetails: {
2906
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg4 = data.connectionCategory) === null || _data$connectionCateg4 === void 0 ? void 0 : _data$connectionCateg4.name
2907
+ }
2908
+ }
2909
+ };
2910
+ try {
2911
+ var _response$GarbageConn2;
2912
+ const response = await Digit.GCService.create(payload);
2913
+ setLoader(false);
2914
+ console.log("response", response);
2915
+ goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn2 = response.GarbageConnection) === null || _response$GarbageConn2 === void 0 ? void 0 : _response$GarbageConn2[0]);
2916
+ } catch (error) {
2917
+ var _error$response$data2, _error$response$data3, _error$response$data4;
2918
+ setLoader(false);
2919
+ console.log("Response Data:", error.response.data);
2920
+ setShowToast(true);
2921
+ setError((_error$response$data2 = error.response.data) === null || _error$response$data2 === void 0 ? void 0 : (_error$response$data3 = _error$response$data2.Errors) === null || _error$response$data3 === void 0 ? void 0 : (_error$response$data4 = _error$response$data3[0]) === null || _error$response$data4 === void 0 ? void 0 : _error$response$data4.message);
2858
2922
  }
2859
- };
2860
- try {
2861
- var _response$GarbageConn;
2862
- const response = await Digit.GCService.create(payload);
2863
- setLoader(false);
2864
- console.log("response", response);
2865
- goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]);
2866
- } catch (error) {
2867
- setLoader(false);
2868
2923
  }
2869
2924
  };
2870
2925
  const {
@@ -2885,32 +2940,52 @@ const CHBCitizenSecond = ({
2885
2940
  });
2886
2941
  useEffect(() => {
2887
2942
  console.log("propertyDetailsFetch==", propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties);
2888
- if (propertyDetailsFetch !== null && propertyDetailsFetch !== void 0 && propertyDetailsFetch.Properties || currentStepData !== null && currentStepData !== void 0 && currentStepData.venueDetails) {
2889
- var _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _GCData$swServicesC, _FreqType$gcServices, _WasteType$gcService, _propertyDetailsFetch7, _propertyDetailsFetch8, _backStepData$propert, _backStepData$frequen, _backStepData$typeOfW;
2890
- const backStepData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails;
2943
+ console.log("currentStepData==", currentStepData);
2944
+ if (propertyDetailsFetch !== null && propertyDetailsFetch !== void 0 && propertyDetailsFetch.Properties || currentStepData !== null && currentStepData !== void 0 && currentStepData.venueDetails || currentStepData !== null && currentStepData !== void 0 && currentStepData.apiResponseData) {
2945
+ var _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _GCData$swServicesC, _FreqType$gcServices, _WasteType$gcService, _connectionCategory$g, _propertyDetailsFetch7, _propertyDetailsFetch8;
2946
+ const backStepData = (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData);
2891
2947
  const location = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch2 = _propertyDetailsFetch[0]) === null || _propertyDetailsFetch2 === void 0 ? void 0 : (_propertyDetailsFetch3 = _propertyDetailsFetch2.owners) === null || _propertyDetailsFetch3 === void 0 ? void 0 : (_propertyDetailsFetch4 = _propertyDetailsFetch3[0]) === null || _propertyDetailsFetch4 === void 0 ? void 0 : _propertyDetailsFetch4.permanentAddress) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.location);
2892
2948
  const plotSize = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch5 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch5 === void 0 ? void 0 : (_propertyDetailsFetch6 = _propertyDetailsFetch5[0]) === null || _propertyDetailsFetch6 === void 0 ? void 0 : _propertyDetailsFetch6.landArea) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.plotSize);
2893
2949
  if (backStepData !== null && backStepData !== void 0 && backStepData.propertyId) setValue("propertyId", backStepData === null || backStepData === void 0 ? void 0 : backStepData.propertyId);
2894
2950
  setValue("location", location);
2895
2951
  setValue("plotSize", plotSize);
2896
2952
  const pTypeOptions = (GCData === null || GCData === void 0 ? void 0 : (_GCData$swServicesC = GCData["sw-services-calculation"]) === null || _GCData$swServicesC === void 0 ? void 0 : _GCData$swServicesC.PropertyUsageType) || [];
2953
+ console.log("pTypeOptions", pTypeOptions);
2897
2954
  const freqTypeOptions = (FreqType === null || FreqType === void 0 ? void 0 : (_FreqType$gcServices = FreqType["gc-services-masters"]) === null || _FreqType$gcServices === void 0 ? void 0 : _FreqType$gcServices.GarbageCollectionFrequency) || [];
2898
2955
  const wasteTypeOptions = (WasteType === null || WasteType === void 0 ? void 0 : (_WasteType$gcService = WasteType["gc-services-masters"]) === null || _WasteType$gcService === void 0 ? void 0 : _WasteType$gcService.TypeOfWaste) || [];
2899
- const usage = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : _propertyDetailsFetch8.usageCategory) || (backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$propert = backStepData.propertyType) === null || _backStepData$propert === void 0 ? void 0 : _backStepData$propert.code);
2900
- const frequency = backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$frequen = backStepData.frequency) === null || _backStepData$frequen === void 0 ? void 0 : _backStepData$frequen.code;
2901
- const typeOfWaste = backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$typeOfW = backStepData.typeOfWaste) === null || _backStepData$typeOfW === void 0 ? void 0 : _backStepData$typeOfW.code;
2902
- const pType = pTypeOptions === null || pTypeOptions === void 0 ? void 0 : pTypeOptions.find(item => item.code == usage);
2903
- const freType = freqTypeOptions === null || freqTypeOptions === void 0 ? void 0 : freqTypeOptions.find(item => item.code == frequency);
2904
- const wasteType = wasteTypeOptions === null || wasteTypeOptions === void 0 ? void 0 : wasteTypeOptions.find(item => item.code == typeOfWaste);
2956
+ const connectionCatoptions = (connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g === void 0 ? void 0 : _connectionCategory$g.connectionCategory) || [];
2957
+ console.log("connectionCatoptions", connectionCatoptions);
2958
+ const usage = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : _propertyDetailsFetch8.usageCategory) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.propertyType);
2959
+ const frequency = backStepData === null || backStepData === void 0 ? void 0 : backStepData.frequency;
2960
+ const typeOfWaste = backStepData === null || backStepData === void 0 ? void 0 : backStepData.typeOfWaste;
2961
+ const connetionType = backStepData === null || backStepData === void 0 ? void 0 : backStepData.connectionCategory;
2962
+ const pType = pTypeOptions === null || pTypeOptions === void 0 ? void 0 : pTypeOptions.find(item => item.name == usage);
2963
+ const freType = freqTypeOptions === null || freqTypeOptions === void 0 ? void 0 : freqTypeOptions.find(item => item.name == frequency);
2964
+ const wasteType = wasteTypeOptions === null || wasteTypeOptions === void 0 ? void 0 : wasteTypeOptions.find(item => item.name == typeOfWaste);
2965
+ const connectionCategoryType = connectionCatoptions === null || connectionCatoptions === void 0 ? void 0 : connectionCatoptions.find(item => item.code == connetionType);
2905
2966
  setValue("propertyType", pType || null);
2906
2967
  setValue("frequency", freType || null);
2907
2968
  setValue("typeOfWaste", wasteType || null);
2969
+ setValue("connectionCategory", connectionCategoryType || null);
2908
2970
  }
2909
2971
  }, [propertyDetailsFetch, GCData, setValue, currentStepData]);
2910
2972
  const searchProperty = async () => {
2911
2973
  const pId = watch("propertyId");
2912
2974
  setPropertyId(pId);
2913
2975
  };
2976
+ const closeToast = () => {
2977
+ setShowToast(false);
2978
+ setError("");
2979
+ };
2980
+ const handleReset = () => {
2981
+ setValue("propertyType", null);
2982
+ setValue("plotSize", "");
2983
+ setValue("location", "");
2984
+ setValue("frequency", null);
2985
+ setValue("typeOfWaste", null);
2986
+ setValue("connectionCategory", null);
2987
+ setPropertyId(null);
2988
+ };
2914
2989
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("form", {
2915
2990
  style: {
2916
2991
  paddingBottom: "150px"
@@ -2943,6 +3018,7 @@ const CHBCitizenSecond = ({
2943
3018
  value: props.value,
2944
3019
  onChange: e => {
2945
3020
  props.onChange(e.target.value);
3021
+ handleReset();
2946
3022
  },
2947
3023
  t: t
2948
3024
  })
@@ -2959,7 +3035,7 @@ const CHBCitizenSecond = ({
2959
3035
  style: {
2960
3036
  color: "red"
2961
3037
  }
2962
- }, errors.propertyId.message)), ((propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
3038
+ }, errors.propertyId.message)), ((propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
2963
3039
  style: {
2964
3040
  marginBottom: "20px"
2965
3041
  }
@@ -3129,7 +3205,7 @@ const CHBCitizenSecond = ({
3129
3205
  required: t("GC_CONNECTION_TYPE_REQUIRED")
3130
3206
  },
3131
3207
  render: props => {
3132
- var _connectionCategory$g;
3208
+ var _connectionCategory$g2;
3133
3209
  return /*#__PURE__*/React.createElement(Dropdown, {
3134
3210
  style: {
3135
3211
  marginBottom: 0
@@ -3139,7 +3215,7 @@ const CHBCitizenSecond = ({
3139
3215
  props.onChange(e);
3140
3216
  },
3141
3217
  selected: props.value,
3142
- option: connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g === void 0 ? void 0 : _connectionCategory$g.connectionCategory,
3218
+ option: connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g2 = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g2 === void 0 ? void 0 : _connectionCategory$g2.connectionCategory,
3143
3219
  optionKey: "name"
3144
3220
  });
3145
3221
  }
@@ -3159,7 +3235,12 @@ const CHBCitizenSecond = ({
3159
3235
  }), /*#__PURE__*/React.createElement(SubmitBar, {
3160
3236
  label: "Next",
3161
3237
  submit: "submit"
3162
- }))), (loader || isLoading || GCLoading || WasteTypeLoading || FreqTypeLoading || connectionCategoryLoading) && /*#__PURE__*/React.createElement(Loader, {
3238
+ }))), showToast && /*#__PURE__*/React.createElement(Toast, {
3239
+ isDleteBtn: true,
3240
+ error: true,
3241
+ label: error,
3242
+ onClose: closeToast
3243
+ }), (loader || isLoading || GCLoading || WasteTypeLoading || FreqTypeLoading || connectionCategoryLoading) && /*#__PURE__*/React.createElement(Loader, {
3163
3244
  page: true
3164
3245
  }));
3165
3246
  };
@@ -9036,9 +9117,16 @@ const CHBCitizenDetailsNew = ({
9036
9117
  currentStepData,
9037
9118
  onGoBack
9038
9119
  }) => {
9039
- var _user$info, _user$info2, _user$info3;
9120
+ var _history$location, _user$info, _user$info2, _user$info3;
9121
+ const dispatch = useDispatch();
9040
9122
  const isCitizen = window.location.href.includes("citizen");
9041
9123
  const user = Digit.UserService.getUser();
9124
+ const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
9125
+ const history = useHistory();
9126
+ const [loader, setLoader] = useState(false);
9127
+ const pathname = (history === null || history === void 0 ? void 0 : (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.pathname) || "";
9128
+ const applicationNumber = pathname === null || pathname === void 0 ? void 0 : pathname.split("/").pop();
9129
+ console.log("applicationNumber", applicationNumber);
9042
9130
  const {
9043
9131
  control,
9044
9132
  handleSubmit,
@@ -9055,6 +9143,31 @@ const CHBCitizenDetailsNew = ({
9055
9143
  address: ""
9056
9144
  }
9057
9145
  });
9146
+ const fetchChallans = async filters => {
9147
+ setLoader(true);
9148
+ try {
9149
+ var _responseData$Garbage;
9150
+ const responseData = await Digit.GCService.search({
9151
+ tenantId,
9152
+ filters
9153
+ });
9154
+ console.log("search ", responseData);
9155
+ dispatch(UPDATE_GarbageApplication_FORM("apiResponseData", responseData === null || responseData === void 0 ? void 0 : (_responseData$Garbage = responseData.GarbageConnection) === null || _responseData$Garbage === void 0 ? void 0 : _responseData$Garbage[0]));
9156
+ setLoader(false);
9157
+ } catch (error) {
9158
+ console.log("error", error);
9159
+ setLoader(false);
9160
+ }
9161
+ };
9162
+ useEffect(() => {
9163
+ console.log("tes===", applicationNumber);
9164
+ if (applicationNumber) {
9165
+ console.log("here");
9166
+ const filters = {};
9167
+ filters.applicationNumber = applicationNumber;
9168
+ fetchChallans(filters);
9169
+ }
9170
+ }, [applicationNumber]);
9058
9171
  const onSubmit = async data => {
9059
9172
  console.log("data===", data);
9060
9173
  goNext(data);
@@ -9062,12 +9175,20 @@ const CHBCitizenDetailsNew = ({
9062
9175
  useEffect(() => {
9063
9176
  console.log("currentStepData", currentStepData);
9064
9177
  const formattedData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
9178
+ const apiRes = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData;
9065
9179
  if (formattedData) {
9066
9180
  setValue("address", formattedData === null || formattedData === void 0 ? void 0 : formattedData.address);
9067
9181
  setValue("emailId", formattedData === null || formattedData === void 0 ? void 0 : formattedData.emailId);
9068
9182
  setValue("mobileNumber", formattedData === null || formattedData === void 0 ? void 0 : formattedData.mobileNumber);
9069
9183
  setValue("name", formattedData === null || formattedData === void 0 ? void 0 : formattedData.name);
9070
9184
  }
9185
+ if (apiRes) {
9186
+ var _apiRes$connectionHol, _apiRes$connectionHol2, _apiRes$connectionHol3, _apiRes$connectionHol4, _apiRes$connectionHol5, _apiRes$connectionHol6, _apiRes$connectionHol7, _apiRes$connectionHol8;
9187
+ setValue("address", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol = apiRes.connectionHolders) === null || _apiRes$connectionHol === void 0 ? void 0 : (_apiRes$connectionHol2 = _apiRes$connectionHol[0]) === null || _apiRes$connectionHol2 === void 0 ? void 0 : _apiRes$connectionHol2.permanentAddress);
9188
+ setValue("emailId", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol3 = apiRes.connectionHolders) === null || _apiRes$connectionHol3 === void 0 ? void 0 : (_apiRes$connectionHol4 = _apiRes$connectionHol3[0]) === null || _apiRes$connectionHol4 === void 0 ? void 0 : _apiRes$connectionHol4.emailId);
9189
+ setValue("mobileNumber", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol5 = apiRes.connectionHolders) === null || _apiRes$connectionHol5 === void 0 ? void 0 : (_apiRes$connectionHol6 = _apiRes$connectionHol5[0]) === null || _apiRes$connectionHol6 === void 0 ? void 0 : _apiRes$connectionHol6.mobileNumber);
9190
+ setValue("name", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol7 = apiRes.connectionHolders) === null || _apiRes$connectionHol7 === void 0 ? void 0 : (_apiRes$connectionHol8 = _apiRes$connectionHol7[0]) === null || _apiRes$connectionHol8 === void 0 ? void 0 : _apiRes$connectionHol8.name);
9191
+ }
9071
9192
  }, [currentStepData, setValue]);
9072
9193
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("form", {
9073
9194
  onSubmit: handleSubmit(onSubmit)
@@ -9219,7 +9340,9 @@ const CHBCitizenDetailsNew = ({
9219
9340
  }, errors.address.message))), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
9220
9341
  label: "Next",
9221
9342
  submit: "submit"
9222
- }))));
9343
+ }))), loader && /*#__PURE__*/React.createElement(Loader, {
9344
+ page: true
9345
+ }));
9223
9346
  };
9224
9347
 
9225
9348
  const NewADSStepFormTwo = ({
@@ -9283,7 +9406,6 @@ const NewADSStepFormThree = ({
9283
9406
  return state.gc.GarbageApplicationFormReducer.formData && state.gc.GarbageApplicationFormReducer.formData[config === null || config === void 0 ? void 0 : config.key] ? state.gc.GarbageApplicationFormReducer.formData[config === null || config === void 0 ? void 0 : config.key] : {};
9284
9407
  });
9285
9408
  const goNext = async finalData => {
9286
- var _checkFormData$docume, _checkFormData$docume2, _checkFormData$venueD;
9287
9409
  const missingFields = validation(finalData);
9288
9410
  if (missingFields.length > 0) {
9289
9411
  setError(`${t("GC_" + missingFields[0].replace(".", "_").toUpperCase())}`);
@@ -9291,28 +9413,7 @@ const NewADSStepFormThree = ({
9291
9413
  setTimeout(() => setShowToast(false), 3000);
9292
9414
  return;
9293
9415
  }
9294
- console.log("checkFormData", checkFormData);
9295
- setLoader(true);
9296
- const payload = {
9297
- GarbageConnection: {
9298
- ...(checkFormData === null || checkFormData === void 0 ? void 0 : checkFormData.venueDetails),
9299
- documents: checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$docume = checkFormData.documents) === null || _checkFormData$docume === void 0 ? void 0 : (_checkFormData$docume2 = _checkFormData$docume.documents) === null || _checkFormData$docume2 === void 0 ? void 0 : _checkFormData$docume2.documents,
9300
- processInstance: {
9301
- ...(checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$venueD = checkFormData.venueDetails) === null || _checkFormData$venueD === void 0 ? void 0 : _checkFormData$venueD.processInstance),
9302
- action: "DRAFT"
9303
- }
9304
- }
9305
- };
9306
- try {
9307
- var _response$GarbageConn;
9308
- const response = await Digit.GCService.update(payload);
9309
- console.log("response", response);
9310
- setLoader(false);
9311
- dispatch(UPDATE_GarbageApplication_FORM("venueDetails", response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]));
9312
- onGoNext();
9313
- } catch (error) {
9314
- setLoader(false);
9315
- }
9416
+ onGoNext();
9316
9417
  };
9317
9418
  function validation(formData) {
9318
9419
  if (!isLoading) {
@@ -9504,7 +9605,7 @@ function CHBSummary({
9504
9605
  goNext,
9505
9606
  onGoBack
9506
9607
  }) {
9507
- var _formData$documents, _formData$documents$d, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$venueDetail, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _formData$ownerDetail, _formData$ownerDetail2, _formData$ownerDetail3, _formData$ownerDetail4, _formData$venueDetail2, _formData$venueDetail3, _formData$venueDetail4, _formData$venueDetail5, _formData$venueDetail6, _formData$venueDetail7, _formData$venueDetail8, _formData$venueDetail9, _formData$venueDetail0, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
9608
+ var _formData$documents, _formData$documents$d, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$venueDetail, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _formData$ownerDetail, _formData$ownerDetail2, _formData$ownerDetail3, _formData$ownerDetail4, _formData$venueDetail2, _formData$venueDetail3, _formData$venueDetail4, _formData$venueDetail5, _formData$venueDetail6, _formData$venueDetail7, _formData$venueDetail8, _formData$venueDetail9, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
9508
9609
  const {
9509
9610
  t
9510
9611
  } = useTranslation();
@@ -9592,13 +9693,13 @@ function CHBSummary({
9592
9693
  style: {
9593
9694
  fontSize: "24px"
9594
9695
  }
9595
- }, t("PT_DETAILS")), renderLabel(t("NDC_MSG_PROPERTY_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail2 = formData.venueDetails) === null || _formData$venueDetail2 === void 0 ? void 0 : _formData$venueDetail2.propertyId), renderLabel(t("NDC_MSG_PROPERTY_TYPE_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail3 = formData.venueDetails) === null || _formData$venueDetail3 === void 0 ? void 0 : (_formData$venueDetail4 = _formData$venueDetail3.propertyType) === null || _formData$venueDetail4 === void 0 ? void 0 : _formData$venueDetail4.name), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail5 = formData.venueDetails) === null || _formData$venueDetail5 === void 0 ? void 0 : _formData$venueDetail5.plotSize), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ADDRESS"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail6 = formData.venueDetails) === null || _formData$venueDetail6 === void 0 ? void 0 : _formData$venueDetail6.location)), /*#__PURE__*/React.createElement("div", {
9696
+ }, t("PT_DETAILS")), renderLabel(t("NDC_MSG_PROPERTY_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail2 = formData.venueDetails) === null || _formData$venueDetail2 === void 0 ? void 0 : _formData$venueDetail2.propertyId), renderLabel(t("NDC_MSG_PROPERTY_TYPE_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail3 = formData.venueDetails) === null || _formData$venueDetail3 === void 0 ? void 0 : _formData$venueDetail3.propertyType), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail4 = formData.venueDetails) === null || _formData$venueDetail4 === void 0 ? void 0 : _formData$venueDetail4.plotSize), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ADDRESS"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail5 = formData.venueDetails) === null || _formData$venueDetail5 === void 0 ? void 0 : _formData$venueDetail5.location)), /*#__PURE__*/React.createElement("div", {
9596
9697
  style: sectionStyle
9597
9698
  }, /*#__PURE__*/React.createElement(CardSubHeader, {
9598
9699
  style: {
9599
9700
  fontSize: "24px"
9600
9701
  }
9601
- }, t("GC_CONNECTION_DETAILS")), renderLabel(t("GC_CONNECTION_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail7 = formData.venueDetails) === null || _formData$venueDetail7 === void 0 ? void 0 : _formData$venueDetail7.connectionCategory), renderLabel(t("GC_FREQUENCY"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail8 = formData.venueDetails) === null || _formData$venueDetail8 === void 0 ? void 0 : _formData$venueDetail8.frequency), renderLabel(t("GC_WASTE_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail9 = formData.venueDetails) === null || _formData$venueDetail9 === void 0 ? void 0 : _formData$venueDetail9.typeOfWaste), renderLabel(t("GC_LOCATION"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail0 = formData.venueDetails) === null || _formData$venueDetail0 === void 0 ? void 0 : _formData$venueDetail0.location)), /*#__PURE__*/React.createElement(CardSubHeader, {
9702
+ }, t("GC_CONNECTION_DETAILS")), renderLabel(t("GC_CONNECTION_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail6 = formData.venueDetails) === null || _formData$venueDetail6 === void 0 ? void 0 : _formData$venueDetail6.connectionCategory), renderLabel(t("GC_FREQUENCY"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail7 = formData.venueDetails) === null || _formData$venueDetail7 === void 0 ? void 0 : _formData$venueDetail7.frequency), renderLabel(t("GC_WASTE_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail8 = formData.venueDetails) === null || _formData$venueDetail8 === void 0 ? void 0 : _formData$venueDetail8.typeOfWaste), renderLabel(t("GC_LOCATION"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail9 = formData.venueDetails) === null || _formData$venueDetail9 === void 0 ? void 0 : _formData$venueDetail9.location)), /*#__PURE__*/React.createElement(CardSubHeader, {
9602
9703
  style: {
9603
9704
  fontSize: "24px",
9604
9705
  marginTop: "30px"
@@ -9676,15 +9777,22 @@ const NewADSStepFormFour = ({
9676
9777
  }
9677
9778
  };
9678
9779
  const onSubmit = async (data, actionStatus) => {
9679
- var _data$venueDetails;
9780
+ var _data$apiResponseData, _data$documents, _data$documents$docum, _data$venueDetails;
9680
9781
  setLoader(true);
9782
+ console.log("data", data);
9783
+ const apiDocs = (data === null || data === void 0 ? void 0 : (_data$apiResponseData = data.apiResponseData) === null || _data$apiResponseData === void 0 ? void 0 : _data$apiResponseData.documents) || [];
9784
+ const formDocs = (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : (_data$documents$docum = _data$documents.documents) === null || _data$documents$docum === void 0 ? void 0 : _data$documents$docum.documents) || [];
9785
+ const existingFileStoreIds = apiDocs === null || apiDocs === void 0 ? void 0 : apiDocs.map(doc => doc.fileStoreId);
9786
+ const newDocuments = formDocs.filter(doc => !(existingFileStoreIds !== null && existingFileStoreIds !== void 0 && existingFileStoreIds.includes(doc.fileStoreId)));
9787
+ console.log("NEW DOCUMENTS TO SEND:", newDocuments);
9681
9788
  const payload = {
9682
9789
  GarbageConnection: {
9683
9790
  ...(data === null || data === void 0 ? void 0 : data.venueDetails),
9684
9791
  processInstance: {
9685
9792
  ...(data === null || data === void 0 ? void 0 : (_data$venueDetails = data.venueDetails) === null || _data$venueDetails === void 0 ? void 0 : _data$venueDetails.processInstance),
9686
9793
  action: actionStatus
9687
- }
9794
+ },
9795
+ documents: newDocuments
9688
9796
  }
9689
9797
  };
9690
9798
  try {
@@ -9736,18 +9844,19 @@ const SelectNDCDocuments = ({
9736
9844
  }) => {
9737
9845
  var _formData$documents, _data$gcServicesMas;
9738
9846
  const tenantId = window.location.href.includes("employee") ? Digit.ULBService.getCurrentPermanentCity() : localStorage.getItem("CITIZEN.CITY");
9739
- const checkFormData = useSelector(state => state.ndc.NDCForm.formData || {});
9847
+ const checkFormData = useSelector(state => state.gc.GarbageApplicationFormReducer.formData || {});
9740
9848
  const stateId = Digit.ULBService.getStateId();
9741
9849
  const [documents, setDocuments] = useState((formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || []);
9742
9850
  const [error, setError] = useState(null);
9743
9851
  useEffect(() => {
9744
- var _checkFormData$respon, _checkFormData$respon2, _checkFormData$respon3;
9745
- if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && (_checkFormData$respon3 = _checkFormData$respon2.Documents) !== null && _checkFormData$respon3 !== void 0 && _checkFormData$respon3.length && documents.length === 0) {
9746
- var _checkFormData$respon4, _checkFormData$respon5, _checkFormData$respon6;
9747
- const apiDocs = checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon4 = checkFormData.responseData) === null || _checkFormData$respon4 === void 0 ? void 0 : (_checkFormData$respon5 = _checkFormData$respon4[0]) === null || _checkFormData$respon5 === void 0 ? void 0 : (_checkFormData$respon6 = _checkFormData$respon5.Documents) === null || _checkFormData$respon6 === void 0 ? void 0 : _checkFormData$respon6.map(doc => ({
9852
+ var _checkFormData$venueD, _checkFormData$venueD2;
9853
+ console.log("checkFormData", checkFormData);
9854
+ if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$venueD = checkFormData.venueDetails) !== null && _checkFormData$venueD !== void 0 && (_checkFormData$venueD2 = _checkFormData$venueD.documents) !== null && _checkFormData$venueD2 !== void 0 && _checkFormData$venueD2.length && documents.length === 0) {
9855
+ var _checkFormData$venueD3, _checkFormData$venueD4;
9856
+ const apiDocs = checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$venueD3 = checkFormData.venueDetails) === null || _checkFormData$venueD3 === void 0 ? void 0 : (_checkFormData$venueD4 = _checkFormData$venueD3.documents) === null || _checkFormData$venueD4 === void 0 ? void 0 : _checkFormData$venueD4.map(doc => ({
9748
9857
  documentType: doc === null || doc === void 0 ? void 0 : doc.documentType,
9749
- fileStoreId: doc === null || doc === void 0 ? void 0 : doc.documentAttachment,
9750
- documentUid: doc === null || doc === void 0 ? void 0 : doc.documentAttachment
9858
+ fileStoreId: doc === null || doc === void 0 ? void 0 : doc.fileStoreId,
9859
+ documentUid: doc === null || doc === void 0 ? void 0 : doc.fileStoreId
9751
9860
  }));
9752
9861
  setDocuments(apiDocs);
9753
9862
  }
@@ -9763,6 +9872,8 @@ const SelectNDCDocuments = ({
9763
9872
  }]);
9764
9873
  const ndcDocuments = data === null || data === void 0 ? void 0 : (_data$gcServicesMas = data["gc-services-masters"]) === null || _data$gcServicesMas === void 0 ? void 0 : _data$gcServicesMas.Documents;
9765
9874
  const goNext = () => {
9875
+ console.log("here stop");
9876
+ console.log("formData", formData);
9766
9877
  onSelect(config.key, {
9767
9878
  documents,
9768
9879
  ndcDocumentsLength: ndcDocuments === null || ndcDocuments === void 0 ? void 0 : ndcDocuments.length
@@ -9805,7 +9916,8 @@ function SelectDocument({
9805
9916
  documents,
9806
9917
  setFormError,
9807
9918
  config,
9808
- formState
9919
+ formState,
9920
+ formData
9809
9921
  }) {
9810
9922
  const filteredDocument = documents === null || documents === void 0 ? void 0 : documents.filter(item => {
9811
9923
  var _item$documentType;
@@ -9824,6 +9936,7 @@ function SelectDocument({
9824
9936
  }
9825
9937
  }, [filteredDocument]);
9826
9938
  useEffect(() => {
9939
+ console.log("here come", documents);
9827
9940
  if (uploadedFile) {
9828
9941
  setDocuments(prev => {
9829
9942
  const filteredDocumentsByDocumentType = prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (doc === null || doc === void 0 ? void 0 : doc.code));
@@ -10728,6 +10841,7 @@ const MyChallanResult = ({
10728
10841
  }
10729
10842
  }, t(header), " (", getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.length, ")"), getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.map((bill, index) => {
10730
10843
  const connectionCount = connectionCountMap[bill === null || bill === void 0 ? void 0 : bill.connectionNo] || 0;
10844
+ console.log("bill", bill);
10731
10845
  const showDiscontinueButton = bill.applicationStatus === "CONNECTION_ACTIVATED" && connectionCount === 1;
10732
10846
  return /*#__PURE__*/React.createElement(Card, {
10733
10847
  key: index
@@ -10749,7 +10863,12 @@ const MyChallanResult = ({
10749
10863
  to: `/digit-ui/citizen/garbagecollection/application/${bill === null || bill === void 0 ? void 0 : bill.applicationNo}/${bill === null || bill === void 0 ? void 0 : bill.tenantId}`
10750
10864
  }, /*#__PURE__*/React.createElement(SubmitBar, {
10751
10865
  label: t("CS_VIEW_DETAILS")
10752
- })), showDiscontinueButton && /*#__PURE__*/React.createElement(SubmitBar, {
10866
+ })), (bill.applicationStatus == "PENDING_FOR_CITIZEN_ACTION" || bill.applicationStatus == "INITIATED") && /*#__PURE__*/React.createElement(SubmitBar, {
10867
+ label: t("WF_GC_EDIT"),
10868
+ onSubmit: () => {
10869
+ history.push(`/digit-ui/citizen/garbagecollection/create-application/${bill === null || bill === void 0 ? void 0 : bill.applicationNo}`);
10870
+ }
10871
+ }), showDiscontinueButton && /*#__PURE__*/React.createElement(SubmitBar, {
10753
10872
  style: {
10754
10873
  width: "200px"
10755
10874
  },
@@ -11278,7 +11397,7 @@ const ChallanApplicationDetails = () => {
11278
11397
  useEffect(() => {
11279
11398
  if (acknowledgementIds) {
11280
11399
  const filters = {};
11281
- filters.acknowledgementIds = acknowledgementIds;
11400
+ filters.applicationNumber = acknowledgementIds;
11282
11401
  fetchChallans(filters);
11283
11402
  }
11284
11403
  }, [acknowledgementIds]);
@@ -11450,7 +11569,7 @@ const ChallanApplicationDetails = () => {
11450
11569
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationNo) || t("CS_NA")
11451
11570
  }), /*#__PURE__*/React.createElement(Row, {
11452
11571
  className: "border-none",
11453
- label: t("reports.mcollect.status"),
11572
+ label: t("ACTION_TEST_APPLICATION_STATUS"),
11454
11573
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationStatus) || t("CS_NA")
11455
11574
  }), /*#__PURE__*/React.createElement(Row, {
11456
11575
  className: "border-none",
@@ -12078,7 +12197,7 @@ const ChallanApplicationDetails$1 = () => {
12078
12197
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationNo) || t("CS_NA")
12079
12198
  }), /*#__PURE__*/React.createElement(Row, {
12080
12199
  className: "border-none",
12081
- label: t("reports.mcollect.status"),
12200
+ label: t("ACTION_TEST_APPLICATION_STATUS"),
12082
12201
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationStatus) || t("CS_NA")
12083
12202
  }), /*#__PURE__*/React.createElement(Row, {
12084
12203
  className: "border-none",