contentoh-components-library 21.3.59 → 21.3.60

package/src/components/pages/ProviderProductEdition/index.js

@@ -39,6 +39,9 @@ import Slide1_4 from "../../../assets/images/sliderToolTip/slide4.svg";
 import Slide1_5 from "../../../assets/images/sliderToolTip/slide5.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
 import { useCloseModal } from "../../../global-files/customHooks";
+import { createMessage, sendMessage } from "../RetailerProductEdition/utils";
+import { Modal } from "../../organisms/Modal";
+import { ButtonV2 } from "../../atoms/ButtonV2";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -214,6 +217,7 @@ export const ProviderProductEdition = ({
   const isRetailer = user?.is_retailer;
   const [loading, setLoading] = useState(true);
   const [validatedAll, setValidatedAll] = useState(false);
+  const [showRejectModal, setShowRejectModal] = useState(false);
 
   const originProp = location?.state?.origin;
   const [origin, setOrigin] = useState({
@@ -343,28 +347,6 @@ export const ProviderProductEdition = ({
     (type) => {
       const formatter = new Intl.ListFormat("es", { type: "conjunction" });
       switch (type) {
-        case "error":
-          setGlobalModal({
-            message: `${activeTab} rechazada`,
-            detail: "Agrega tu comentarios para enviar el rechazo",
-            img: errorModal,
-            textArea: true,
-            button1: {
-              name: "Enviar",
-              action: (e) => {
-                const textArea = document.querySelector("#area");
-                if (textArea.value) {
-                  textArea.style.border = "none";
-                  createComment(e, textArea.value);
-                  showGlobalModal("commentsSent");
-                  validatedAll ? validateAll("R") : sendEvaluation("R");
-                } else {
-                  textArea.style.border = "2px solid red";
-                }
-              },
-            },
-          });
-          break;
         case "generic":
           setGlobalModal(dataGenericModal);
           break;
@@ -516,7 +498,9 @@ export const ProviderProductEdition = ({
       );
       setServicesData(parsedResponse);
     }
-    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
+    retailers &&
+      !activeRetailer.id &&
+      setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {
@@ -592,7 +576,7 @@ export const ProviderProductEdition = ({
       });
     }
     setProduct(productTemp);
-    setActivePercentage(retailers[0]?.percentage);
+    retailers && setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   const loadInputs = () => {
@@ -833,32 +817,19 @@ export const ProviderProductEdition = ({
     }
   };
 
-  const createComment = async (e, body, tab) => {
-    let concept = "";
-    switch (activeTab) {
-      case "Ficha técnica":
-        concept = "datasheet";
-        break;
-      case "Imágenes":
-        concept = "images";
-        break;
-
-      default:
-        concept = "description";
-        break;
-    }
+  const createComment = async (messages = [], retailerId) => {
     const data = {
-      articleId: product?.id_article,
-      orderId: product?.orderId,
-      message: body,
-      concept: concept,
-      version: version,
-    };
-    await axios.post(`${process.env.REACT_APP_COMMENTS_ENDPOINT}`, data, {
-      headers: {
-        Authorization: token,
+      paramsBody: {
+        id: product.article.id_article || productEdit.ArticleId,
+        version: version,
+        items: messages,
+        retailerId: retailerId,
+        status: product.status || productEdit.product.status,
       },
-    });
+      paramsHeader: { Authorization: token },
+    };
+    setMessage("");
+    return sendMessage(data);
   };
 
   useEffect(() => {
@@ -1058,6 +1029,27 @@ export const ProviderProductEdition = ({
         const { newArticleStatus, newServiceStatus, newStatus } = JSON.parse(
           res.data.body
         );
+
+        const message = createMessage(
+          product.retailers || product.retailersAvailable,
+          activeRetailer.id,
+          product[sectionStatusKey],
+          newStatus,
+          activeTab
+        );
+
+        const messageData = {
+          paramsBody: {
+            id: product.article.id_article || productEdit.ArticleId,
+            version: version,
+            items: [{ type: "status", value: message }],
+            retailerId: activeRetailer.id,
+            status: product.status || productEdit.product.status,
+          },
+          paramsHeader: { Authorization: token },
+        };
+        await sendMessage(messageData);
+
         if (newArticleStatus) productTemp.status = newArticleStatus[articleId];
         const retailerStatusCopy = { ...retailerStatus };
         retailerStatusCopy[activeRetailer.id][concept] = newStatus;
@@ -1089,6 +1081,7 @@ export const ProviderProductEdition = ({
         result,
         isAproved: result === "A",
       };
+      const messages = [];
       servicesData?.forEach((ret) => {
         const { service, id_retailer } = ret;
         let data = {};
@@ -1105,6 +1098,18 @@ export const ProviderProductEdition = ({
             },
           })
         );
+        if (product[`${ret.service}_status`] !== "NS") {
+          const message = createMessage(
+            product.retailers,
+            ret.id_retailer,
+            product[`${ret.service}_status`],
+            `${result}A`,
+            ret.service
+          );
+          messages.push(
+            createComment([{ type: "status", value: message }], ret.id_retailer)
+          );
+        }
       });
       await Promise.all(evaluationArray);
       const userType = user.is_retailer === 1 ? "CA" : "P";
@@ -1144,6 +1149,7 @@ export const ProviderProductEdition = ({
           product: productTemp,
         })
       );
+      await Promise.all(messages);
 
       await loadData();
     } catch (error) {
@@ -1271,8 +1277,7 @@ export const ProviderProductEdition = ({
         return;
       } else if (user.is_retailer) {
         if (product.id_order || product.orderId) {
-          setValidatedAll(true);
-          showGlobalModal("error");
+          sendEvaluation("R");
         } else {
           setDataGenericModal((prev) => ({
             ...prev,
@@ -1284,8 +1289,7 @@ export const ProviderProductEdition = ({
           showGlobalModal("generic");
         }
       } else {
-        setValidatedAll(true);
-        showGlobalModal("error");
+        sendEvaluation("R");
       }
     }
   };
@@ -1294,6 +1298,7 @@ export const ProviderProductEdition = ({
       <HeaderTop
         setHeaderTop={setHeaderTop}
         withChat={location?.state?.withChat}
+        chatType={location?.state?.chatType}
         productSelected={productSelected}
         token={token}
         activeRetailer={activeRetailer}
@@ -1372,7 +1377,7 @@ export const ProviderProductEdition = ({
               } else if (user.is_retailer) {
                 if (product.id_order || product.orderId) {
                   setValidatedAll(true);
-                  showGlobalModal("error");
+                  setShowRejectModal(true);
                 } else {
                   setDataGenericModal((prev) => ({
                     ...prev,
@@ -1384,12 +1389,14 @@ export const ProviderProductEdition = ({
                   showGlobalModal("generic");
                 }
               } else {
+                setShowRejectModal(true);
                 setValidatedAll(true);
-                showGlobalModal("error");
               }
             }}
             approve={() => sendToEvaluation("A")}
-            reject={() => sendToEvaluation("R")}
+            reject={() => {
+              setShowRejectModal(true);
+            }}
           />
           <FullTabsMenu
             tabsSections={tabsSections}
@@ -1624,6 +1631,49 @@ export const ProviderProductEdition = ({
           jwt={token}
         />
       )}
+      {showRejectModal && (
+        <Modal
+          title={"Agregar mensaje de rechazo"}
+          show={showRejectModal}
+          customComponent={
+            <TagAndInput
+              label={"Caja de Comentario"}
+              inputType={"textarea"}
+              inputId={"modal-message-box"}
+              index={0}
+              color={"white"}
+            />
+          }
+          buttons={[
+            <ButtonV2
+              key={"btn-Cancelar"}
+              type={"white"}
+              label={"Cancelar"}
+              size={12}
+              onClick={() => {
+                setShowRejectModal(false);
+              }}
+            />,
+            <ButtonV2
+              key={"btn-Aceptar"}
+              type={"pink"}
+              label={"Aceptar"}
+              size={12}
+              onClick={async () => {
+                const body = document.querySelector(
+                  "#modal-message-box .ql-container .ql-editor > p"
+                ).innerHTML;
+                const messages = [
+                  { type: "message", value: body?.replace(/<.*?\/?>/gm, "") },
+                ];
+                await createComment(messages, activeRetailer.id);
+                validatedAll ? validateAll("R") : sendToEvaluation("R");
+                setShowRejectModal(false);
+              }}
+            />,
+          ]}
+        />
+      )}
     </Container>
   );
 };

package/src/components/pages/ProviderProductEdition/styles.js

@@ -107,6 +107,10 @@ export const Container = styled.div`
       }
     }
   }
+  #modal-message-box {
+    width: 400px;
+    height: 100px;
+  }
   .container {
     width: 100%;
     height: 100%;
@@ -115,4 +119,4 @@ export const Container = styled.div`
       width: 100%;
     }
   }
-`;
+`;

package/src/components/pages/RetailerProductEdition/RetailerProductEdition.stories.js

@@ -16,7 +16,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJhNmM0ZDNkNi0yNGE0LTQxZDQtYWQwZi1kMDg3NDM4YWI1YjYiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6ImE2YzRkM2Q2LTI0YTQtNDFkNC1hZDBmLWQwODc0MzhhYjViNiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIyYjU3MjZlMy04MjM2LTRmYzMtODBkMi05NWVmYmU4ODdjOTYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4MjAxNjI5MSwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4MjAxOTg5MSwiaWF0IjoxNjgyMDE2MjkxLCJlbWFpbCI6ImV0Y0Bjb250ZW50b2guY29tIn0.SCj_yp1NkGCED59JHoDSdFAOakIOvZVeC0yLwt9z0BtenDXlU0m5cUofQQonnWPM8Q70yMFEkyMGI9kQs_fz1gxrmrSc2FGefn3B_1Vymq3pQ_S1JrY_syYf88m_GtJKOywEnE6--Ef9lZhFBFKGtqRJ4H8JBa9Xb96uCjAKyEMCSURDlw37pk2RQdULlZPj17Zb6Xrqi2lwrhpI1ByptX3__UoTiZklnTXwIxM4JdU7yuhXLznaEH8NOSd2Jw-CV6FCUbYBHlnRYBQg7B5mwyVKtDQm6QpRgBTBPCvljJJpFjRKUcnon8WZiFXx1qVbkWPt2vCT1TZqqoSLdlP6lA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5OGE0NzYxMy04ZGIyLTRlZjUtYjA0Mi01ZDU3MWRkZjIwMWIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4Mzg3NTIyNiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4Mzg3ODgyNiwiaWF0IjoxNjgzODc1MjI2LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.EtgmT_THMx-Zy_zB5yZK4gz6TXNTVVJEKFt5X0JK2UkGVrp_q_92YCEuejS4n976fyTez0jkwOee6IkVHLV71uZWRBDFt-3Yw4ZxfsZYPNJWhoHXGNxhMU8MCkSntfu597esBTk-VsUpstT5R7L-WJfN8viE7R-qVo-42RlPTG0TFrWA9q0oTcqjv8vbxLpOBUjiEpjmqRhg4blJZwgkGNta6MOlw1vfmisOVbo9wMvqwnCZ9xx9KMKoH9U4uNObK_JomjbvPmTmkcUXsE-wGSD7XcoSwtuhBngLC7-jiu1u8MvL_ff5Z0Qp70sSpLdUglcSS8d1Xf7j_fcZuJ5jKA",
   productSelected: {
     orderId: 14606,
     status: "RA",
@@ -82,7 +82,11 @@ RetailerProductEditionDefault.args = {
     ],
   },
   location: {
-    product: { articleId: 39290, versionId: 7 },
+    product: { articleId: 354, versionId: 3 },
+    state: {
+      withChat: true,
+      chatType: "product_status",
+    },
   },
   user: {
     id_user: 51,

package/src/components/pages/RetailerProductEdition/index.js

@@ -24,15 +24,20 @@ import descriptionSent from "../../../assets/images/modalsSVGs/descriptionSent.s
 import imagesSent from "../../../assets/images/modalsSVGs/uploadingImages.svg";
 import { TagAndInput } from "../../molecules/TagAndInput/index";
 import { Button } from "../../atoms/GeneralButton";
-import { Commentary } from "../../atoms/Commentary";
 import { GenericModal } from "../../atoms/GenericModal";
 import { ScreenHeader } from "../../atoms/ScreenHeader";
 import { Loading } from "../../atoms/Loading";
 import succes from "../../../assets/images/genericModal/genericModalCheck.svg";
-import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
 import { useCloseModal } from "../../../global-files/customHooks";
-import { getAuditVersion, getInputsData } from "./utils";
+import {
+  getAuditVersion,
+  getInputsData,
+  createMessage,
+  sendMessage,
+} from "./utils";
+import { Modal } from "../../organisms/Modal";
+import { ButtonV2 } from "../../atoms/ButtonV2";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -132,6 +137,7 @@ export const RetailerProductEdition = ({
   const [datasheets, setDatasheets] = useState([]);
   const [images, setImages] = useReducer(reducerImages, {});
   const [showModal, setShowModal] = useState(false);
+  const [showRejectModal, setShowRejectModal] = useState(false);
   const { getRootProps, getInputProps } = useDropzone({
     accept: "image/*",
     noKeyboard: true,
@@ -218,6 +224,7 @@ export const RetailerProductEdition = ({
   const [auditDescriptions, setAuditDescriptions] = useState([]);
   const [auditImages, setAuditImages] = useState([]);
   const [compare, setCompare] = useState(false);
+  const [valRejAll, setValRejAll] = useState(false);
 
   useEffect(async () => {
     const { id_article } = product?.article || {};
@@ -337,7 +344,7 @@ export const RetailerProductEdition = ({
     switch (user.id_role) {
       case 7:
       case 8:
-        arr = ["AS", "CA", "RC", "RA", "RP", "RCA"];
+        arr = ["PA", "AS", "CA", "RC", "RA", "RP", "RCA"];
         break;
       case 4:
       case 5:
@@ -855,6 +862,25 @@ export const RetailerProductEdition = ({
         const { newStatus, newOrderStatus, newArticleStatus } = JSON.parse(
           res.data.body
         );
+        const messageToChat = createMessage(
+          product.retailers,
+          activeRetailer.id,
+          evalStatus,
+          newStatus,
+          activeTab
+        );
+
+        const data = {
+          paramsBody: {
+            id: product.article.id_article,
+            version: version,
+            items: [{ type: "status", value: messageToChat }],
+            retailerId: activeRetailer.id,
+            status: product.status,
+          },
+          paramsHeader: { Authorization: token },
+        };
+        await sendMessage(data);
         if (newOrderStatus) productTemp.status = newArticleStatus[articleId];
         productTemp[`${concept}_status`] = newStatus;
         await loadData();
@@ -897,35 +923,19 @@ export const RetailerProductEdition = ({
     return product?.article[`id_auditor`] === user.id_user;
   };
 
-  const createComment = async (e, body, tab) => {
-    let concept = "";
-    switch (activeTab) {
-      case "Ficha técnica":
-        concept = "datasheet";
-        break;
-      case "Imágenes":
-        concept = "images";
-        break;
-
-      default:
-        concept = "description";
-        break;
-    }
+  const createComment = async (messages = [], retailerId) => {
     const data = {
-      articleId: product?.article?.id_article,
-      orderId: product?.orderId,
-      message: body?.replace(/<.*?\/?>/gm, ""),
-      concept: concept,
-      version: version,
-    };
-    await axios.post(`${process.env.REACT_APP_COMMENTS_ENDPOINT}`, data, {
-      headers: {
-        Authorization: token,
+      paramsBody: {
+        id: product.article.id_article,
+        version: version,
+        items: messages,
+        retailerId: retailerId,
+        status: product.status,
       },
-    });
-    await getComments(tab);
+      paramsHeader: { Authorization: token },
+    };
     setMessage("");
-    setComponentsArray([]);
+    return sendMessage(data);
   };
 
   const getRequired = (services) => {
@@ -1208,6 +1218,8 @@ export const RetailerProductEdition = ({
           break;
       }
 
+      const messages = [];
+
       servicesData?.forEach((ret) => {
         if (conceptArray.includes(ret.service)) {
           let data = {
@@ -1218,6 +1230,21 @@ export const RetailerProductEdition = ({
             evalStatus: ret.status,
             retailerId: ret.id_retailer,
           };
+          if (product[`${ret.service}_status`] !== "NS") {
+            const message = createMessage(
+              product.retailers,
+              ret.id_retailer,
+              product[`${ret.service}_status`],
+              `${result}A`,
+              ret.service
+            );
+            messages.push(
+              createComment(
+                [{ type: "status", value: message }],
+                ret.id_retailer
+              )
+            );
+          }
           evaluationArray.push(
             axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
               headers: {
@@ -1251,13 +1278,14 @@ export const RetailerProductEdition = ({
       const productTemp = product;
       productTemp.status = `${result}A`;
       productTemp.datasheet_status =
-        productTemp.datasheet_status === "NA" ? "NA" : `${result}A`;
+        productTemp.datasheet_status === "NS" ? "NS" : `${result}A`;
       productTemp.description_status =
-        productTemp.description_status === "NA" ? "NA" : `${result}A`;
+        productTemp.description_status === "NS" ? "NS" : `${result}A`;
       productTemp.images_status =
-        productTemp.images_status === "NA" ? "NA" : `${result}A`;
+        productTemp.images_status === "NS" ? "NS" : `${result}A`;
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
+      const messagesResponse = await Promise.all(messages);
 
       await loadData();
     } catch (error) {
@@ -1273,8 +1301,10 @@ export const RetailerProductEdition = ({
         setCompare={setCompare}
         isAuditor={[1, 6].includes(user.id_role)}
         withChat={location?.state?.withChat}
-        productSelected={productSelected}
+        chatType={location?.state?.chatType}
+        productSelected={product}
         token={token}
+        activeRetailer={activeRetailer}
       />
       <div className="data-container">
         <div className="image-data-panel">
@@ -1314,36 +1344,7 @@ export const RetailerProductEdition = ({
               sendToFacilitator("A");
             }}
             reject={() => {
-              sendToFacilitator("R");
-              setMessage("Rechazado");
-              setComponentsArray([
-                <img src={errorModal} />,
-                <ScreenHeader
-                  text={"Agrega tu comentarios para enviar el rechazo"}
-                  headerType={"input-name-header"}
-                  color={"white"}
-                />,
-                <TagAndInput
-                  label={"Caja de Comentario"}
-                  inputType={"textarea"}
-                  inputId={"modal-commentary-box"}
-                  index={0}
-                  color={"white"}
-                />,
-                <Button
-                  buttonType={"general-default-button"}
-                  label={"Enviar comentario"}
-                  onClick={(e) =>
-                    createComment(
-                      e,
-                      document.querySelector(
-                        "#modal-commentary-box .ql-container .ql-editor > p"
-                      ).innerHTML,
-                      activeTab
-                    )
-                  }
-                />,
-              ]);
+              setShowRejectModal(true);
             }}
             showApproveRejectAll={
               approveRejectAllButtons() && (auditorAssigned() || userAssigned())
@@ -1353,36 +1354,8 @@ export const RetailerProductEdition = ({
             }
             approveAll={() => validateAll("A")}
             rejectAll={() => {
-              validateAll("R");
-              setMessage("Rechazado");
-              setComponentsArray([
-                <img src={errorModal} />,
-                <ScreenHeader
-                  text={"Agrega tu comentarios para enviar el rechazo"}
-                  headerType={"input-name-header"}
-                  color={"white"}
-                />,
-                <TagAndInput
-                  label={"Caja de Comentario"}
-                  inputType={"textarea"}
-                  inputId={"modal-commentary-box"}
-                  index={0}
-                  color={"white"}
-                />,
-                <Button
-                  buttonType={"general-default-button"}
-                  label={"Enviar comentario"}
-                  onClick={(e) =>
-                    createComment(
-                      e,
-                      document.querySelector(
-                        "#modal-commentary-box .ql-container .ql-editor > p"
-                      ).innerHTML,
-                      activeTab
-                    )
-                  }
-                />,
-              ]);
+              setShowRejectModal(true);
+              setValRejAll(true);
             }}
           />
           <FullTabsMenu
@@ -1503,47 +1476,6 @@ export const RetailerProductEdition = ({
           {(userAssigned(activeTab) || auditorAssigned()) &&
             product[`${getConcept(activeTab)}_status`] !== "NS" && (
               <div className="commentary-box">
-                {!comment ? (
-                  <div className="commentary">
-                    <TagAndInput
-                      label={"Caja de Comentario"}
-                      inputType={"textarea"}
-                      inputCols={80}
-                      inputRows={4}
-                      inputId={"commentary-box"}
-                      index={0}
-                    />
-                    <div className="buttons-box">
-                      <Button
-                        buttonType={"general-transparent-button"}
-                        label={"Enviar comentario"}
-                        onClick={(e) =>
-                          createComment(
-                            e,
-                            document.querySelector(
-                              "#commentary-box .ql-container .ql-editor > p"
-                            ).innerHTML,
-                            activeTab
-                          )
-                        }
-                      />
-                    </div>
-                  </div>
-                ) : (
-                  <div className="feedback-box">
-                    <Commentary
-                      comment={comment?.message?.replace(/<.*?\/?>/gm, "")}
-                      reviewed={crossComment}
-                    />
-                    <Button
-                      buttonType={"circular-button accept-button"}
-                      onClick={async () => {
-                        setCrossComment(true);
-                        commentRevised();
-                      }}
-                    />
-                  </div>
-                )}
                 {[7, 8].includes(user.id_role) && (
                   <Button
                     buttonType={
@@ -1601,6 +1533,50 @@ export const RetailerProductEdition = ({
           jwt={token}
         />
       )}
+      {showRejectModal && (
+        <Modal
+          title={"Agregar mensaje de rechazo"}
+          show={showRejectModal}
+          customComponent={
+            <TagAndInput
+              label={"Caja de Comentario"}
+              inputType={"textarea"}
+              inputId={"modal-message-box"}
+              index={0}
+              color={"white"}
+            />
+          }
+          buttons={[
+            <ButtonV2
+              key={"btn-Cancelar"}
+              type={"white"}
+              label={"Cancelar"}
+              size={12}
+              onClick={() => {
+                setShowRejectModal(false);
+              }}
+            />,
+            <ButtonV2
+              key={"btn-Aceptar"}
+              type={"pink"}
+              label={"Aceptar"}
+              size={12}
+              onClick={async () => {
+                const body = document.querySelector(
+                  "#modal-message-box .ql-container .ql-editor > p"
+                ).innerHTML;
+                const messages = [
+                  { type: "message", value: body?.replace(/<.*?\/?>/gm, "") },
+                ];
+                await createComment(messages, activeRetailer.id);
+                valRejAll ? validateAll("R") : sendToFacilitator("R");
+                setMessage("Rechazado");
+                setShowRejectModal(false);
+              }}
+            />,
+          ]}
+        />
+      )}
     </Container>
   );
 };

package/src/components/pages/RetailerProductEdition/styles.js

@@ -89,6 +89,10 @@ export const Container = styled.div`
       }
     }
   }
+  #modal-message-box {
+    width: 400px;
+    height: 100px;
+  }
   .container {
     width: 100%;
     height: 100%;