@bjsdistribution/dms-client-return 0.1.10-prod → 0.1.11-prod

package/package.json

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

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

@@ -239,6 +239,7 @@ const OrderTable = () => {
               <th>Consignment</th>
               <th>Return Order No</th>
               <th> Total Parts</th>
+              <th> Total Orders</th>
               <th onClick={() => handleSort('weight')}>
                 <div className="sortIconClass">
                   Total Weight {renderSortIcon('weight')}
@@ -328,6 +329,8 @@ const OrderTable = () => {
                     <td>{displayValueOrNA(item?.order_number)}</td>
 
                     <td>{displayValueOrNA(item?.total_products)}</td>
+                    <td>{displayValueOrNA(item?.total_orders)}</td>
+
                     <td>
                       {displayValueOrNA(item?.weight)}{' '}
                       {item?.weight && item?.weight > 0 ? 'KG' : ''}

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

@@ -158,6 +158,7 @@ const ReturnTable: React.FC = () => {
                 { label: 'Products', key: 'return_order_products' },
                 { label: 'RTS', key: 'RTS' },
                 { label: 'Pending', key: 'PENDING' },
+                { label: 'Claims Paid', key: 'CLAIMS PAID' },
                 { label: 'Dispose', key: 'DISPOSE' },
                 { label: 'Re-allocate', key: 'RE-ALLOCATE' },
                 { label: 'Re-Del', key: 'RE-DEL' },
@@ -249,6 +250,11 @@ const ReturnTable: React.FC = () => {
                         <GreyBox>{key?.PENDING}</GreyBox>
                       </ColumStyle>
                     </td>
+                    <td>
+                      <ColumStyle>
+                        <GreyBox>{key?.['CLAIMS PAID']}</GreyBox>
+                      </ColumStyle>
+                    </td>
                     <td>
                       <ColumStyle>
                         <GreyBox>{key?.DISPOSE}</GreyBox>

package/src/components/order-view/order-details/expanded-content/services-section/ServiceLevel.tsx

@@ -8,13 +8,12 @@ function ServiceLevel() {
   const [orderStaticData] = useOrderStaticData();
   const [orderData, setOrderData] = useOrderDetails();
 
-  const serviceLevelId =
-    orderData?.order_services_detail?.order_service_level_id;
+  const serviceLevelId = orderData?.order_services_detail?.order_service_level_id?.toString();
 
   const serviceLevelOptions = orderStaticData?.order_service_levels?.map(
     (option: any) => ({
       label: capitalize(option.type.replaceAll('_', ' ')),
-      value: option.id.toString(),
+      value: option?.id?.toString(),
     })
   );
 
@@ -32,7 +31,7 @@ function ServiceLevel() {
   return (
     <Container disabled={isDisabled}>
       <RadioButtonGroup
-        selectedValue={serviceLevelId?.toString() || ''}
+        selectedValue={serviceLevelId || ''}
         heading="Service Level"
         options={serviceLevelOptions || []}
         onChange={radioGroupHandler}