@bjsdistribution/dms-client-return 0.0.31 → 0.0.33

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.31",
+  "version": "0.0.33",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/return-order-table/return-orders-filters/returnstyles.ts

@@ -515,15 +515,16 @@ export const StyledTable = styled.table`
 
 // Styled components
 export const StyledTableWrapper = styled.div`
-  overflow-x: auto;
   max-height: 60vh;
+  overflow-x: auto;
   scrollbar-width: none;
+  min-height: 50vh;
 
   .fortables {
-    overflow-x: auto;
     max-height: 60vh;
+    overflow-x: auto;
     scrollbar-width: none;
-    min-height: 60vh;
+    min-height: 50vh;
   }
   /* height: 600px; */
   /* box-shadow: 0px 0px 30px 6px rgba(46, 45, 116, 0.05); */

package/src/components/order-daily-overview/table/ReturnTable.tsx

@@ -90,7 +90,7 @@ const ReturnTable: React.FC = ({ loadingskeleton }: any) => {
       });
     }
     const selectedClientString = customerName?.replace(/\s+/g, '-');
-    navigate(`/filter/${selectedClientString}`);
+    navigate(`filter/${selectedClientString}`);
   };
 
   return (

package/src/components/order-daily-overview/table/table-data/styles.ts

@@ -59,7 +59,7 @@ export const StyledTable = styled.table`
         }
       }
       .emailInvoiceNo {
-        padding-left: 0px;
+        padding-left: 12px;
       }
       .emailInvoiceShare {
         width: 100px;

package/src/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.tsx

@@ -1,29 +1,25 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { useAtom } from 'jotai';
-import { countReducerAtom } from '../../../store';
+import { useCurrentAction } from '../../../store';
 import DropDownItem from './DropDownItem';
 import DropDownMenu from './DropDownMenu';
 import { DropDownContainer } from './DropdownStyles';
 import DropDownLarge from '../../../../../assets/icons/DropDownLarge';
-// import { countReducerAtom } from '../../../store/store';
 
 const Options = [
-  { label: 'Add Order Resource ', value: 'add-order-resources' },
+  // { label: 'Add Order Resource ', value: 'add-order-resources' },
   { label: 'Split Order ', value: 'split-order' },
 ];
 
 const MenuDropDown: React.FC = () => {
   const [isOpen, setIsOpen] = useState(false);
-  const [, dispatch] = useAtom(countReducerAtom);
   const dropdownRef = useRef<HTMLDivElement>(null);
-
+  const [, setCurrentAction] = useCurrentAction();
   const handleClick = () => {
     setIsOpen(prev => !prev);
   };
 
-  const handleSelect = (value: string) => {
-    console.log(`Selected: ${value}`);
-    dispatch({ type: value });
+  const handleSelect = (selectedOption: any) => {
+    setCurrentAction(selectedOption);
     setIsOpen(false);
   };
 

package/src/components/order-view/general-information/Status.tsx

@@ -63,7 +63,7 @@ const renderIcon = (value: any, orderStatus: any) => {
       } else if (status.delivered === true && status.completed === true) {
         return <SuccessIcon />;
       } else if (status.delivered === true && status.completed === false) {
-        return <RouteIcon />;
+        return <RouteIcon />; //orange
       } else {
         return <ConfirmedIcon />;
       }

package/src/components/order-view/modalsPopup/ModalManager.tsx

@@ -3,24 +3,13 @@ import { AntModal, useApiHook } from '@bjsdistribution/dms-component-library';
 import { useAtom } from 'jotai';
 import {
   countReducerAtom,
-  letselectedProductIdAtom,
-  selectedTabKeyAtom,
   useCreateOrderProducts,
   useDeleteProdsID,
   usefetchAgain,
-  // usefetchAgain,
-  useOrderId,
   useProductDetails,
-  useRecieveOrderProducts,
-  useUpdateOrderProducts,
 } from '../store';
 
-import ProductAction from './ProductAction';
-// import DeleteProduct from './DeleteProduct';
-// import AddProduct from './AddProduct';
-import logsTable from './qclogs/logsTable';
 import DefectsModal from './DefectsModal';
-import repackModal from './RepackModal';
 import { ApiResponse } from '../types';
 import CreateReturnModal from './CreateReturnModal';
 import {
@@ -39,12 +28,7 @@ const ModalManager = () => {
   const [popupName, dispatch] = useAtom(countReducerAtom);
   const [,] = useProductDetails();
   const [orderProduct] = useCreateOrderProducts();
-  const [orderId] = useOrderId();
   const [selectedRows] = useDeleteProdsID();
-  const [unRecieve, setUnRecieve] = useRecieveOrderProducts();
-  const [updateOrderProduct, setUpdateOrderProduct] = useUpdateOrderProducts();
-  const [selectedProductId] = useAtom(letselectedProductIdAtom);
-  const [selectedTab] = useAtom(selectedTabKeyAtom);
   const [, setIsFormValid] = useState(false);
   const [newGrouped] = useFinalPayload();
   const [postLoading, SetPostLoading] = usePostLoading();
@@ -71,66 +55,6 @@ const ModalManager = () => {
     setIsFormValid(validateForm());
   }, [selectedRows]);
 
-  // api block for the create product order
-  const {
-    data: actionResponse,
-    setShouldPerformAction: setUnrecieveaction,
-  } = useApiHook<{
-    data: ApiResponse[];
-  }>({
-    endpoint: `order/order_products/unrecieve/`,
-    method: 'POST',
-    body: [unRecieve],
-    performAction: false,
-  });
-
-  useEffect(() => {
-    if (actionResponse && actionResponse?.data) {
-      dispatch({ type: 'close' });
-    }
-  }, [actionResponse]);
-
-  // api block for the update product order
-  const {
-    data: updateResponse,
-    setShouldPerformAction: setUpdateSction,
-  } = useApiHook<{
-    data: ApiResponse[];
-  }>({
-    endpoint: `order/order_products/type/update/`,
-    method: 'PUT',
-    body: [updateOrderProduct],
-    performAction: false,
-  });
-
-  const onSubmit = () => {
-    if (selectedTab === '1') {
-      setUpdateOrderProduct((prev: any) => ({
-        ...prev,
-        order_id: orderId,
-        id: selectedProductId,
-      }));
-      setUpdateSction(true);
-      console.log('Tab 1 selected');
-    } else if (selectedTab === '2') {
-      console.log('Tab 2 selected');
-    } else if (selectedTab === '3') {
-      setUnRecieve((prev: any) => ({
-        ...prev,
-        order_id: orderId,
-        id: selectedProductId,
-      }));
-      setUnrecieveaction(true);
-      console.log('Tab 3 selected');
-    }
-  };
-
-  useEffect(() => {
-    if (updateResponse && updateResponse?.data) {
-      dispatch({ type: 'close' });
-    }
-  }, [updateResponse]);
-
   // Confirm return popup
   const {
     data: response,
@@ -258,49 +182,7 @@ const ModalManager = () => {
           />
         </>
       )}
-      {popupName?.state === 'qclog' && (
-        <AntModal
-          openStatus={popupName?.state === 'qclog'}
-          closeModal={closeModal}
-          PopupHeader={{
-            heading: 'Deliver - STOHOP011GRY-UK - 006064438012831476',
-            subHeading: '[Hopkins Highboard, Walnut Effect Grey]',
-          }}
-          PopupFooter={{
-            btns: [
-              {
-                name: 'Submit',
-                btnStyle: 'rounded',
-                onClick: onSubmit,
-              },
-            ],
-          }}
-          BodyComponent={ProductAction}
-          width={1104}
-          classNameAdd={'globalPopup'}
-        />
-      )}
-      {popupName?.state == 'qclogtable' && (
-        <AntModal
-          openStatus={popupName?.state == 'qclogtable' ? true : false}
-          closeModal={closeModal}
-          PopupHeader={{
-            heading: 'Deliver-AI-00030345784968148412',
-            subHeading: '[Centralized regional adpated] ',
-          }}
-          PopupFooter={{
-            btns: [
-              {
-                name: 'Submit',
-                btnStyle: 'rounded',
-              },
-            ],
-          }}
-          BodyComponent={logsTable}
-          width={1104}
-          classNameAdd={'globalPopup'}
-        />
-      )}
+
       {popupName?.state == 'defectsModal' && (
         <AntModal
           openStatus={popupName?.state == 'defectsModal' ? true : false}
@@ -324,29 +206,6 @@ const ModalManager = () => {
           classNameAdd={'globalPopup'}
         />
       )}
-      {popupName?.state == 'repackModal' && (
-        <AntModal
-          openStatus={popupName?.state == 'repackModal' ? true : false}
-          closeModal={closeModal}
-          PopupHeader={{
-            heading: 'DEliver - DWLK1006 - 00605',
-            subHeading: 'ALtair TV stand for TVs up to 60',
-          }}
-          PopupFooter={{
-            btns: [
-              {
-                name: '',
-                btnStyle: '',
-                type: '',
-              },
-            ],
-            btnAlign: '',
-          }}
-          BodyComponent={repackModal}
-          width={1504}
-          classNameAdd={'globalPopup'}
-        />
-      )}
     </>
   );
 };

package/src/components/order-view/order-actions/actions/split-order/SplitOrderTable.tsx

@@ -7,9 +7,9 @@ import { Checkbox } from '@bjsdistribution/dms-component-library';
 import { useSelectedSplit, useSplitOrderPayload } from '../../store';
 import {
   EmptyDataContainer,
+  StyledTable,
   StyledTableWrapper,
 } from '../confirm-order/tables/ReminderStyles';
-import { StyledTable } from '../modalstyle';
 
 function SplitOrderTable() {
   const [orderProductDetails] = useProductDetails();
@@ -48,7 +48,7 @@ function SplitOrderTable() {
   useEffect(() => {
     setPayload({
       ...payload,
-      return_order: 0,
+      return_order: 1, // FOR SPLIT ORDER WE ARE ASKED TO SET THIS AS 1
       products: selectedSplits?.map(order => order.id),
       force: true,
     });

package/src/components/order-view/order-actions/index.tsx

@@ -5,17 +5,14 @@ import { useCurrentAction } from '../store';
 import SplitOrder from './actions/split-order';
 import LogServiceRefusal from './actions/log-service-refusal';
 import CancelOrder from './actions/cancel-order';
-import UpdateProductType from './actions/update-product-type/UpdateProductType';
 import ConfirmOrder from './actions/confirm-order';
 import SendSmsModal from './actions/send-sms/SendSmsModal';
 import SendEmailModal from './actions/send-email/SendEmailModal';
 import ChangeCustomerAccModal from './actions/change-customer-account/ChangeCustomerAccModal';
 import HoldOrderModal from './actions/hold-order/HoldOrderModal';
-import EscalationModal from './actions/escalation/EscalationModal';
 import LogFeedback from './actions/log-feedback/LogFeedback';
 import ChargeLog from './actions/charge-log';
 import UnholdOrder from './actions/unhold-order/UnholdOrder';
-import RestoreProducts from './actions/restore-products/RestoreProducts';
 import ViewReminderModal from '../view-reminder/ViewReminder';
 import TaskReminderModal from './actions/create-task-reminder';
 import OrderLock from './actions/order-lock';
@@ -29,8 +26,6 @@ function OrderActions() {
     switch (currentAction) {
       case 'add-resources':
         return <AddResources />;
-      case 'bulk-update':
-        return <UpdateProductType />;
       case 'split-order':
         return <SplitOrder />;
       case 'release-order':
@@ -53,8 +48,6 @@ function OrderActions() {
         return <ChangeCustomerAccModal />;
       case 'hold-order':
         return <HoldOrderModal />;
-      case 'escalations':
-        return <EscalationModal />;
       case 'create-task':
         return <TaskReminderModal />;
       case 'log-feedback':
@@ -63,8 +56,6 @@ function OrderActions() {
         return <ChargeLog />;
       case 'unhold-order':
         return <UnholdOrder />;
-      case 'restore-products':
-        return <RestoreProducts />;
       case 'view-reminder':
         return <ViewReminderModal />;
       case 'order-lock':

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -122,6 +122,7 @@ const Container = styled.div`
   background: #f8fafc;
   margin: 0px;
   border-radius: 0px 0px 8px 8px;
+  align-items: center;
 `;
 
 export default OrderDetailsFooter;

package/src/components/order-view/store.ts

@@ -475,7 +475,12 @@ const popupReducer = (state: any, action: any) => {
   } else if (action.type === 'addProduct') {
     state = 'addProduct';
     return { state };
-  } else if (action.type === 'deleteProduct') {
+  }
+  else if (action.type === 'split-order') {
+    state = 'split-order';
+    return { state };
+  }  
+  else if (action.type === 'deleteProduct') {
     state = 'deleteProduct';
     return { state };
   } else if (action.type === 'defectsModal') {