@bjsdistribution/dms-client-return 0.1.50-prod → 0.1.51-prod

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.50-prod",
+  "version": "0.1.51-prod",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -99,4 +99,4 @@
     "react-switch-selector": "^2.2.1",
     "uuid": "^10.0.0"
   }
-}
+}

package/src/components/order-view/order-actions/actions/cancel-order/index.tsx

@@ -43,7 +43,7 @@ function CancelOrder(props: IProps) {
 
   const [cancelNotes, setCancelNotes] = useState<string>('');
 
-  const cancelReasonOptions = orderStaticData?.cancellation_reasons?.map(
+  const cancelReasonOptions = orderStaticData?.return_cancellation_reasons?.map(
     (item: any) => {
       return {
         label: item?.reason,
@@ -68,17 +68,17 @@ function CancelOrder(props: IProps) {
     const modifiedReceivedProducts =
       receivedProducts?.length > 0
         ? receivedProducts?.map((product: any) => {
-            return {
-              order_product_id: product?.id,
-              action: '',
-              return_action: '',
-              return_reason: '',
-              code: product?.code,
-              description: product?.description,
-              sku: product?.sku,
-              product_type: product?.order_product_type?.type,
-            };
-          })
+          return {
+            order_product_id: product?.id,
+            action: '',
+            return_action: '',
+            return_reason: '',
+            code: product?.code,
+            description: product?.description,
+            sku: product?.sku,
+            product_type: product?.order_product_type?.type,
+          };
+        })
         : [];
     setCancelOrderProducts(modifiedReceivedProducts);
   }, [orderProductDetails]);
@@ -187,7 +187,7 @@ function CancelOrder(props: IProps) {
     }
   };
 
-  const showSubmitBtn = cancelReason !== undefined && cancelNotes?.length > 0;
+  const showSubmitBtn = cancelReason !== undefined;
 
   return (
     <OrderActionModal
@@ -218,8 +218,7 @@ function CancelOrder(props: IProps) {
           <TopRight>
             <Container>
               <div style={{ display: 'flex', flexDirection: 'row' }}>
-                <Label>Cancellation Note</Label>{' '}
-                <RequiredAsterisk>*</RequiredAsterisk>
+                <Label>Cancellation Note</Label>
               </div>
               <TArea
                 rows={5}
@@ -237,11 +236,6 @@ function CancelOrder(props: IProps) {
     </OrderActionModal>
   );
 }
-const RequiredAsterisk = styled.span`
-  color: red;
-  margin-left: 2px;
-  font-size: x-small;
-`;
 
 const TArea = styled(TextArea)`
   resize: none;