@bjsdistribution/dms-client-return 0.0.64 → 0.0.66

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

@@ -1,6 +1,10 @@
 import { useAtom } from 'jotai';
 import { CreateProduct, OrdersType, UnRecieveOrderProduct, UpdateOrderProduct } from './types';
 import { ClientData } from '../order-daily-overview/common/interface';
+interface OrderRecipient {
+    recipient_name: string | null;
+    postcode: string | null;
+}
 export declare const ordersInitialValue: OrdersType;
 export declare const orderProductInitialvalue: CreateProduct;
 export declare const unrecieveOrderProducts: UnRecieveOrderProduct;
@@ -11,19 +15,7 @@ declare function useInfoType(): [boolean | undefined, (args_0: boolean | ((prev:
 declare function useOrderResources(): [[], (args_0: [] | ((prev: []) => [])) => void];
 declare function useCurrentAction(): ["add-resources" | "split-order" | "bulk-update" | "log-service-refusal" | "cancel-order" | "confirm-order" | "product-action" | "send-sms" | "send-email" | "change-customer-account" | "escalations" | "create-task" | "log-feedback" | "hold-order" | "unhold-order" | "charge-log" | "restore-products" | "qclogtable" | "images-popup" | "qclog" | "view-reminder" | "order-lock" | "view-flag" | "release-order" | "unrelease-order" | "clear-date" | "uncancel-order" | undefined, (args_0: "add-resources" | "split-order" | "bulk-update" | "log-service-refusal" | "cancel-order" | "confirm-order" | "product-action" | "send-sms" | "send-email" | "change-customer-account" | "escalations" | "create-task" | "log-feedback" | "hold-order" | "unhold-order" | "charge-log" | "restore-products" | "qclogtable" | "images-popup" | "qclog" | "view-reminder" | "order-lock" | "view-flag" | "release-order" | "unrelease-order" | "clear-date" | "uncancel-order" | ((prev: "add-resources" | "split-order" | "bulk-update" | "log-service-refusal" | "cancel-order" | "confirm-order" | "product-action" | "send-sms" | "send-email" | "change-customer-account" | "escalations" | "create-task" | "log-feedback" | "hold-order" | "unhold-order" | "charge-log" | "restore-products" | "qclogtable" | "images-popup" | "qclog" | "view-reminder" | "order-lock" | "view-flag" | "release-order" | "unrelease-order" | "clear-date" | "uncancel-order" | undefined) => "add-resources" | "split-order" | "bulk-update" | "log-service-refusal" | "cancel-order" | "confirm-order" | "product-action" | "send-sms" | "send-email" | "change-customer-account" | "escalations" | "create-task" | "log-feedback" | "hold-order" | "unhold-order" | "charge-log" | "restore-products" | "qclogtable" | "images-popup" | "qclog" | "view-reminder" | "order-lock" | "view-flag" | "release-order" | "unrelease-order" | "clear-date" | "uncancel-order" | undefined) | undefined) => void];
 declare function useOrderStaticData(): [any, (args_0: any) => void];
-export declare function useCustomerInfo(): [{
-    recipient_name: string | null | undefined;
-    postcode: string | null | undefined;
-}, (args_0: {
-    recipient_name: string | null | undefined;
-    postcode: string | null | undefined;
-} | ((prev: {
-    recipient_name: string | null | undefined;
-    postcode: string | null | undefined;
-}) => {
-    recipient_name: string | null | undefined;
-    postcode: string | null | undefined;
-})) => void];
+export declare function useCustomerInfo(): [OrderRecipient, (args_0: OrderRecipient | ((prev: OrderRecipient) => OrderRecipient)) => void];
 export declare const initialModalState: {
     openModalType: null;
 };

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

@@ -799,10 +799,6 @@ var orderProductResources = /*#__PURE__*/jotai.atom([]);
 function useOrderProductsResources() {
   return jotai.useAtom(orderProductResources);
 }
-var orderProductToolbox = /*#__PURE__*/jotai.atom([]);
-function useOrderProductsToolbox() {
-  return jotai.useAtom(orderProductToolbox);
-}
 var locationOptions = /*#__PURE__*/jotai.atom([]);
 function useLocationOptions() {
   return jotai.useAtom(locationOptions);
@@ -3355,6 +3351,12 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
       payload: 1
     });
   };
+  var assigneeOptions = assignData == null ? void 0 : assignData.map(function (client) {
+    return {
+      label: client.type,
+      value: client.id
+    };
+  });
   var handleAssigneeChange = function handleAssigneeChange(value) {
     var _assignData$find;
     var bjsDeliveryValue = (_assignData$find = assignData.find(function (client) {
@@ -3442,7 +3444,7 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     placeholder: "Status of Order",
     onChange: handleStatusOfOrder,
     style: {
-      minWidth: '130px'
+      width: '145px'
     },
     value: statusOrder,
     onClear: handleClear,
@@ -3468,18 +3470,13 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   }, React__default.createElement("div", {
     className: "dateiconcontainer"
   }, React__default.createElement(AssigneIcon, null)), React__default.createElement(StyledAntSelect$2, null, React__default.createElement(antd.Select, {
-    options: assignData == null ? void 0 : assignData.map(function (client) {
-      return {
-        label: client.type,
-        value: client.id
-      };
-    }),
+    options: assigneeOptions,
     className: "custom-select",
     placeholder: "Assignee",
     onChange: handleAssigneeChange,
     value: selectedAssignee,
     style: {
-      minWidth: '120px'
+      minWidth: '140px'
     },
     allowClear: true,
     onClear: handleClearAssignee
@@ -8154,7 +8151,8 @@ function ConfirmOrder() {
     customerInfo = _useCustomerInfo[0];
   var infoText = (customerInfo == null ? void 0 : customerInfo.recipient_name) + ", " + (customerInfo == null ? void 0 : customerInfo.postcode);
   var _useConfirmOrderDate = useConfirmOrderDate(),
-    deliveryDate = _useConfirmOrderDate[0];
+    deliveryDate = _useConfirmOrderDate[0],
+    setDeliveryDate = _useConfirmOrderDate[1];
   var _useLiveRecalling = useLiveRecalling(),
     liveRecalling = _useLiveRecalling[0],
     setRecalling = _useLiveRecalling[1];
@@ -8233,7 +8231,7 @@ function ConfirmOrder() {
   }
   var ConfirmOrder = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, notUpdateOrder, _response$data, _response;
+      var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, notUpdateOrder, _response$data, _response, formattedDate;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -8260,6 +8258,8 @@ function ConfirmOrder() {
           case 11:
             if (orderId && deliveryDate) {
               //call order update api then call confirm order if required
+              formattedDate = dateFns.format(new Date(deliveryDate), 'yyyy-MM-dd');
+              setDeliveryDate(formattedDate);
               setPerformAction(true);
             }
           case 12:
@@ -10847,11 +10847,11 @@ function useSystemLogs() {
 
 var _templateObject$1_, _templateObject2$1y;
 var Details = function Details() {
-  var _orderDetails$order_r, _orderDetails$order_r2;
-  var _useOrderDetails = useOrderDetails(),
-    orderDetails = _useOrderDetails[0];
-  var recipient = (orderDetails == null || (_orderDetails$order_r = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r.recipient_name) || '';
-  var postcodeShow = (orderDetails == null || (_orderDetails$order_r2 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r2.postcode) || '';
+  // 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) || '';
   return React__default.createElement(DetailsContainer, null, React__default.createElement(Typo, null, "CUSTOMER RETURN - ", recipient, " , ", postcodeShow));
 };
 var DetailsContainer = /*#__PURE__*/styled__default.div(_templateObject$1_ || (_templateObject$1_ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  gap: 10px;\n  > svg {\n    transform: scale(0.6);\n  }\n"])));
@@ -11119,9 +11119,7 @@ function OrderView() {
   var _useOrderProductsReso = useOrderProductsResources(),
     orderResources = _useOrderProductsReso[0],
     setOrderResources = _useOrderProductsReso[1];
-  var _useOrderProductsTool = useOrderProductsToolbox(),
-    orderToolbox = _useOrderProductsTool[0],
-    setOrderToolbox = _useOrderProductsTool[1];
+  // const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   var _useGsitCUstomerId = useGsitCUstomerId(),
     GsitCUstomerId = _useGsitCUstomerId[0],
     setGsitCUstomerId = _useGsitCUstomerId[1];
@@ -11134,8 +11132,7 @@ function OrderView() {
   var _useLiveRecalling = useLiveRecalling(),
     liveRecalling = _useLiveRecalling[0];
   var systemLogsData = useSystemLogs();
-  var _useAssignData = useAssignData(),
-    setAssignData = _useAssignData[1];
+  // const [, setAssignData] = useAssignData();
   // query param
   var location = reactRouterDom.useLocation();
   var _useState2 = React.useState([]),
@@ -11224,18 +11221,19 @@ function OrderView() {
   React.useEffect(function () {
     setLoading(staticDataLoading);
     if (fetchedStaticData && fetchedStaticData.data) {
-      var _fetchedStaticData$da;
       var result = fetchedStaticData == null ? void 0 : fetchedStaticData.data;
       setOrderStaticData(result[0]);
-      setAssignData(fetchedStaticData == null || (_fetchedStaticData$da = fetchedStaticData.data) == null ? void 0 : _fetchedStaticData$da.flatMap(function (i) {
-        return i == null ? void 0 : i.resource_visibility_type;
-      }));
+      // setAssignData(
+      //   fetchedStaticData?.data?.flatMap(
+      //     (i: any) => i?.resource_visibility_type
+      //   )
+      // );
     }
   }, [staticDataLoading]);
   React.useEffect(function () {
     setLoading(loading);
     if (fetchedData && fetchedData.data) {
-      var _requiredData$, _requiredData$2, _requiredData$3, _requiredData$4, _requiredData$5, _requiredData$6;
+      var _requiredData$, _requiredData$2, _requiredData$3, _requiredData$4, _requiredData$0$order, _requiredData$5, _requiredData$0$order2, _requiredData$6;
       var requiredData = fetchedData == null ? void 0 : fetchedData.data;
       setOrderDetails(requiredData[0]);
       //@ts-ignore
@@ -11246,8 +11244,8 @@ function OrderView() {
       //@ts-ignore
       setOrderProductId((_requiredData$4 = requiredData[0]) == null ? void 0 : _requiredData$4.id);
       setCustomerInfo({
-        recipient_name: (_requiredData$5 = requiredData[0]) == null || (_requiredData$5 = _requiredData$5.order_recipient) == null ? void 0 : _requiredData$5.recipient_name,
-        postcode: (_requiredData$6 = requiredData[0]) == null || (_requiredData$6 = _requiredData$6.order_recipient) == null ? void 0 : _requiredData$6.postcode
+        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
       });
       setPrevOrderDetails(requiredData[0]);
     }
@@ -11267,9 +11265,10 @@ function OrderView() {
   React.useEffect(function () {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
+      console.log(fetchedDepotData, 'fetchedDepotData');
       var requiredData = fetchedDepotData == null ? void 0 : fetchedDepotData.data;
       if (requiredData.length > 0) {
-        var options = requiredData.map(function (x) {
+        var options = requiredData == null ? void 0 : requiredData.map(function (x) {
           return {
             label: x.name,
             value: x.id
@@ -11305,27 +11304,30 @@ function OrderView() {
       // setOrderId(null);
     };
   }, [fetchedResourcesData, orderResources, setOrderResources]);
-  // Toolbox resources
-  var _useApiHook7 = dmsComponentLibrary.useApiHook({
-      endpoint: "/orders/" + orderId + "/toolbox_resources/",
-      method: 'GET',
-      performAction: false
-    }),
-    fetchedToolboxData = _useApiHook7.data,
-    setAction = _useApiHook7.setShouldPerformAction;
-  React.useEffect(function () {
-    if (orderId) {
-      setAction(true);
-    }
-  }, [orderId, setAction]);
-  React.useEffect(function () {
-    if (orderId) {
-      setOrderToolbox(fetchedToolboxData);
-    }
-    return function () {
-      // setOrderId(undefined);
-    };
-  }, [fetchedToolboxData, orderToolbox, setOrderToolbox]);
+  // // Toolbox resources
+  // const {
+  //   data: fetchedToolboxData,
+  //   setShouldPerformAction: setAction,
+  // } = useApiHook<{
+  //   data: ApiResponse[];
+  // }>({
+  //   endpoint: `/orders/${orderId}/toolbox_resources/`,
+  //   method: 'GET',
+  //   performAction: false,
+  // });
+  // useEffect(() => {
+  //   if (orderId) {
+  //     setAction(true);
+  //   }
+  // }, [orderId, setAction]);
+  // useEffect(() => {
+  //   if (orderId) {
+  //     setOrderToolbox(fetchedToolboxData);
+  //   }
+  //   return () => {
+  //     // setOrderId(undefined);
+  //   };
+  // }, [fetchedToolboxData, orderToolbox, setOrderToolbox]);
   React.useEffect(function () {
     return function () {
       setGsitCUstomerId(function (prev) {
@@ -11335,14 +11337,14 @@ function OrderView() {
       });
     };
   }, []);
-  var _useApiHook8 = dmsComponentLibrary.useApiHook({
+  var _useApiHook7 = dmsComponentLibrary.useApiHook({
       endpoint: "/return_locations/?customer_id=" + (GsitCUstomerId == null ? void 0 : GsitCUstomerId.id),
       method: 'GET',
       performAction: false
     }),
-    fetchedLocationData = _useApiHook8.data,
-    dataLoading = _useApiHook8.loading,
-    shouldFetch = _useApiHook8.setShouldPerformAction;
+    fetchedLocationData = _useApiHook7.data,
+    dataLoading = _useApiHook7.loading,
+    shouldFetch = _useApiHook7.setShouldPerformAction;
   React.useEffect(function () {
     if (GsitCUstomerId != null && GsitCUstomerId.id) {
       shouldFetch(true);