@djb25/digit-ui-module-vendor 1.0.25 → 1.0.27

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.
@@ -8084,6 +8084,21 @@ const SearchApplication = ({
8084
8084
  control: control,
8085
8085
  defaultValue: null
8086
8086
  });
8087
+ case "dropdown":
8088
+ return /*#__PURE__*/React.createElement(Controller, {
8089
+ render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
8090
+ option: input.options,
8091
+ optionKey: input.optionsKey,
8092
+ value: props.value,
8093
+ selected: props.value,
8094
+ select: props.onChange,
8095
+ t: t,
8096
+ placeholder: input.label
8097
+ }),
8098
+ name: input.name,
8099
+ control: control,
8100
+ defaultValue: null
8101
+ });
8087
8102
  default:
8088
8103
  return /*#__PURE__*/React.createElement(TextInput, Object.assign({}, input, {
8089
8104
  inputRef: register
@@ -8091,7 +8106,8 @@ const SearchApplication = ({
8091
8106
  validate: searchValidation
8092
8107
  }), {
8093
8108
  watch: watch,
8094
- shouldUpdate: true
8109
+ shouldUpdate: true,
8110
+ placeholder: input.label
8095
8111
  }));
8096
8112
  }
8097
8113
  };
@@ -8229,7 +8245,13 @@ const getDriverFillingPointIdentifiers = (driver = {}) => {
8229
8245
  return Array.from(new Set([driver === null || driver === void 0 ? void 0 : driver.fillingPointId, driver === null || driver === void 0 ? void 0 : driver.fillingStationId, driver === null || driver === void 0 ? void 0 : (_driver$additionalDet = driver.additionalDetails) === null || _driver$additionalDet === void 0 ? void 0 : _driver$additionalDet.fillingPointId, driver === null || driver === void 0 ? void 0 : (_driver$additionalDet2 = driver.additionalDetails) === null || _driver$additionalDet2 === void 0 ? void 0 : _driver$additionalDet2.fillingStationId, driver === null || driver === void 0 ? void 0 : (_driver$fillingpointm = driver.fillingpointmetadata) === null || _driver$fillingpointm === void 0 ? void 0 : _driver$fillingpointm.fillingPointId].filter(value => value !== undefined && value !== null && value !== "").map(String).concat(getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPoint), getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPointDetail), getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPointDetails))));
8230
8246
  };
8231
8247
  const getVendorDriversForFillingPoint = (vendor, fillingPoint) => {
8232
- const vendorDrivers = Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.drivers) ? vendor.drivers.filter(Boolean) : [];
8248
+ const vendorDrivers = Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.drivers) ? vendor.drivers.filter(Boolean).map(d => {
8249
+ var _d$owner;
8250
+ return {
8251
+ ...d,
8252
+ displayName: `${d.name} (${((_d$owner = d.owner) === null || _d$owner === void 0 ? void 0 : _d$owner.mobileNumber) || "N/A"})`
8253
+ };
8254
+ }) : [];
8233
8255
  if (!fillingPoint) return [];
8234
8256
  const selectedFillingPointIdentifiers = getFillingPointIdentifiers(fillingPoint);
8235
8257
  if (!selectedFillingPointIdentifiers.length) return vendorDrivers;
@@ -8327,13 +8349,25 @@ const VendorInbox = props => {
8327
8349
  }, [props.selectedTab]);
8328
8350
  useEffect(() => {
8329
8351
  if (vendorData) {
8330
- let vendors = vendorData.map(data => data.dsoDetails);
8352
+ let vendors = vendorData.map(data => {
8353
+ var _data$dsoDetails$owne;
8354
+ return {
8355
+ ...data.dsoDetails,
8356
+ displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne = data.dsoDetails.owner) === null || _data$dsoDetails$owne === void 0 ? void 0 : _data$dsoDetails$owne.mobileNumber) || "N/A"})`
8357
+ };
8358
+ });
8331
8359
  setVendors(vendors);
8332
8360
  }
8333
8361
  }, [vendorData]);
8334
8362
  useEffect(() => {
8335
8363
  if (driverData) {
8336
- setDrivers(driverData.driver || []);
8364
+ setDrivers((driverData.driver || []).map(d => {
8365
+ var _d$owner2;
8366
+ return {
8367
+ ...d,
8368
+ displayName: `${d.name} (${((_d$owner2 = d.owner) === null || _d$owner2 === void 0 ? void 0 : _d$owner2.mobileNumber) || "N/A"})`
8369
+ };
8370
+ }));
8337
8371
  }
8338
8372
  }, [driverData]);
8339
8373
  const closeToast = () => {
@@ -8708,6 +8742,14 @@ const VendorInbox = props => {
8708
8742
  to: "/digit-ui/employee/vendor/registry/vendor-details/" + row.original["id"]
8709
8743
  }, /*#__PURE__*/React.createElement("div", null, row.original.name))));
8710
8744
  }
8745
+ }, {
8746
+ Header: t("WT_MOBILE_NUMBER"),
8747
+ accessor: "mobileNumber",
8748
+ Cell: ({
8749
+ row
8750
+ }) => {
8751
+ return /*#__PURE__*/React.createElement("div", null, row.original.mobileNumber);
8752
+ }
8711
8753
  }, {
8712
8754
  Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
8713
8755
  accessor: "createdTime",
@@ -8805,14 +8847,23 @@ const VendorInbox = props => {
8805
8847
  to: "/digit-ui/employee/vendor/registry/vehicle-details/" + row.original["registrationNumber"]
8806
8848
  }, /*#__PURE__*/React.createElement("div", null, row.original.registrationNumber))));
8807
8849
  }
8850
+ }, {
8851
+ Header: t("WT_MOBILE_NUMBER"),
8852
+ accessor: "mobileNumber",
8853
+ Cell: ({
8854
+ row
8855
+ }) => {
8856
+ var _row$original9, _row$original9$owner;
8857
+ return /*#__PURE__*/React.createElement("div", null, ((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : (_row$original9$owner = _row$original9.owner) === null || _row$original9$owner === void 0 ? void 0 : _row$original9$owner.mobileNumber) || "N/A");
8858
+ }
8808
8859
  }, {
8809
8860
  Header: t("ES_FSM_REGISTRY_INBOX_DATE_VEHICLE_CREATION"),
8810
8861
  accessor: "createdTime",
8811
8862
  Cell: ({
8812
8863
  row
8813
8864
  }) => {
8814
- var _row$original9, _row$original9$auditD, _row$original0, _row$original0$auditD;
8815
- return GetCell((_row$original9 = row.original) !== null && _row$original9 !== void 0 && (_row$original9$auditD = _row$original9.auditDetails) !== null && _row$original9$auditD !== void 0 && _row$original9$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : (_row$original0$auditD = _row$original0.auditDetails) === null || _row$original0$auditD === void 0 ? void 0 : _row$original0$auditD.createdTime) : "");
8865
+ var _row$original0, _row$original0$auditD, _row$original1, _row$original1$auditD;
8866
+ return GetCell((_row$original0 = row.original) !== null && _row$original0 !== void 0 && (_row$original0$auditD = _row$original0.auditDetails) !== null && _row$original0$auditD !== void 0 && _row$original0$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : (_row$original1$auditD = _row$original1.auditDetails) === null || _row$original1$auditD === void 0 ? void 0 : _row$original1$auditD.createdTime) : "");
8816
8867
  }
8817
8868
  }, {
8818
8869
  Header: "Map Vendor",
@@ -8830,9 +8881,11 @@ const VendorInbox = props => {
8830
8881
  option: vendors,
8831
8882
  select: value => onVehicleVendorSelect(row, value),
8832
8883
  style: {
8833
- textAlign: "left"
8884
+ textAlign: "left",
8885
+ width: "100%",
8886
+ minWidth: "250px"
8834
8887
  },
8835
- optionKey: "name",
8888
+ optionKey: "displayName",
8836
8889
  t: t
8837
8890
  });
8838
8891
  }
@@ -8911,7 +8964,7 @@ const VendorInbox = props => {
8911
8964
  selected: getSelectedDriverOption(row.original, availableDrivers),
8912
8965
  option: availableDrivers,
8913
8966
  select: value => onDriverSelect(row, value),
8914
- optionKey: "name",
8967
+ optionKey: "displayName",
8915
8968
  t: t,
8916
8969
  style: {
8917
8970
  textAlign: "left",
@@ -8928,13 +8981,13 @@ const VendorInbox = props => {
8928
8981
  Cell: ({
8929
8982
  row
8930
8983
  }) => {
8931
- var _row$original1;
8984
+ var _row$original10;
8932
8985
  return /*#__PURE__*/React.createElement(ToggleSwitch, {
8933
8986
  style: {
8934
8987
  display: "flex",
8935
8988
  justifyContent: "left"
8936
8989
  },
8937
- value: ((_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : _row$original1.status) === "DISABLED" ? false : true,
8990
+ value: ((_row$original10 = row.original) === null || _row$original10 === void 0 ? void 0 : _row$original10.status) === "DISABLED" ? false : true,
8938
8991
  onChange: () => onVehicleUpdate(row),
8939
8992
  name: `switch-${row.id}`
8940
8993
  });
@@ -8942,7 +8995,7 @@ const VendorInbox = props => {
8942
8995
  }];
8943
8996
  case "DRIVER":
8944
8997
  return [{
8945
- Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
8998
+ Header: t("Driver's Mobile No."),
8946
8999
  id: "userName",
8947
9000
  accessor: row => {
8948
9001
  var _row$owner;
@@ -8968,7 +9021,16 @@ const VendorInbox = props => {
8968
9021
  className: "link"
8969
9022
  }, /*#__PURE__*/React.createElement(Link, {
8970
9023
  to: "/digit-ui/employee/vendor/registry/driver-details/" + row.original["id"]
8971
- }, /*#__PURE__*/React.createElement("div", null, row.original.name))));
9024
+ }, /*#__PURE__*/React.createElement("div", null, `${row.original.name || "N/A"}`))));
9025
+ }
9026
+ }, {
9027
+ Header: t("WT_MOBILE_NUMBER"),
9028
+ accessor: "mobileNumber",
9029
+ Cell: ({
9030
+ row
9031
+ }) => {
9032
+ var _row$original11, _row$original11$owner;
9033
+ return /*#__PURE__*/React.createElement("div", null, ((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$owner = _row$original11.owner) === null || _row$original11$owner === void 0 ? void 0 : _row$original11$owner.mobileNumber) || "N/A");
8972
9034
  }
8973
9035
  }, {
8974
9036
  Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
@@ -8976,8 +9038,8 @@ const VendorInbox = props => {
8976
9038
  Cell: ({
8977
9039
  row
8978
9040
  }) => {
8979
- var _row$original10, _row$original10$audit, _row$original11, _row$original11$audit;
8980
- return GetCell((_row$original10 = row.original) !== null && _row$original10 !== void 0 && (_row$original10$audit = _row$original10.auditDetails) !== null && _row$original10$audit !== void 0 && _row$original10$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$audit = _row$original11.auditDetails) === null || _row$original11$audit === void 0 ? void 0 : _row$original11$audit.createdTime) : "");
9041
+ var _row$original12, _row$original12$audit, _row$original13, _row$original13$audit;
9042
+ return GetCell((_row$original12 = row.original) !== null && _row$original12 !== void 0 && (_row$original12$audit = _row$original12.auditDetails) !== null && _row$original12$audit !== void 0 && _row$original12$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original13 = row.original) === null || _row$original13 === void 0 ? void 0 : (_row$original13$audit = _row$original13.auditDetails) === null || _row$original13$audit === void 0 ? void 0 : _row$original13$audit.createdTime) : "");
8981
9043
  }
8982
9044
  }, {
8983
9045
  Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
@@ -9003,7 +9065,7 @@ const VendorInbox = props => {
9003
9065
  width: "100%",
9004
9066
  minWidth: "250px"
9005
9067
  },
9006
- optionKey: "name",
9068
+ optionKey: "displayName",
9007
9069
  t: t
9008
9070
  });
9009
9071
  }
@@ -9014,13 +9076,13 @@ const VendorInbox = props => {
9014
9076
  Cell: ({
9015
9077
  row
9016
9078
  }) => {
9017
- var _row$original12;
9079
+ var _row$original14;
9018
9080
  return /*#__PURE__*/React.createElement(ToggleSwitch, {
9019
9081
  style: {
9020
9082
  display: "flex",
9021
9083
  justifyContent: "left"
9022
9084
  },
9023
- value: ((_row$original12 = row.original) === null || _row$original12 === void 0 ? void 0 : _row$original12.status) === "DISABLED" ? false : true,
9085
+ value: ((_row$original14 = row.original) === null || _row$original14 === void 0 ? void 0 : _row$original14.status) === "DISABLED" ? false : true,
9024
9086
  onChange: () => onDriverUpdate(row),
9025
9087
  name: `switch-${row.id}`
9026
9088
  });
@@ -9036,8 +9098,8 @@ const VendorInbox = props => {
9036
9098
  return [{
9037
9099
  Header: t("ES_VENDOR_INBOX_VENDOR_NAME"),
9038
9100
  exportAccessor: row => {
9039
- var _row$dsoDetails0;
9040
- return (row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.name) || "NA";
9101
+ var _row$dsoDetails0, _row$owner2, _row$dsoDetails1, _row$dsoDetails10, _row$dsoDetails10$own;
9102
+ return `${(row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.name) || "NA"} (${(row === null || row === void 0 ? void 0 : row.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails10 = row.dsoDetails) === null || _row$dsoDetails10 === void 0 ? void 0 : (_row$dsoDetails10$own = _row$dsoDetails10.owner) === null || _row$dsoDetails10$own === void 0 ? void 0 : _row$dsoDetails10$own.mobileNumber) || "NA"})`;
9041
9103
  }
9042
9104
  }, {
9043
9105
  Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
@@ -9051,14 +9113,14 @@ const VendorInbox = props => {
9051
9113
  }, {
9052
9114
  Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
9053
9115
  exportAccessor: row => {
9054
- var _parseAdditionalDetai, _row$dsoDetails1;
9055
- return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
9116
+ var _parseAdditionalDetai, _row$dsoDetails11;
9117
+ return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails11 = row.dsoDetails) === null || _row$dsoDetails11 === void 0 ? void 0 : _row$dsoDetails11.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
9056
9118
  }
9057
9119
  }, {
9058
9120
  Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
9059
9121
  exportAccessor: row => {
9060
- var _row$dsoDetails10;
9061
- return (row === null || row === void 0 ? void 0 : (_row$dsoDetails10 = row.dsoDetails) === null || _row$dsoDetails10 === void 0 ? void 0 : _row$dsoDetails10.status) || "NA";
9122
+ var _row$dsoDetails12;
9123
+ return (row === null || row === void 0 ? void 0 : (_row$dsoDetails12 = row.dsoDetails) === null || _row$dsoDetails12 === void 0 ? void 0 : _row$dsoDetails12.status) || "NA";
9062
9124
  }
9063
9125
  }];
9064
9126
  case "VEHICLE":
@@ -9074,8 +9136,8 @@ const VendorInbox = props => {
9074
9136
  }, {
9075
9137
  Header: "Map Vendor",
9076
9138
  exportAccessor: row => {
9077
- var _row$vendor4, _row$vendorData4;
9078
- return (row === null || row === void 0 ? void 0 : (_row$vendor4 = row.vendor) === null || _row$vendor4 === void 0 ? void 0 : _row$vendor4.name) || (row === null || row === void 0 ? void 0 : (_row$vendorData4 = row.vendorData) === null || _row$vendorData4 === void 0 ? void 0 : _row$vendorData4.name) || "NA";
9139
+ var _row$vendor4, _row$vendorData4, _row$vendor5, _row$vendor6, _row$vendor6$owner, _row$vendorData5, _row$vendorData6, _row$vendorData6$owne;
9140
+ return `${(row === null || row === void 0 ? void 0 : (_row$vendor4 = row.vendor) === null || _row$vendor4 === void 0 ? void 0 : _row$vendor4.name) || (row === null || row === void 0 ? void 0 : (_row$vendorData4 = row.vendorData) === null || _row$vendorData4 === void 0 ? void 0 : _row$vendorData4.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$vendor5 = row.vendor) === null || _row$vendor5 === void 0 ? void 0 : _row$vendor5.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor6 = row.vendor) === null || _row$vendor6 === void 0 ? void 0 : (_row$vendor6$owner = _row$vendor6.owner) === null || _row$vendor6$owner === void 0 ? void 0 : _row$vendor6$owner.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData5 = row.vendorData) === null || _row$vendorData5 === void 0 ? void 0 : _row$vendorData5.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData6 = row.vendorData) === null || _row$vendorData6 === void 0 ? void 0 : (_row$vendorData6$owne = _row$vendorData6.owner) === null || _row$vendorData6$owne === void 0 ? void 0 : _row$vendorData6$owne.mobileNumber) || "NA"})`;
9079
9141
  }
9080
9142
  }, {
9081
9143
  Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
@@ -9089,8 +9151,8 @@ const VendorInbox = props => {
9089
9151
  }, {
9090
9152
  Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
9091
9153
  exportAccessor: row => {
9092
- var _row$driverData3, _row$driver3;
9093
- return (row === null || row === void 0 ? void 0 : (_row$driverData3 = row.driverData) === null || _row$driverData3 === void 0 ? void 0 : _row$driverData3.name) || (row === null || row === void 0 ? void 0 : (_row$driver3 = row.driver) === null || _row$driver3 === void 0 ? void 0 : _row$driver3.name) || "NA";
9154
+ var _row$driverData3, _row$driver3, _row$driverData4, _row$driverData4$owne, _row$driver4, _row$driver4$owner;
9155
+ return `${(row === null || row === void 0 ? void 0 : (_row$driverData3 = row.driverData) === null || _row$driverData3 === void 0 ? void 0 : _row$driverData3.name) || (row === null || row === void 0 ? void 0 : (_row$driver3 = row.driver) === null || _row$driver3 === void 0 ? void 0 : _row$driver3.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$driverData4 = row.driverData) === null || _row$driverData4 === void 0 ? void 0 : (_row$driverData4$owne = _row$driverData4.owner) === null || _row$driverData4$owne === void 0 ? void 0 : _row$driverData4$owne.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$driver4 = row.driver) === null || _row$driver4 === void 0 ? void 0 : (_row$driver4$owner = _row$driver4.owner) === null || _row$driver4$owner === void 0 ? void 0 : _row$driver4$owner.mobileNumber) || "NA"})`;
9094
9156
  }
9095
9157
  }, {
9096
9158
  Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
@@ -9100,12 +9162,15 @@ const VendorInbox = props => {
9100
9162
  return [{
9101
9163
  Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
9102
9164
  exportAccessor: row => {
9103
- var _row$owner2;
9104
- return (row === null || row === void 0 ? void 0 : (_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.userName) || "NA";
9165
+ var _row$owner3;
9166
+ return (row === null || row === void 0 ? void 0 : (_row$owner3 = row.owner) === null || _row$owner3 === void 0 ? void 0 : _row$owner3.userName) || "NA";
9105
9167
  }
9106
9168
  }, {
9107
9169
  Header: t("ES_FSM_REGISTRY_INBOX_DRIVER_NAME"),
9108
- exportAccessor: row => (row === null || row === void 0 ? void 0 : row.name) || "NA"
9170
+ exportAccessor: row => {
9171
+ var _row$owner4;
9172
+ return `${(row === null || row === void 0 ? void 0 : row.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$owner4 = row.owner) === null || _row$owner4 === void 0 ? void 0 : _row$owner4.mobileNumber) || "NA"})`;
9173
+ }
9109
9174
  }, {
9110
9175
  Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
9111
9176
  exportAccessor: row => {
@@ -9115,8 +9180,8 @@ const VendorInbox = props => {
9115
9180
  }, {
9116
9181
  Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
9117
9182
  exportAccessor: row => {
9118
- var _row$vendorData5, _row$vendor5;
9119
- return (row === null || row === void 0 ? void 0 : (_row$vendorData5 = row.vendorData) === null || _row$vendorData5 === void 0 ? void 0 : _row$vendorData5.name) || (row === null || row === void 0 ? void 0 : (_row$vendor5 = row.vendor) === null || _row$vendor5 === void 0 ? void 0 : _row$vendor5.name) || "NA";
9183
+ var _row$vendorData7, _row$vendor7, _row$vendorData8, _row$vendorData9, _row$vendorData9$owne, _row$vendor8, _row$vendor9, _row$vendor9$owner;
9184
+ return `${(row === null || row === void 0 ? void 0 : (_row$vendorData7 = row.vendorData) === null || _row$vendorData7 === void 0 ? void 0 : _row$vendorData7.name) || (row === null || row === void 0 ? void 0 : (_row$vendor7 = row.vendor) === null || _row$vendor7 === void 0 ? void 0 : _row$vendor7.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$vendorData8 = row.vendorData) === null || _row$vendorData8 === void 0 ? void 0 : _row$vendorData8.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData9 = row.vendorData) === null || _row$vendorData9 === void 0 ? void 0 : (_row$vendorData9$owne = _row$vendorData9.owner) === null || _row$vendorData9$owne === void 0 ? void 0 : _row$vendorData9$owne.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor8 = row.vendor) === null || _row$vendor8 === void 0 ? void 0 : _row$vendor8.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor9 = row.vendor) === null || _row$vendor9 === void 0 ? void 0 : (_row$vendor9$owner = _row$vendor9.owner) === null || _row$vendor9$owner === void 0 ? void 0 : _row$vendor9$owner.mobileNumber) || "NA"})`;
9120
9185
  }
9121
9186
  }, {
9122
9187
  Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
@@ -9252,7 +9317,7 @@ const VendorInbox = props => {
9252
9317
  };
9253
9318
 
9254
9319
  const SearchVendor = () => {
9255
- var _sortParams$, _sortParams$2;
9320
+ var _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _allFillingPoints$fil;
9256
9321
  const {
9257
9322
  t
9258
9323
  } = useTranslation();
@@ -9271,6 +9336,23 @@ const SearchVendor = () => {
9271
9336
  const [vehicleIds, setVehicleIds] = useState("");
9272
9337
  const [driverIds, setDriverIds] = useState("");
9273
9338
  const [tableData, setTableData] = useState([]);
9339
+ const {
9340
+ data: allVendors
9341
+ } = Digit.Hooks.fsm.useDsoSearch(tenantId, {
9342
+ status: "ACTIVE"
9343
+ }, {
9344
+ staleTime: Infinity
9345
+ });
9346
+ const {
9347
+ data: allFillingPoints
9348
+ } = Digit.Hooks.wt.useFillPointSearch({
9349
+ tenantId,
9350
+ filters: {
9351
+ limit: 1000
9352
+ }
9353
+ }, {
9354
+ staleTime: Infinity
9355
+ });
9274
9356
  let paginationParms = {
9275
9357
  limit: pageSize,
9276
9358
  offset: pageOffset,
@@ -9288,7 +9370,9 @@ const SearchVendor = () => {
9288
9370
  filters: {
9289
9371
  ...paginationParms,
9290
9372
  registrationNumber: searchParams === null || searchParams === void 0 ? void 0 : searchParams.registrationNumber,
9291
- status: "ACTIVE,DISABLED"
9373
+ status: "ACTIVE,DISABLED",
9374
+ vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor = searchParams.vendor) === null || _searchParams$vendor === void 0 ? void 0 : _searchParams$vendor.id,
9375
+ fillingPointId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$filling = searchParams.fillingPoint) === null || _searchParams$filling === void 0 ? void 0 : _searchParams$filling.id
9292
9376
  },
9293
9377
  config: {
9294
9378
  enabled: false
@@ -9298,7 +9382,8 @@ const SearchVendor = () => {
9298
9382
  filters: {
9299
9383
  ...paginationParms,
9300
9384
  name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
9301
- status: "ACTIVE,DISABLED"
9385
+ status: "ACTIVE,DISABLED",
9386
+ vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor2 = searchParams.vendor) === null || _searchParams$vendor2 === void 0 ? void 0 : _searchParams$vendor2.id
9302
9387
  },
9303
9388
  config: {
9304
9389
  enabled: false
@@ -9443,11 +9528,44 @@ const SearchVendor = () => {
9443
9528
  };
9444
9529
  const handleFilterChange = () => {};
9445
9530
  const searchFields = tab === "VEHICLE" ? [{
9531
+ label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
9532
+ name: "vendor",
9533
+ type: "dropdown",
9534
+ options: allVendors === null || allVendors === void 0 ? void 0 : allVendors.map(data => {
9535
+ var _data$dsoDetails$owne;
9536
+ return {
9537
+ ...data.dsoDetails,
9538
+ displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne = data.dsoDetails.owner) === null || _data$dsoDetails$owne === void 0 ? void 0 : _data$dsoDetails$owne.mobileNumber) || "N/A"})`
9539
+ };
9540
+ }),
9541
+ optionsKey: "displayName"
9542
+ }, {
9543
+ label: t("ES_FSM_REGISTRY_SEARCH_FILLING_POINT"),
9544
+ name: "fillingPoint",
9545
+ type: "dropdown",
9546
+ options: allFillingPoints === null || allFillingPoints === void 0 ? void 0 : (_allFillingPoints$fil = allFillingPoints.fillingPoints) === null || _allFillingPoints$fil === void 0 ? void 0 : _allFillingPoints$fil.map(fp => ({
9547
+ ...fp,
9548
+ name: (fp === null || fp === void 0 ? void 0 : fp.name) || (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || (fp === null || fp === void 0 ? void 0 : fp.fillingStationId)
9549
+ })),
9550
+ optionsKey: "name"
9551
+ }, {
9446
9552
  label: t("ES_VEHICLE_SEARCH_VEHICLE_NUMBER"),
9447
9553
  name: "registrationNumber",
9448
- pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`,
9554
+ pattern: "[A-Z]{2}[- ]?[0-9]{2}[- ]?[A-Z]{1,2}[- ]?[0-9]{4}",
9449
9555
  title: t("ES_FSM_VEHICLE_FORMAT_TIP")
9450
9556
  }] : tab === "DRIVER" ? [{
9557
+ label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
9558
+ name: "vendor",
9559
+ type: "dropdown",
9560
+ options: allVendors === null || allVendors === void 0 ? void 0 : allVendors.map(data => {
9561
+ var _data$dsoDetails$owne2;
9562
+ return {
9563
+ ...data.dsoDetails,
9564
+ displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne2 = data.dsoDetails.owner) === null || _data$dsoDetails$owne2 === void 0 ? void 0 : _data$dsoDetails$owne2.mobileNumber) || "N/A"})`
9565
+ };
9566
+ }),
9567
+ optionsKey: "displayName"
9568
+ }, {
9451
9569
  label: t("ES_DRIVER_SEARCH_DRIVER_NAME"),
9452
9570
  name: "name"
9453
9571
  }] : [{
@@ -9607,9 +9725,17 @@ const DriverConfig = (t, disabled = false) => {
9607
9725
  type: "component",
9608
9726
  route: "select-service",
9609
9727
  hideInEmployee: false,
9610
- key: "additionalDetails",
9728
+ key: "serviceType",
9611
9729
  component: "SelectServiceType",
9612
9730
  disable: disabled,
9731
+ populators: {
9732
+ name: "serviceType",
9733
+ defaultValue: {
9734
+ code: "WT",
9735
+ name: "WT",
9736
+ i18nKey: "WT"
9737
+ }
9738
+ },
9613
9739
  texts: {
9614
9740
  headerCaption: "",
9615
9741
  header: "CS_COMMON_CHOOSE_GENDER",
@@ -9726,6 +9852,11 @@ const AddDriver = ({
9726
9852
  const Config = DriverConfig(t);
9727
9853
  const [canSubmit, setSubmitValve] = useState(false);
9728
9854
  const defaultValues = {
9855
+ serviceType: {
9856
+ code: "WT",
9857
+ name: "WT",
9858
+ i18nKey: "WT"
9859
+ },
9729
9860
  tripData: {
9730
9861
  noOfTrips: 1,
9731
9862
  amountPerTrip: null,
@@ -9753,18 +9884,20 @@ const AddDriver = ({
9753
9884
  const closeToast = () => {
9754
9885
  setShowToast(null);
9755
9886
  };
9887
+ const isCitizen = Digit.UserService.getType() === "WT_VENDOR";
9888
+ console.log(isCitizen, 'iscitizen');
9756
9889
  const onSubmit = data => {
9757
- var _data$selectGender, _data$additionalDetai;
9890
+ var _data$selectGender, _data$serviceType;
9758
9891
  const name = data === null || data === void 0 ? void 0 : data.driverName;
9759
9892
  const license = data === null || data === void 0 ? void 0 : data.license;
9760
9893
  const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
9761
9894
  const emailId = data === null || data === void 0 ? void 0 : data.emailId;
9762
9895
  const phone = data === null || data === void 0 ? void 0 : data.phone;
9763
9896
  const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
9764
- const additionalDetails = data === null || data === void 0 ? void 0 : (_data$additionalDetai = data.additionalDetails) === null || _data$additionalDetai === void 0 ? void 0 : _data$additionalDetai.code;
9897
+ const additionalDetails = data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code;
9765
9898
  const formData = {
9766
9899
  driver: {
9767
- tenantId: tenantId,
9900
+ tenantId: !isCitizen ? "dl.djb" : tenantId,
9768
9901
  name: name,
9769
9902
  licenseNumber: license,
9770
9903
  status: "ACTIVE",
@@ -10241,20 +10374,21 @@ const EditVendorDetails = props => {
10241
10374
  },
10242
10375
  className: "delete",
10243
10376
  fill: "#a82227"
10244
- })))), data === null || data === void 0 ? void 0 : (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values.map((value, index) => {
10245
- var _detail$values3;
10246
- return /*#__PURE__*/React.createElement(Row, {
10247
- key: t(String(value.title)),
10248
- label: t(String(value.title)),
10249
- text: value.value ? t(String(value.value)) : "N/A",
10250
- last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
10251
- caption: value.caption,
10252
- className: "border-none",
10253
- textStyle: value.value === "ACTIVE" ? {
10254
- color: "green"
10255
- } : {}
10256
- });
10257
- }));
10377
+ })))), /*#__PURE__*/React.createElement("div", {
10378
+ className: "additional-grid",
10379
+ style: {
10380
+ padding: "8px 16px"
10381
+ }
10382
+ }, data === null || data === void 0 ? void 0 : (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values.map((value, index) => /*#__PURE__*/React.createElement(React.Fragment, {
10383
+ key: index
10384
+ }, /*#__PURE__*/React.createElement("div", {
10385
+ className: "additional-label"
10386
+ }, t(String(value.title))), /*#__PURE__*/React.createElement("div", {
10387
+ className: "additional-value",
10388
+ style: value.value === "ACTIVE" ? {
10389
+ color: "green"
10390
+ } : {}
10391
+ }, value.value ? t(String(value.value)) : "N/A")))));
10258
10392
  }), detail.type && /*#__PURE__*/React.createElement("div", {
10259
10393
  className: "add-details-link hover-button",
10260
10394
  onClick: () => onActionSelect(detail.type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER" ? "ADD_DRIVER" : "ADD_VEHICLE")
@@ -10577,9 +10711,10 @@ const AddVehicle = ({
10577
10711
  const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
10578
10712
  const emailId = data === null || data === void 0 ? void 0 : data.emailId;
10579
10713
  const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
10714
+ const isCitizen = Digit.UserService.getType() === "WT_VENDOR";
10580
10715
  const formData = {
10581
10716
  vehicle: {
10582
- tenantId: tenantId,
10717
+ tenantId: !isCitizen ? "dl.djb" : tenantId,
10583
10718
  registrationNumber: registrationNumber,
10584
10719
  model: vehicleModal,
10585
10720
  type: vehicleType,
@@ -11458,14 +11593,21 @@ const DriverDetails = props => {
11458
11593
  marginBottom: "16px",
11459
11594
  marginTop: "32px"
11460
11595
  }
11461
- }, t(detail.title)), /*#__PURE__*/React.createElement(StatusTable, null, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
11462
- var _detail$values2, _detail$values3;
11596
+ }, t(detail.title)), /*#__PURE__*/React.createElement(Card, {
11597
+ className: "card-with-background",
11598
+ style: {
11599
+ margin: "10px 16px",
11600
+ padding: "20px"
11601
+ }
11602
+ }, /*#__PURE__*/React.createElement("div", {
11603
+ className: "additional-grid"
11604
+ }, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
11463
11605
  return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(React.Fragment, {
11464
11606
  key: index
11465
11607
  }, /*#__PURE__*/React.createElement("div", {
11466
- className: `${index === (detail === null || detail === void 0 ? void 0 : (_detail$values2 = detail.values) === null || _detail$values2 === void 0 ? void 0 : _detail$values2.length) - 1 ? "row last" : "row"} border-none`
11467
- }, /*#__PURE__*/React.createElement("h2", null, t(value.title)), /*#__PURE__*/React.createElement("div", {
11468
- className: "value",
11608
+ className: "additional-label"
11609
+ }, t(value.title)), /*#__PURE__*/React.createElement("div", {
11610
+ className: "additional-value",
11469
11611
  style: {
11470
11612
  color: "#a82227",
11471
11613
  display: "flex",
@@ -11473,40 +11615,37 @@ const DriverDetails = props => {
11473
11615
  alignItems: "center"
11474
11616
  }
11475
11617
  }, t(value.value) || "N/A", value.value === "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("span", {
11476
- className: "add-details-link hover-button hover-button-round",
11477
- onClick: () => onActionSelect("ADD_VENDOR")
11618
+ className: "add-details-link hover-button",
11619
+ onClick: () => onActionSelect("ADD_VENDOR"),
11620
+ style: {
11621
+ cursor: "pointer"
11622
+ }
11478
11623
  }, /*#__PURE__*/React.createElement(AddIcon, {
11479
11624
  className: "",
11480
- fill: "#a82227",
11481
- styles: {
11482
- cursor: "pointer",
11483
- height: "24px"
11484
- }
11625
+ fill: "#a82227"
11485
11626
  })), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
11486
- className: "add-details-link hover-button hover-button-round",
11487
- onClick: () => onActionSelect("EDIT_VENDOR")
11488
- }, /*#__PURE__*/React.createElement(EditIcon, {
11627
+ className: "add-details-link hover-button",
11628
+ onClick: () => onActionSelect("EDIT_VENDOR"),
11489
11629
  style: {
11490
11630
  cursor: "pointer"
11491
11631
  }
11492
- })), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
11493
- className: "add-details-link hover-button hover-button-round",
11494
- onClick: () => onActionSelect("DELETE_VENDOR")
11495
- }, /*#__PURE__*/React.createElement(DeleteIcon, {
11496
- className: "delete",
11497
- fill: "#a82227",
11632
+ }, /*#__PURE__*/React.createElement(EditIcon, null)), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
11633
+ className: "add-details-link hover-button",
11634
+ onClick: () => onActionSelect("DELETE_VENDOR"),
11498
11635
  style: {
11499
11636
  cursor: "pointer"
11500
11637
  }
11501
- }))))) : /*#__PURE__*/React.createElement(Row, {
11502
- key: t(value.title),
11503
- label: t(value.title),
11504
- text: t(value.value) || "N/A",
11505
- last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
11506
- caption: value.caption,
11507
- className: "border-none"
11508
- });
11509
- })));
11638
+ }, /*#__PURE__*/React.createElement(DeleteIcon, {
11639
+ className: "delete",
11640
+ fill: "#a82227"
11641
+ })))) : /*#__PURE__*/React.createElement(React.Fragment, {
11642
+ key: index
11643
+ }, /*#__PURE__*/React.createElement("div", {
11644
+ className: "additional-label"
11645
+ }, t(value.title)), /*#__PURE__*/React.createElement("div", {
11646
+ className: "additional-value"
11647
+ }, t(value.value) || "N/A"));
11648
+ }))));
11510
11649
  }))), showModal && /*#__PURE__*/React.createElement(Modal, {
11511
11650
  headerBarMain: /*#__PURE__*/React.createElement(Heading$1, {
11512
11651
  label: t(modalHeading())
@@ -11870,16 +12009,22 @@ const VehicleDetails = props => {
11870
12009
  marginBottom: "16px",
11871
12010
  marginTop: "32px"
11872
12011
  }
11873
- }, t(detail.title)), /*#__PURE__*/React.createElement(StatusTable, null, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
11874
- var _detail$values2, _detail$values3;
12012
+ }, t(detail.title)), /*#__PURE__*/React.createElement(Card, {
12013
+ className: "card-with-background",
12014
+ style: {
12015
+ margin: "10px 16px",
12016
+ padding: "20px"
12017
+ }
12018
+ }, /*#__PURE__*/React.createElement("div", {
12019
+ className: "additional-grid"
12020
+ }, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
11875
12021
  return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(React.Fragment, {
11876
12022
  key: index
11877
12023
  }, /*#__PURE__*/React.createElement("div", {
11878
- className: `${index === (detail === null || detail === void 0 ? void 0 : (_detail$values2 = detail.values) === null || _detail$values2 === void 0 ? void 0 : _detail$values2.length) - 1 ? "row last" : "row"} border-none`
11879
- }, /*#__PURE__*/React.createElement("h2", null, t(value.title)), /*#__PURE__*/React.createElement("div", {
11880
- className: "value add-details-link hover-button",
12024
+ className: "additional-label"
12025
+ }, t(value.title)), /*#__PURE__*/React.createElement("div", {
12026
+ className: "additional-value",
11881
12027
  style: {
11882
- color: "#a82227",
11883
12028
  display: "flex",
11884
12029
  alignItems: "center",
11885
12030
  gap: "8px"
@@ -11890,32 +12035,40 @@ const VehicleDetails = props => {
11890
12035
  color: "#a82227",
11891
12036
  display: "flex",
11892
12037
  alignItems: "center",
11893
- gap: "8px"
12038
+ gap: "8px",
12039
+ cursor: "pointer"
11894
12040
  }
11895
12041
  }, /*#__PURE__*/React.createElement(AddIcon, {
11896
12042
  className: "",
11897
12043
  fill: "#a82227"
11898
- }), " ", t(value.value) || "N/A"), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
12044
+ }), " ", t(value.value) || "N/A"), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, value.value), /*#__PURE__*/React.createElement("div", {
11899
12045
  className: "add-details-link hover-button",
11900
- onClick: () => onActionSelect("EDIT_VENDOR")
11901
- }, /*#__PURE__*/React.createElement(EditIcon, null)), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
12046
+ onClick: () => onActionSelect("EDIT_VENDOR"),
12047
+ style: {
12048
+ cursor: "pointer"
12049
+ }
12050
+ }, /*#__PURE__*/React.createElement(EditIcon, {
12051
+ fill: "#a82227"
12052
+ })), /*#__PURE__*/React.createElement("div", {
11902
12053
  className: "add-details-link hover-button",
11903
- onClick: () => onActionSelect("DELETE_VENDOR")
12054
+ onClick: () => onActionSelect("DELETE_VENDOR"),
12055
+ style: {
12056
+ cursor: "pointer"
12057
+ }
11904
12058
  }, /*#__PURE__*/React.createElement(DeleteIcon, {
11905
12059
  className: "delete",
11906
12060
  fill: "#a82227"
11907
- }))))) : /*#__PURE__*/React.createElement(Row, {
11908
- key: t(value.title),
11909
- label: t(value.title),
11910
- text: t(value.value) || "N/A",
11911
- last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
11912
- caption: value.caption,
11913
- className: "border-none",
11914
- textStyle: value.value === "ACTIVE" ? {
12061
+ }))))) : /*#__PURE__*/React.createElement(React.Fragment, {
12062
+ key: index
12063
+ }, /*#__PURE__*/React.createElement("div", {
12064
+ className: "additional-label"
12065
+ }, t(value.title)), /*#__PURE__*/React.createElement("div", {
12066
+ className: "additional-value",
12067
+ style: value.value === "ACTIVE" ? {
11915
12068
  color: "green"
11916
12069
  } : {}
11917
- });
11918
- })));
12070
+ }, t(value.value) || "N/A"));
12071
+ }))));
11919
12072
  })), showModal && /*#__PURE__*/React.createElement(Modal, {
11920
12073
  headerBarMain: /*#__PURE__*/React.createElement(Heading$2, {
11921
12074
  label: t(modalHeading())