@bjsdistribution/dms-client-return 0.0.45 → 0.0.47

package/package.json

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

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

@@ -162,11 +162,17 @@ function SelectionFilter() {
       const queryParams = new URLSearchParams({
         customerId: selectedClient?.toString(),
       });
-      //for dev
-      navigate(`filter?${queryParams.toString()}`);
+      const currentSearch = window.location.search;
+      console.log(currentSearch, 'currentSearch');
 
-      //for local
-      //navigate(`/filter?${queryParams.toString()}`);
+      if (!currentSearch.includes('filter')) {
+        console.log('inside include');
+        // for dev
+        navigate(`/order/return/filter?${queryParams.toString()}`);
+
+        // for local
+        //navigate(`/filter?${queryParams.toString()}`);
+      }
     }
 
     const selectedClientValue = clientOptions?.find(

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

@@ -88,6 +88,7 @@ const Heading = styled.div`
   font-style: normal;
   font-weight: 500;
   line-height: 18px;
+  text-transform: uppercase;
 `;
 
 const Container = styled.div`

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