@bjsdistribution/dms-client-return 0.0.49 → 0.0.51

package/package.json

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

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

@@ -328,8 +328,9 @@ const OrderTable = ({ loadingskeleton }: any) => {
                     <td>{displayValueOrNA(item?.box_count)}</td>
                     <td>
                       {displayValueOrNA(item?.weight)}{' '}
-                      {item?.weight && item?.weight !== null ? 'KG' : ''}
+                      {item?.weight && item?.weight > 0 ? 'KG' : ''}
                     </td>
+
                     <td>{displayValueOrNA(item?.cube)}</td>
                     <td key={item.id}>
                       <StyledAntSelect

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

@@ -228,7 +228,7 @@ const ReturnOrderFilter = () => {
                   placeholder="Assignee"
                   onChange={handleAssigneeChange}
                   value={selectedAssignee}
-                  style={{ minWidth: '100px' }}
+                  style={{ minWidth: '120px' }}
                   allowClear
                   onClear={handleClearAssignee}
                 />

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

@@ -521,13 +521,11 @@ export const StyledTable = styled.table`
 export const StyledTableWrapper = styled.div`
   max-height: 60vh;
   overflow-x: auto;
-  scrollbar-width: none;
   min-height: 50vh;
 
   .fortables {
     max-height: 60vh;
     overflow-x: auto;
-    scrollbar-width: none;
     min-height: 50vh;
   }
   /* height: 600px; */

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

@@ -19,7 +19,6 @@ export const GreyBox = styled.div`
 export const StyledTableWrapper = styled.div`
   overflow-x: auto;
   max-height: calc(100vh - 396px);
-  scrollbar-width: none;
   /* box-shadow: 0px 0px 30px 6px rgba(46, 45, 116, 0.05); */
   &::-webkit-scrollbar {
     width: 5px;

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

@@ -17,6 +17,18 @@ function OrderServices() {
 
   const orderServicesOptions = orderStaticData?.order_service_list;
 
+  const desiredOrder = [
+    'unpack_items',
+    'take_packaging_away',
+    'assemble',
+    'disassemble',
+    'collect_disposal',
+  ];
+
+  const sortedServices = orderServicesOptions?.sort((a: any, b: any) => {
+    return desiredOrder.indexOf(a.type) - desiredOrder.indexOf(b.type);
+  });
+
   const toggleServices = (id: number) => {
     const clone = [...orderServices];
     const selectedService = clone?.find(
@@ -197,7 +209,7 @@ function OrderServices() {
 
   return (
     <Container disabled={isDisabled}>
-      {orderServicesOptions?.map((service: any) => {
+      {sortedServices?.map((service: any) => {
         const selected = !!orderServices?.find(
           (s: OrderServiceType) =>
             s?.order_service_list_id === service?.id && s.is_deleted === false

package/src/index.tsx

@@ -44,7 +44,10 @@ function ReturnClient() {
   };
   const paths = splitPath(location.pathname);
   useEffect(() => {
-    if (paths[paths.length - 1] === 'returnclient') {
+    if (
+      paths[paths.length - 2] === 'order' ||
+      paths[paths.length - 2] === 'return'
+    ) {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);