@bjsdistribution/dms-client-return 0.1.65-prod → 0.1.66-prod

package/dist/components/order-view/store.d.ts

@@ -4,6 +4,7 @@ import { ClientData, ClientType } from '../order-daily-overview/common/interface
 interface OrderRecipient {
     recipient_name: string | null;
     postcode: string | null;
+    return_action?: string[] | null;
 }
 export declare const ordersInitialValue: OrdersType;
 export declare const orderProductInitialvalue: CreateProduct;

package/dist/components/order-view/types.d.ts

@@ -180,6 +180,7 @@ export interface OrdersType {
     order_customs_details?: OrderCustomsDetails;
     show_customs_details?: false;
     import_reference: string | null;
+    return_action?: string[] | null;
 }
 export declare type DeleteProds = {
     id: number | null | undefined;

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

@@ -2415,6 +2415,10 @@ var StyledTableWrapper$1 = /*#__PURE__*/styled__default.div(_templateObject20 ||
 var CustomDrop = /*#__PURE__*/styled__default.div(_templateObject21 || (_templateObject21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* border-radius: 20px;\n  border: 1px solid #e2e0db;\n  background: #fff;\n  display: flex;\n  padding: 4px 8px;\n  gap: 8px;\n  align-items: center; */\n  cursor: pointer;\n  &.active .drop {\n    transform: rotate(180deg);\n  }\n"])));
 
 var _excluded = ["count"];
+var SELECTABLE_ACTIONS = ['RTS', 'CLAIMS PAID', 'DISPOSE', 'RE-ALLOCATE', 'RECYCLE', 'UNKNOWN'];
+var isSelectableItem = function isSelectableItem(item) {
+  return SELECTABLE_ACTIONS.includes(item == null ? void 0 : item.product_return_action) && (item == null ? void 0 : item.return_location) !== 'null' && (item == null ? void 0 : item.return_location) !== null;
+};
 var ReturnOrderTable = function ReturnOrderTable() {
   var _useAtom = jotai.useAtom(filtersReducerAtom),
     state = _useAtom[0];
@@ -2576,8 +2580,14 @@ var ReturnOrderTable = function ReturnOrderTable() {
     var isChecked = e.target.checked;
     setSelectAll(isChecked);
     if (isChecked) {
+      var _selectedReturnOrder$;
+      var firstSelectable = returnData == null ? void 0 : returnData.find(function (loc) {
+        return isSelectableItem(loc);
+      });
+      var targetAction = selectedReturnOrder.length > 0 ? (_selectedReturnOrder$ = selectedReturnOrder[0]) == null ? void 0 : _selectedReturnOrder$.product_return_action : firstSelectable == null ? void 0 : firstSelectable.product_return_action;
+      if (!targetAction) return;
       var filteredData = returnData == null ? void 0 : returnData.filter(function (loc) {
-        return (loc == null ? void 0 : loc.product_return_action) === 'RTS';
+        return isSelectableItem(loc) && (loc == null ? void 0 : loc.product_return_action) === targetAction;
       });
       var selectedOrders = filteredData.map(function (loc) {
         return {
@@ -2613,6 +2623,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
         return loc.id === id;
       });
       if (isSelected) {
+        var _returnData$filter;
         var updatedSelectedLocations = prevSelectedLocations.filter(function (loc) {
           return loc.id !== id;
         });
@@ -2628,10 +2639,14 @@ var ReturnOrderTable = function ReturnOrderTable() {
             return item.id !== id;
           });
         });
-        setSelectAll(false); // Ensure "select all" is false if one is deselected
+        var targetAction = product_return_action;
+        var totalItemsOfAction = returnData == null || (_returnData$filter = returnData.filter(function (loc) {
+          return isSelectableItem(loc) && (loc == null ? void 0 : loc.product_return_action) === targetAction;
+        })) == null ? void 0 : _returnData$filter.length;
+        setSelectAll((updatedSelectedLocations == null ? void 0 : updatedSelectedLocations.length) > 0 && (updatedSelectedLocations == null ? void 0 : updatedSelectedLocations.length) === totalItemsOfAction);
         return updatedSelectedLocations;
       } else {
-        var _returnData$filter;
+        var _returnData$filter2;
         var newReturnPayload = {
           id: id,
           account_number: accountNumber,
@@ -2649,38 +2664,41 @@ var ReturnOrderTable = function ReturnOrderTable() {
           return_location_name: return_location_name,
           product_return_action: product_return_action
         }]);
-        setSelectAll((_updatedSelectedLocations == null ? void 0 : _updatedSelectedLocations.length) === (returnData == null || (_returnData$filter = returnData.filter(function (loc) {
-          return (loc == null ? void 0 : loc.product_return_action) === 'RTS';
-        })) == null ? void 0 : _returnData$filter.length));
+        var _targetAction = product_return_action;
+        var _totalItemsOfAction = returnData == null || (_returnData$filter2 = returnData.filter(function (loc) {
+          return isSelectableItem(loc) && (loc == null ? void 0 : loc.product_return_action) === _targetAction;
+        })) == null ? void 0 : _returnData$filter2.length;
+        setSelectAll((_updatedSelectedLocations == null ? void 0 : _updatedSelectedLocations.length) === _totalItemsOfAction);
         return _updatedSelectedLocations;
       }
     });
   };
   React.useEffect(function () {
-    if ((newpayload == null ? void 0 : newpayload.length) === 0) return;
+    if ((newpayload == null ? void 0 : newpayload.length) === 0) {
+      setGrouped([]);
+      return;
+    }
     var groupedPayload = newpayload == null ? void 0 : newpayload.reduce(function (acc, item) {
-      var return_location_token = item.return_location_token;
-      if (!return_location_token) {
-        acc.push(item);
-      } else {
-        if (!acc[return_location_token]) {
-          acc[return_location_token] = _extends({}, item, {
-            products: [],
-            return_action: []
-          });
-        }
-        acc[return_location_token].products = [].concat(acc[return_location_token].products, item.products);
-        acc[return_location_token].return_action = [].concat(acc[return_location_token].return_action, item.return_action);
+      var return_location_token = item.return_location_token,
+        id = item.id;
+      var key = return_location_token || "no_token_" + id;
+      if (!acc[key]) {
+        acc[key] = _extends({}, item, {
+          products: [],
+          return_action: []
+        });
       }
+      acc[key].products = [].concat(acc[key].products, item.products);
+      acc[key].return_action = Array.from(new Set([].concat(acc[key].return_action, item.return_action)));
       return acc;
-    }, []);
+    }, {});
     var mergedPayload = Object.values(groupedPayload);
     setGrouped(mergedPayload);
   }, [newpayload]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledTableWrapper$1, {
     className: "fortables"
   }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, returnData != null && returnData.some(function (item) {
-    return (item == null ? void 0 : item.product_return_action) === 'RTS' && (item == null ? void 0 : item.return_location) !== 'null' && (item == null ? void 0 : item.return_location) !== null;
+    return isSelectableItem(item);
   }) ? React__default.createElement("th", {
     className: "emailInvoiceCheckbox"
   }, React__default.createElement(dmsComponentLibrary.Checkbox, {
@@ -2731,11 +2749,12 @@ var ReturnOrderTable = function ReturnOrderTable() {
   }))) : (sortedData == null ? void 0 : sortedData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 14
   }, React__default.createElement(EmptyDataContainer, null, React__default.createElement(antd.Empty, null)))) : sortedData == null ? void 0 : sortedData.map(function (item, index) {
-    var _item$client_name;
+    var _selectedReturnOrder$2, _item$client_name;
     return React__default.createElement("tr", {
       key: item.id
-    }, React__default.createElement("td", null, (item == null ? void 0 : item.product_return_action) === 'RTS' && (item == null ? void 0 : item.return_location) !== 'null' && (item == null ? void 0 : item.return_location) !== null ? React__default.createElement(dmsComponentLibrary.Checkbox, {
+    }, React__default.createElement("td", null, isSelectableItem(item) ? React__default.createElement(dmsComponentLibrary.Checkbox, {
       className: "custom-check",
+      disabled: selectedReturnOrder.length > 0 && ((_selectedReturnOrder$2 = selectedReturnOrder[0]) == null ? void 0 : _selectedReturnOrder$2.product_return_action) !== (item == null ? void 0 : item.product_return_action),
       checked: selectedReturnOrder.some(function (selectedInvoice) {
         return (selectedInvoice == null ? void 0 : selectedInvoice.id) === (item == null ? void 0 : item.id);
       }),
@@ -6465,7 +6484,7 @@ function OrderDetailsFooter() {
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _response$data;
-      var _orderDetails$order_c, _ref2, consignor_eori, packaging_type, consignee_country, commodity_code, country_of_origin, item_invoice_amount, procedure_code, ni_additional_information_codes, additional_procedure_code, additional_procedures, customDetailsPayload, payload, serviceKeys, _i, _serviceKeys, key, response, _response$data$, _response$data$2, alertsApiRes, orderStatusApiRes;
+      var _orderDetails$order_c, _ref2, consignor_eori, packaging_type, consignee_country, commodity_code, country_of_origin, item_invoice_amount, procedure_code, ni_additional_information_codes, additional_procedure_code, additional_procedures, customDetailsPayload, payload, serviceKeys, _i, _serviceKeys, key, response, _response$data$, _response$data$2, _response$data$3, alertsApiRes, orderStatusApiRes;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -6531,7 +6550,8 @@ function OrderDetailsFooter() {
               setPrevOrderDetails(response == null ? void 0 : response.data[0]);
               setCustomerInfo({
                 recipient_name: response == null || (_response$data$ = response.data[0]) == null || (_response$data$ = _response$data$.order_recipient) == null ? void 0 : _response$data$.recipient_name,
-                postcode: response == null || (_response$data$2 = response.data[0]) == null || (_response$data$2 = _response$data$2.order_recipient) == null ? void 0 : _response$data$2.postcode
+                postcode: response == null || (_response$data$2 = response.data[0]) == null || (_response$data$2 = _response$data$2.order_recipient) == null ? void 0 : _response$data$2.postcode,
+                return_action: response == null || (_response$data$3 = response.data[0]) == null ? void 0 : _response$data$3.return_action
               });
               setRecallAuditLog(true);
             } else {
@@ -16525,15 +16545,24 @@ var Container$1k = /*#__PURE__*/styled__default.div(_templateObject$2r || (_temp
 
 var _templateObject$2s, _templateObject2$1P, _templateObject3$17, _templateObject4$F;
 var Details = function Details() {
-  var _globalEscData$, _globalEscData$2;
+  var _customerInfo$return_, _globalEscData$, _globalEscData$2;
   // const [orderDetails] = useOrderDetails();
   var _useCustomerInfo = useCustomerInfo(),
     customerInfo = _useCustomerInfo[0];
   var recipient = (customerInfo == null ? void 0 : customerInfo.recipient_name) || '';
   var postcodeShow = (customerInfo == null ? void 0 : customerInfo.postcode) || '';
+  var returnActionString = customerInfo != null && (_customerInfo$return_ = customerInfo.return_action) != null && _customerInfo$return_.length ? customerInfo.return_action.join(', ') + " - " : '';
   var _useGlobalEscData = useGlobalEscData(),
     globalEscData = _useGlobalEscData[0];
-  return React__default.createElement(DetailsContainer, null, React__default.createElement(Typo, null, "CUSTOMER RETURN - ", recipient, " , ", postcodeShow, " ", (globalEscData == null ? void 0 : globalEscData.length) > 0 && React__default.createElement(EscInfo, null, ((_globalEscData$ = globalEscData[0]) == null || (_globalEscData$ = _globalEscData$.escalation_type) == null ? void 0 : _globalEscData$.level) + " (" + ((_globalEscData$2 = globalEscData[0]) == null || (_globalEscData$2 = _globalEscData$2.escalation_type) == null ? void 0 : _globalEscData$2.name) + ")")));
+  var isLoading = !recipient && !postcodeShow;
+  return React__default.createElement(DetailsContainer, null, React__default.createElement(Typo, null, isLoading ? React__default.createElement(antd.Skeleton.Input, {
+    active: true,
+    size: "small",
+    style: {
+      width: 350,
+      borderRadius: 8
+    }
+  }) : "RETURN - " + returnActionString + recipient + " - " + postcodeShow, (globalEscData == null ? void 0 : globalEscData.length) > 0 && !isLoading && React__default.createElement(EscInfo, null, ((_globalEscData$ = globalEscData[0]) == null || (_globalEscData$ = _globalEscData$.escalation_type) == null ? void 0 : _globalEscData$.level) + " (" + ((_globalEscData$2 = globalEscData[0]) == null || (_globalEscData$2 = _globalEscData$2.escalation_type) == null ? void 0 : _globalEscData$2.name) + ")")));
 };
 var DetailsContainer = /*#__PURE__*/styled__default.div(_templateObject$2s || (_templateObject$2s = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  gap: 10px;\n  > svg {\n    transform: scale(0.6);\n  }\n"])));
 var Typo = /*#__PURE__*/styled__default.div(_templateObject2$1P || (_templateObject2$1P = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: row;\n  gap: 15px;\n  align-items: center;\n  font-size: 20px;\n  font-style: normal;\n  font-weight: 600;\n  line-height: 32px;\n  text-transform: uppercase;\n  margin: 0;\n  padding: 0;\n\n  @media screen and (max-width: 1220px) {\n    font-size: 14px;\n  }\n"])));
@@ -18151,7 +18180,7 @@ function OrderView(_ref) {
   React.useEffect(function () {
     setLoading(loading);
     if (fetchedData && fetchedData.data) {
-      var _requiredData$, _requiredData$2, _requiredData$3, _requiredData$4, _requiredData$0$order, _requiredData$5, _requiredData$0$order2, _requiredData$6, _fetchedData$data$;
+      var _requiredData$, _requiredData$2, _requiredData$3, _requiredData$4, _requiredData$0$order, _requiredData$5, _requiredData$0$order2, _requiredData$6, _requiredData$0$retur, _requiredData$7, _fetchedData$data$;
       var requiredData = fetchedData == null ? void 0 : fetchedData.data;
       setOrderDetails(requiredData[0]);
       //@ts-ignore
@@ -18163,7 +18192,8 @@ function OrderView(_ref) {
       setOrderProductId((_requiredData$4 = requiredData[0]) == null ? void 0 : _requiredData$4.id);
       setCustomerInfo({
         recipient_name: (_requiredData$0$order = (_requiredData$5 = requiredData[0]) == null || (_requiredData$5 = _requiredData$5.order_recipient) == null ? void 0 : _requiredData$5.recipient_name) != null ? _requiredData$0$order : null,
-        postcode: (_requiredData$0$order2 = (_requiredData$6 = requiredData[0]) == null || (_requiredData$6 = _requiredData$6.order_recipient) == null ? void 0 : _requiredData$6.postcode) != null ? _requiredData$0$order2 : null
+        postcode: (_requiredData$0$order2 = (_requiredData$6 = requiredData[0]) == null || (_requiredData$6 = _requiredData$6.order_recipient) == null ? void 0 : _requiredData$6.postcode) != null ? _requiredData$0$order2 : null,
+        return_action: (_requiredData$0$retur = (_requiredData$7 = requiredData[0]) == null ? void 0 : _requiredData$7.return_action) != null ? _requiredData$0$retur : null
       });
       setPrevOrderDetails(requiredData[0]);
       //dbSync Api call
@@ -18771,7 +18801,7 @@ var ReturnTable$1 = function ReturnTable() {
     //for dev
     navigate("/orders/view/return/filter?" + queryParams.toString());
     //for local
-    //navigate(`/filter?${queryParams.toString()}`);
+    // navigate(`/filter?${queryParams.toString()}`);
   };
   //for RTS
   var handleRedirectRTS = function handleRedirectRTS(customerId, RTS) {
@@ -18948,29 +18978,79 @@ var ReturnTable$1 = function ReturnTable() {
         }
       }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$PENDING = rowKey == null ? void 0 : rowKey.PENDING) != null ? _rowKey$PENDING : 0))), React__default.createElement("td", {
         style: {
+          color: (rowKey == null ? void 0 : rowKey['CLAIMS PAID']) > 0 ? '#0099ff' : 'inherit',
+          fontWeight: (rowKey == null ? void 0 : rowKey['CLAIMS PAID']) > 0 ? 600 : 'normal',
+          cursor: (rowKey == null ? void 0 : rowKey['CLAIMS PAID']) > 0 ? 'pointer' : 'default',
           textAlign: 'center'
+        },
+        onClick: (rowKey == null ? void 0 : rowKey['CLAIMS PAID']) > 0 ? function () {
+          return handleRedirectRTS(rowKey == null ? void 0 : rowKey.customer_id, 'CLAIMS PAID');
+        } : undefined
+      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+        style: {
+          backgroundColor: (rowKey == null ? void 0 : rowKey['CLAIMS PAID']) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
         }
-      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$CLAIMSPAID = rowKey == null ? void 0 : rowKey['CLAIMS PAID']) != null ? _rowKey$CLAIMSPAID : 0))), React__default.createElement("td", {
+      }, (_rowKey$CLAIMSPAID = rowKey == null ? void 0 : rowKey['CLAIMS PAID']) != null ? _rowKey$CLAIMSPAID : 0))), React__default.createElement("td", {
         style: {
+          color: (rowKey == null ? void 0 : rowKey.DISPOSE) > 0 ? '#0099ff' : 'inherit',
+          fontWeight: (rowKey == null ? void 0 : rowKey.DISPOSE) > 0 ? 600 : 'normal',
+          cursor: (rowKey == null ? void 0 : rowKey.DISPOSE) > 0 ? 'pointer' : 'default',
           textAlign: 'center'
+        },
+        onClick: (rowKey == null ? void 0 : rowKey.DISPOSE) > 0 ? function () {
+          return handleRedirectRTS(rowKey == null ? void 0 : rowKey.customer_id, 'DISPOSE');
+        } : undefined
+      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+        style: {
+          backgroundColor: (rowKey == null ? void 0 : rowKey.DISPOSE) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
         }
-      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$DISPOSE = rowKey == null ? void 0 : rowKey.DISPOSE) != null ? _rowKey$DISPOSE : 0))), React__default.createElement("td", {
+      }, (_rowKey$DISPOSE = rowKey == null ? void 0 : rowKey.DISPOSE) != null ? _rowKey$DISPOSE : 0))), React__default.createElement("td", {
         style: {
+          color: (rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) > 0 ? '#0099ff' : 'inherit',
+          fontWeight: (rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) > 0 ? 600 : 'normal',
+          cursor: (rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) > 0 ? 'pointer' : 'default',
           textAlign: 'center'
+        },
+        onClick: (rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) > 0 ? function () {
+          return handleRedirectRTS(rowKey == null ? void 0 : rowKey.customer_id, 'RE-ALLOCATE');
+        } : undefined
+      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+        style: {
+          backgroundColor: (rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
         }
-      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$REALLOCATE = rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) != null ? _rowKey$REALLOCATE : 0))), React__default.createElement("td", {
+      }, (_rowKey$REALLOCATE = rowKey == null ? void 0 : rowKey['RE-ALLOCATE']) != null ? _rowKey$REALLOCATE : 0))), React__default.createElement("td", {
         style: {
           textAlign: 'center'
         }
       }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$REDEL = rowKey == null ? void 0 : rowKey['RE-DEL']) != null ? _rowKey$REDEL : 0))), React__default.createElement("td", {
         style: {
+          color: (rowKey == null ? void 0 : rowKey.RECYCLE) > 0 ? '#0099ff' : 'inherit',
+          fontWeight: (rowKey == null ? void 0 : rowKey.RECYCLE) > 0 ? 600 : 'normal',
+          cursor: (rowKey == null ? void 0 : rowKey.RECYCLE) > 0 ? 'pointer' : 'default',
           textAlign: 'center'
+        },
+        onClick: (rowKey == null ? void 0 : rowKey.RECYCLE) > 0 ? function () {
+          return handleRedirectRTS(rowKey == null ? void 0 : rowKey.customer_id, 'RECYCLE');
+        } : undefined
+      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+        style: {
+          backgroundColor: (rowKey == null ? void 0 : rowKey.RECYCLE) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
         }
-      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$RECYCLE = rowKey == null ? void 0 : rowKey.RECYCLE) != null ? _rowKey$RECYCLE : 0))), React__default.createElement("td", {
+      }, (_rowKey$RECYCLE = rowKey == null ? void 0 : rowKey.RECYCLE) != null ? _rowKey$RECYCLE : 0))), React__default.createElement("td", {
         style: {
+          color: (rowKey == null ? void 0 : rowKey.UNKNOWN) > 0 ? '#0099ff' : 'inherit',
+          fontWeight: (rowKey == null ? void 0 : rowKey.UNKNOWN) > 0 ? 600 : 'normal',
+          cursor: (rowKey == null ? void 0 : rowKey.UNKNOWN) > 0 ? 'pointer' : 'default',
           textAlign: 'center'
+        },
+        onClick: (rowKey == null ? void 0 : rowKey.UNKNOWN) > 0 ? function () {
+          return handleRedirectRTS(rowKey == null ? void 0 : rowKey.customer_id, 'UNKNOWN');
+        } : undefined
+      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+        style: {
+          backgroundColor: (rowKey == null ? void 0 : rowKey.UNKNOWN) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
         }
-      }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, (_rowKey$UNKNOWN = rowKey == null ? void 0 : rowKey.UNKNOWN) != null ? _rowKey$UNKNOWN : 0))));
+      }, (_rowKey$UNKNOWN = rowKey == null ? void 0 : rowKey.UNKNOWN) != null ? _rowKey$UNKNOWN : 0))));
     };
     if (!(key != null && key.children) || (key == null || (_key$children = key.children) == null ? void 0 : _key$children.length) === 0) {
       return React__default.createElement(React__default.Fragment, {