@bjsdistribution/dms-client-return 0.0.46 → 0.0.48

package/package.json

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

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -163,13 +163,15 @@ function SelectionFilter() {
         customerId: selectedClient?.toString(),
       });
       const currentSearch = window.location.search;
+      console.log(currentSearch, 'currentSearch');
 
       if (!currentSearch.includes('filter')) {
+        console.log('inside include');
         // for dev
-        navigate(`filter?${queryParams.toString()}`);
+        navigate(`/order/return/filter?${queryParams.toString()}`);
 
         // for local
-        // navigate(`/filter?${queryParams.toString()}`);
+        //navigate(`/filter?${queryParams.toString()}`);
       }
     }
 
@@ -270,7 +272,7 @@ function SelectionFilter() {
   useEffect(() => {
     if (clearState) {
       dispatch({ type: 'CLEAR_CLIENT' });
-      window.location.href = '/returnclient';
+      window.location.href = '/order/return';
     }
   }, [clearState]);
 

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

@@ -138,10 +138,10 @@ const ReturnTable: React.FC = () => {
       customerId: customerId?.toString(),
     });
     //for dev
-    navigate(`filter?${queryParams.toString()}`);
+    //navigate(`filter?${queryParams.toString()}`);
 
     //for local
-    //navigate(`/filter?${queryParams.toString()}`);
+    navigate(`/filter?${queryParams.toString()}`);
   };
 
   //for RTS
@@ -167,10 +167,10 @@ const ReturnTable: React.FC = () => {
       type: RTS,
     });
     //for dev
-    navigate(`filter?${queryParams.toString()}`);
+    //navigate(`filter?${queryParams.toString()}`);
 
     //for local
-    //navigate(`/filter?${queryParams.toString()}`);
+    navigate(`/filter?${queryParams.toString()}`);
   };
 
   return (

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

@@ -114,7 +114,7 @@ const ModalManager = () => {
       // navigate('/order-return');
 
       // for dev
-      navigate('/returnclient/order-return');
+      navigate('/order/return/view');
     }
   }, [postLoading]);
 

package/src/components/order-view/order-details/expanded-content/orders-section/RecipientReference.tsx

@@ -2,10 +2,15 @@ import { Input, Label } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { useOrderDetails } from '../../../store';
+import CopyText from '../../../../../common/copy/CopyText';
 
 function RecipientReference() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
-
+  const orderRecipient = orderDetails?.recipient_reference;
+  const showCopyIcon =
+    orderRecipient !== undefined &&
+    orderRecipient !== null &&
+    orderRecipient?.length > 0;
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setOrderDetails(prev => {
       return {
@@ -16,7 +21,10 @@ function RecipientReference() {
   };
   return (
     <Container>
-      <Label label="Recipient Reference" htmlFor="recipient-reference" />
+      <Wrapper>
+        <Label label="Recipient Reference" htmlFor="recipient-reference" />
+        {showCopyIcon && <CopyText text={orderRecipient!} />}
+      </Wrapper>
       <Input
         name="recipient-reference"
         type="text"
@@ -36,4 +44,10 @@ const Container = styled.div`
   flex: 1;
 `;
 
+const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 5px;
+`;
+
 export default RecipientReference;

package/src/index.tsx

@@ -120,13 +120,13 @@ function ReturnClient() {
       <Suspense fallback={<LoadingMessage />}>
         <Routes>
           {/* for local */}
-          {/* <Route path="returnclient" element={<ReturnMainTable />} /> */}
+          {/* <Route path="order/return" element={<ReturnMainTable />} /> */}
 
           {/* for dev */}
           <Route path="" element={<ReturnMainTable />} />
 
-          <Route path="order-return" element={<ReturnAfterTable />} />
-          <Route path="order-return/:id" element={<OrderView />} />
+          <Route path="view" element={<ReturnAfterTable />} />
+          <Route path="view/:id" element={<OrderView />} />
           <Route path="filter" element={<ReturnTable />} />
 
           {/* <Route