@bjsdistribution/dms-client-return 0.0.52 → 0.0.54

package/package.json

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

package/src/components/order-daily-overview/common/fakedata.tsx

@@ -93,12 +93,30 @@ export const TableData = [
   },
 ];
 
-export const optionsPrint = [
-  { icon: 'runSheet', label: 'Print Runsheet' },
-  { icon: 'loadSheet', label: 'Print Loadsheet' },
-  { icon: 'deliveryLables', label: 'Print Delivery Labels' },
-  { icon: 'customerLables', label: 'Print Customer Labels' },
-  { icon: 'collectionLables', label: 'Print Collection Labels' },
+interface PrintOption {
+  icon: string;
+  label: string;
+  type: string;
+}
+
+export const optionsPrint: PrintOption[] = [
+  { icon: 'runSheet', label: 'Print Runsheet', type: 'runsheet_url' },
+  { icon: 'loadSheet', label: 'Print Loadsheet', type: 'loadsheet_url' },
+  {
+    icon: 'deliveryLables',
+    label: 'Print Delivery Labels',
+    type: 'delivery_label_url',
+  },
+  {
+    icon: 'customerLables',
+    label: 'Print Customer Labels',
+    type: 'customer_label_url',
+  },
+  {
+    icon: 'collectionLables',
+    label: 'Print Return Labels',
+    type: 'return_label_url',
+  },
 ];
 
 export const optionsForReturnPrint = [

package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx

@@ -372,9 +372,9 @@ const OrderTable = ({ loadingskeleton }: any) => {
                             <PrinterIcon />
                             <DownIcon />
 
-                            {printToogle == index && (
+                            {printToogle === index && (
                               <div ref={dropdownRef}>
-                                <PrintDropDown legacyProductId={item.id} />
+                                <PrintDropDown legacyProductId={item} />
                               </div>
                             )}
                           </li>
@@ -383,13 +383,6 @@ const OrderTable = ({ loadingskeleton }: any) => {
                           <LoadIcon />
                         </li>
                       </ul>
-                      {/* <div className="shareIconContainer">
-                      <PrinterIcon />
-                      <DownIcon />
-                    </div>
-                    <div className="downloadcontainer">
-                      <LoadIcon />
-                    </div> */}
                     </td>
                   </tr>
                 );

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

@@ -236,9 +236,10 @@ export const StyledTable = styled.table`
   thead {
     white-space: nowrap;
     position: sticky;
-    top: 0px;
+    top: 10px;
     z-index: 1;
     background: #fff;
+    box-shadow: 0px 0px 1px #ffffff, 0px -10px 1px #ffffff;
     tr {
       border-radius: 40px;
       border-spacing: 0 10px;

package/src/components/order-daily-overview/shared/elements/PrintDropDown.tsx

@@ -8,43 +8,30 @@ const PrintDropDown = ({
 }: {
   legacyProductId: Record<string, any>;
 }) => {
-  const downloadFiles = (label: string) => {
-    const url =
-      legacyProductId?.[
-        `${label
-          .replace('Print ', '')
-          .toLowerCase()
-          .replace(' ', '_')}_url`
-      ];
+  const downloadFiles = (type: string) => {
+    let url: string | undefined;
+
+    if (type) {
+      url = legacyProductId[type];
+    }
 
     if (url) {
       window.open(url, '_blank');
     } else {
-      console.log('URL not available for', label);
+      console.log('URL not available for', type);
     }
   };
 
-  const isOptionDisabled = (label: string) => {
-    const url =
-      legacyProductId?.[
-        `${label
-          .replace('Print ', '')
-          .toLowerCase()
-          .replace(' ', '_')}_url`
-      ];
-    return !url;
-  };
-
   return (
     <OptionsList>
-      {optionsPrint.map((item, index) => {
+      {optionsPrint?.map((item, index) => {
         const IconComponent = PrintIconMap[item.icon];
-        const isDisabled = isOptionDisabled(item.label);
+        const isDisabled = !legacyProductId[item.type];
 
         return (
           <OptionsListLi
             key={index}
-            onClick={() => !isDisabled && downloadFiles(item.label)}
+            onClick={() => !isDisabled && downloadFiles(item.type)}
             disabled={isDisabled}
           >
             {IconComponent && <IconComponent />}

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

@@ -47,9 +47,10 @@ export const StyledTable = styled.table`
   /* min-width: 1600px; */
   thead {
     position: sticky;
-    top: 0px;
+    top: 10px;
     z-index: 1;
     background: #fff;
+    box-shadow: 0px 0px 1px #ffffff, 0px -10px 1px #ffffff;
     tr {
       border-radius: 40px;
       border-spacing: 0 10px;

package/src/components/order-view/hooks/useGetEventNotes.tsx

@@ -7,7 +7,7 @@ function useGetEventNotes() {
   const ssoToken = getCookie('id_token');
 
   const perform = async () => {
-    const endpoint = `${getBaseEndpoint()}events/get/event_information/`;
+    const endpoint = `${getBaseEndpoint()}/events/get/event_information/`;
     // setLoading(true);
     try {
       const headers = {