@mseva/digit-ui-module-challangeneration 1.0.21 → 1.0.22

package/dist/index.js

@@ -152,9 +152,6 @@ const ServiceCategory = _ref => {
   };
   Menu === null || Menu === void 0 ? void 0 : Menu.map((option, index) => {
   });
-  if (isLoading) {
-    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-  }
   return /*#__PURE__*/React__default.createElement("div", {
     className: "status-container"
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -10006,6 +10003,7 @@ Loader.defaultProps = {
 };
 
 const MyChallanResult = _ref => {
+  var _getChallanData$chall, _getChallanData$chall2, _getChallanData$chall3, _getChallanData$chall4;
   let {
     template,
     header,
@@ -10017,10 +10015,37 @@ const MyChallanResult = _ref => {
   const history = reactRouterDom.useHistory();
   const userInfo = Digit.UserService.getUser();
   const tenantId = localStorage.getItem("CITIZEN.CITY");
+  const [filters, setFilters] = React.useState(null);
   const [loader, setLoader] = React.useState(false);
   const [getChallanData, setChallanData] = React.useState();
-  const fetchChallans = function (filters) {
+  let filter = window.location.href.split("/").pop();
+  let t1;
+  let off;
+  if (!isNaN(parseInt(filter))) {
+    off = filter;
+    t1 = parseInt(filter) + 50;
+  } else {
+    t1 = 4;
+  }
+  let initialFilters = !isNaN(parseInt(filter)) ? {
+    limit: "50",
+    sortOrder: "ASC",
+    sortBy: "createdTime",
+    offset: off,
+    tenantId
+  } : {
+    limit: "10",
+    sortOrder: "ASC",
+    sortBy: "createdTime",
+    offset: "0",
+    tenantId
+  };
+  React.useEffect(() => {
+    setFilters(initialFilters);
+  }, [filter, tenantId]);
+  const fetchChallans = function () {
     try {
+      console.log("filters", filters);
       setLoader(true);
       const _temp = _catch(function () {
         return Promise.resolve(Digit.ChallanGenerationService.search({
@@ -10028,7 +10053,7 @@ const MyChallanResult = _ref => {
           filters
         })).then(function (responseData) {
           console.log("result", responseData);
-          setChallanData(responseData === null || responseData === void 0 ? void 0 : responseData.challans);
+          setChallanData(responseData);
           setLoader(false);
         });
       }, function (error) {
@@ -10041,11 +10066,14 @@ const MyChallanResult = _ref => {
     }
   };
   React.useEffect(() => {
-    var _userInfo$info;
-    const filters = {};
-    filters.mobileNumber = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : _userInfo$info.mobileNumber;
-    fetchChallans(filters);
-  }, []);
+    console.log("filters", filters);
+    if (filters) fetchChallans();
+  }, [filters]);
+  const handleLoadMore = () => {
+    setFilters(prev => _extends({}, prev, {
+      limit: Number(prev.limit) + 5
+    }));
+  };
   const handleMakePayment = id => {
     history.push("/digit-ui/citizen/payment/collect/Challan_Generation/" + id + "/" + tenantId + "?tenantId=" + tenantId);
   };
@@ -10057,13 +10085,12 @@ const MyChallanResult = _ref => {
     style: {
       marginLeft: "8px"
     }
-  }, t(header), " (", getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.length, ")"), getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.map((bill, index) => {
+  }, t(header), " (", getChallanData === null || getChallanData === void 0 ? void 0 : (_getChallanData$chall = getChallanData.challans) === null || _getChallanData$chall === void 0 ? void 0 : _getChallanData$chall.length, ")"), getChallanData === null || getChallanData === void 0 ? void 0 : (_getChallanData$chall2 = getChallanData.challans) === null || _getChallanData$chall2 === void 0 ? void 0 : _getChallanData$chall2.map((bill, index) => {
     var _bill$amount, _bill$amount$, _bill$feeWaiver, _bill$citizen;
     const checkAmount = Math.max((bill === null || bill === void 0 ? void 0 : (_bill$amount = bill.amount) === null || _bill$amount === void 0 ? void 0 : (_bill$amount$ = _bill$amount[0]) === null || _bill$amount$ === void 0 ? void 0 : _bill$amount$.amount) || 0, (bill === null || bill === void 0 ? void 0 : bill.challanAmount) || 0);
     const total = checkAmount != null ? checkAmount : 0;
     const waiver = (_bill$feeWaiver = bill === null || bill === void 0 ? void 0 : bill.feeWaiver) != null ? _bill$feeWaiver : 0;
     const finalAmount = total - waiver;
-    console.log("finalAmount", finalAmount);
     return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
       key: index
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.KeyNote, {
@@ -10091,7 +10118,24 @@ const MyChallanResult = _ref => {
       label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
       onSubmit: () => handleMakePayment(bill === null || bill === void 0 ? void 0 : bill.challanNo)
     })));
-  })), loader && /*#__PURE__*/React__default.createElement(Loader, {
+  }), (getChallanData === null || getChallanData === void 0 ? void 0 : (_getChallanData$chall3 = getChallanData.challans) === null || _getChallanData$chall3 === void 0 ? void 0 : _getChallanData$chall3.length) === 0 && !loader && /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, t("CHB_NO_APPLICATION_FOUND_MSG")), (getChallanData === null || getChallanData === void 0 ? void 0 : (_getChallanData$chall4 = getChallanData.challans) === null || _getChallanData$chall4 === void 0 ? void 0 : _getChallanData$chall4.length) !== 0 && (getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.totalCount) > t1 && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginLeft: "16px",
+      marginTop: "16px"
+    }
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "link",
+    style: {
+      cursor: "pointer",
+      color: "#007bff"
+    },
+    onClick: handleLoadMore
+  }, t("CHB_LOAD_MORE_MSG")))), loader && /*#__PURE__*/React__default.createElement(Loader, {
     page: true
   }));
 };
@@ -12715,9 +12759,7 @@ const DesktopInbox = _ref => {
     }
   }];
   let result;
-  if (props.isLoading || props.isLoader) {
-    result = /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-  } else if ((data === null || data === void 0 ? void 0 : data.length) === 0) {
+  if ((data === null || data === void 0 ? void 0 : data.length) === 0) {
     result = /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
       style: {
         marginTop: 20
@@ -13319,6 +13361,8 @@ const Inbox = _ref => {
       filterComponent: filterComponent,
       isLoader: isLoader,
       statutes: data === null || data === void 0 ? void 0 : data.statuses
+    }), hookLoading && /*#__PURE__*/React__default.createElement(Loader, {
+      page: true
     }));
   }
 };
@@ -16285,7 +16329,13 @@ const ChallanStepperForm = () => {
     divider: true
   }, t("CREATE_CHALLAN")), /*#__PURE__*/React__default.createElement("form", {
     onSubmit: handleSubmit(onSubmit)
-  }, /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
+    style: {
+      fontWeight: "bold",
+      paddingBottom: "30px",
+      fontSize: "25px"
+    }
+  }, t("CHALLAN_OFFENDER_DETAILS")), /*#__PURE__*/React__default.createElement("div", {
     style: {
       width: "100%"
     }