@bjsdistribution/dms-client-return 0.0.43 → 0.0.45

package/dist/dms-client-return.cjs.development.js

@@ -8938,7 +8938,7 @@ function SelectionFilter() {
     }
   }, [accountNumber, urlCustomerId]);
   React.useEffect(function () {
-    if (urlCustomerId && (clientOptions == null ? void 0 : clientOptions.length) > 0) {
+    if (urlCustomerId) {
       var filteredClient = clientOptions == null ? void 0 : clientOptions.find(function (client) {
         return (client == null ? void 0 : client.value) == urlCustomerId;
       });
@@ -8993,8 +8993,8 @@ function SelectionFilter() {
     }) : []);
     setLocationOptions(Array.isArray(clientLocations) ? clientLocations == null ? void 0 : clientLocations.map(function (location) {
       return {
-        label: location,
-        value: location
+        label: location == null ? void 0 : location.location_name,
+        value: location == null ? void 0 : location.token
       };
     }) : []);
     //client value
@@ -9135,7 +9135,7 @@ function SelectionFilter() {
     placeholder: "Select Location",
     onChange: handleLocationChange,
     style: {
-      minWidth: '14vw'
+      minWidth: '150px'
     },
     allowClear: true,
     mode: "multiple"
@@ -10386,6 +10386,46 @@ var OrderTable = function OrderTable(_ref) {
     setAssign = _useState[1];
   var _useCallApiAgain = useCallApiAgain(),
     setCallAPi = _useCallApiAgain[1];
+  //sorting
+  var _useState2 = React.useState(null),
+    sortConfig = _useState2[0],
+    setSortConfig = _useState2[1];
+  var handleSort = function handleSort(key) {
+    setSortConfig(function (prev) {
+      if ((prev == null ? void 0 : prev.key) === key && prev.direction === 'asc') {
+        return {
+          key: key,
+          direction: 'desc'
+        };
+      }
+      return {
+        key: key,
+        direction: 'asc'
+      };
+    });
+  };
+  var sortedData = React.useMemo(function () {
+    if (!returnAfterOrder || !sortConfig) return returnAfterOrder;
+    var key = sortConfig.key,
+      direction = sortConfig.direction;
+    return [].concat(returnAfterOrder).sort(function (a, b) {
+      var valueA = a[key];
+      var valueB = b[key];
+      if (typeof valueA === 'number' && typeof valueB === 'number') {
+        return direction === 'asc' ? valueA - valueB : valueB - valueA;
+      }
+      if (typeof valueA === 'string' && typeof valueB === 'string') {
+        return direction === 'asc' ? valueA.localeCompare(valueB) : valueB.localeCompare(valueA);
+      }
+      return 0;
+    });
+  }, [returnAfterOrder, sortConfig]);
+  var renderSortIcon = function renderSortIcon(columnKey) {
+    if (!sortConfig || sortConfig.key !== columnKey) {
+      return React__default.createElement(SortIcon, null);
+    }
+    return sortConfig.direction === 'asc' ? React__default.createElement(CaretDownFilledIcon, null) : React__default.createElement(CaretDownFilledIcon, null);
+  };
   var OpenDropDown = function OpenDropDown(index) {
     setPrintToggle(function (prevIndex) {
       return prevIndex === index ? null : index;
@@ -10521,7 +10561,37 @@ var OrderTable = function OrderTable(_ref) {
   }, [actionResponse, apiError]);
   return React__default.createElement(React__default.Fragment, null, AssignLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper, {
     className: "fortables"
-  }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", null, "Created"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", null, "Total Weight"), React__default.createElement("th", null, "Total CBM"), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
+  }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", {
+    onClick: function onClick() {
+      return handleSort('created_at');
+    }
+  }, React__default.createElement("div", {
+    className: "sortIconClass"
+  }, "Created ", renderSortIcon('created_at'))), React__default.createElement("th", {
+    onClick: function onClick() {
+      return handleSort('return_locations.location_name');
+    }
+  }, React__default.createElement("div", {
+    className: "sortIconClass"
+  }, "Return Location", ' ', renderSortIcon('return_locations.location_name'))), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", {
+    onClick: function onClick() {
+      return handleSort('order_recipient.recipient_name');
+    }
+  }, React__default.createElement("div", {
+    className: "sortIconClass"
+  }, "Recipient ", renderSortIcon('order_recipient.recipient_name'))), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", {
+    onClick: function onClick() {
+      return handleSort('weight');
+    }
+  }, React__default.createElement("div", {
+    className: "sortIconClass"
+  }, "Total Weight ", renderSortIcon('weight'))), React__default.createElement("th", {
+    onClick: function onClick() {
+      return handleSort('cube');
+    }
+  }, React__default.createElement("div", {
+    className: "sortIconClass"
+  }, "Total CBM ", renderSortIcon('cube'))), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
     className: "emailInvoiceShare"
   }, "Labels"))), React__default.createElement("tbody", null, loadingskeleton ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 16
@@ -10529,9 +10599,9 @@ var OrderTable = function OrderTable(_ref) {
     active: true
   })), React__default.createElement("td", {
     colSpan: 16
-  })) : (returnAfterOrder == null ? void 0 : returnAfterOrder.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
+  })) : (sortedData == null ? void 0 : sortedData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 16
-  }, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.Empty, null)))) : returnAfterOrder == null ? void 0 : returnAfterOrder.map(function (item, index) {
+  }, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.Empty, null)))) : sortedData == null ? void 0 : sortedData.map(function (item, index) {
     var _item$return_location, _item$order_recipient, _item$order_recipient2, _item$customer_data;
     var statusMapping = {
       cancelled: 'Cancelled',
@@ -11536,9 +11606,9 @@ var ReturnTable$1 = function ReturnTable() {
         fontWeight: (key == null ? void 0 : key.RTS) > 0 ? 600 : 'normal',
         cursor: (key == null ? void 0 : key.RTS) > 0 ? 'pointer' : 'default'
       },
-      onClick: function onClick() {
+      onClick: (key == null ? void 0 : key.RTS) > 0 ? function () {
         return handleRedirectRTS(key == null ? void 0 : key.customer_id, 'RTS');
-      }
+      } : undefined
     }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
       style: {
         backgroundColor: (key == null ? void 0 : key.RTS) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'