@bjsdistribution/dms-client-return 0.1.61-prod → 0.1.62-prod

package/package.json

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

package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx

@@ -16,6 +16,7 @@ import {
   useIsShowNorthSouth,
   useNewReturnOrderData,
   useSelectedProducts,
+  useClientPortal,
 } from '../../../store';
 import styled from 'styled-components';
 import { NavLink } from 'react-router-dom';
@@ -36,6 +37,7 @@ const ReturnProductTable = (props: IPROS) => {
   const [orderId] = useOrderId();
   const [returnOrderData] = useNewReturnOrderData();
   const [isNorthSouth] = useIsShowNorthSouth();
+  const [isClientPortal] = useClientPortal();
 
   // const handleActionClick = (id: number) => {
   //   setSelectedRowId(id);
@@ -147,6 +149,7 @@ const ReturnProductTable = (props: IPROS) => {
               <th>Code</th>
               <th>Description</th>
               <th>Return Reason</th>
+              {!isClientPortal && <th>Additional Services</th>}
               <th>Part</th>
               <th>Action</th>
             </tr>
@@ -199,6 +202,25 @@ const ReturnProductTable = (props: IPROS) => {
                     <td>{product?.code}</td>
                     <td>{product?.description}</td>
                     <td>{product?.return_reason}</td>
+                    {!isClientPortal && (
+                      <td>
+                        {Array.isArray(product?.product_addon_services) && product?.product_addon_services?.length > 0
+                          ? product.product_addon_services
+                              .map((service: any) => service?.service_code || service?.name || service)
+                              .filter(Boolean)
+                              .join(', ')
+                          : Array.isArray(product?.addon_services) && product?.addon_services?.length > 0
+                            ? product.addon_services
+                                .map((service: any) => service?.service_code || service?.name || service)
+                                .filter(Boolean)
+                                .join(', ')
+                            : Array.isArray(product?.addon_services_list) && product?.addon_services_list?.length > 0
+                              ? product.addon_services_list.join(', ')
+                              : typeof product?.addon_services === 'string' && product?.addon_services.trim() !== ''
+                                ? product.addon_services
+                                : 'NA'}
+                      </td>
+                    )}
                     <td>{product?.part}</td>
                     <td>
                       <div
@@ -212,7 +234,7 @@ const ReturnProductTable = (props: IPROS) => {
 
                   {/* EXPANDED ROW */}
                   {isNorthSouth === true && (
-                    <td colSpan={8}>
+                    <td colSpan={isClientPortal ? 8 : 9}>
                       <NSWrapper>
                         <div className="left">Northern/Southern Ireland</div>
                         <div className="left-end"></div>