contentoh-components-library 21.0.98 → 21.1.1

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

@@ -16,102 +16,170 @@ ProviderProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJhZWQzMzEyZi1kZGYyLTQ2ZTAtOTgyNS1lODU2ZDM0ODYwNzMiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1Mzk1NzQ3MiwibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2NTM5NjEwNzIsImlhdCI6MTY1Mzk1NzQ3MiwiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.Fq4bWu0irZ3NHDU2MOXBJZaqQlzbXwrS6YY2_GBG0Nq8z5gNmKr8LFcjBvD1mYj6sO6BHPrh0yzAOtlQMVOFAeXXRZ524Um_rpECWKDUD8IjCKUIgbqQos_YB-09zetlsmIE6Pd29UxDuwrN7zWqzzTuKGUnNhfC8uS3_tG9fi4TxNY0TY8Jwuk9uo0LlOjiIb28mL06B98EWTFbuze5J0AADfa_p0zEqYMyAIn4kYouIOt8eqOVFfZ4piEJMMcbwwaPwVTpy8e6FSLHrQeCa054ZJCvdGQLKhN1Ceue77voFINI9umnEIExAp_w2miOwzJjuk6E1ALf2LWo-Rz_qg",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI1ODg0YWUzNC01OWQ2LTQ0NTQtYjk4ZS04MjE1MThiY2MzYTciLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjU4ODRhZTM0LTU5ZDYtNDQ1NC1iOThlLTgyMTUxOGJjYzNhNyIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJhOTZjN2YxMi0wYjI5LTRkMzctOWMxOS1mMDAzMWFiMGY2N2EiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1NTQ5MjkzNiwibmFtZSI6IkNhZGVuYSBJc21hZWwiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMzY2MzM2IiwiZXhwIjoxNjU1NDk2NTM2LCJpYXQiOjE2NTU0OTI5MzYsImVtYWlsIjoiY2FkZW5hLmlzbWFlbEBhbGxmcmVlbWFpbC5uZXQifQ.Rg3hxEzGy4pSDcG-q5lXRZWBoBiXQQKCdpRtAChvQuGM5GaQySgBW0YUEIXcLuwMbWSzj3RWJ4ZTY8NZvUhYIRbGqnIhB82FP41YCcYF7BYDilr4pZzeqEjx6U4_jR4HtbmkFfscyg0Q1VINNHTj1b0n1xLNMiE6rM7hY3eWFFhyvXn5OIH_5fZaHjYRe2uBDnF6Ogx1Za2z8DzyKkR2-QjVo4l-f64Egc5EfYWm6_3gZ1gkRGLxa7HfQXNUs0ds7Ifkx4QYHggUQdkrNdmGeYGxqZFYgG5a4LWZ-17E6x5yL87LhH-oErepE6xe6oyy-DnHaf7rWnRPqxSuilW5lQ",
   articleId: 238,
   category: 846,
   version: 2,
   productSelected: {
-    id_article: 35319,
-    id_category: "2146",
-    name: "FOCO LED A19 (60W) LUZ AMARILLA",
-    upc: "120873",
-    timestamp: "2022-06-14T15:31:50.000Z",
-    status: "NULL",
-    categoryName: "ILUMINACIÓN|FOCOS|LEDS",
-    asignations: [],
+    orderId: 14,
+    article_status: "AP",
+    datasheet_status: "AC",
+    description_status: "AC",
+    images_status: "AP",
+    prio: "none",
     version: 2,
-    version_status: "AA",
-    retailersAvailable: [
+    brand: null,
+    article: {
+      category: "ILUMINACIÓN|FOCOS|LEDS",
+      company_name: "COMPANY DEV",
+      country: "México",
+      id_category: "2146",
+      id_article: 35705,
+      name: "FOCO LED A19 (60W) LUZ AMARILLA",
+      upc: "12087311111",
+    },
+    retailers: [
       {
         id: 58,
         name: "The Home Depot Golden",
-        country: "México",
-        id_region: 1,
-        active: 1,
+      },
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
+      },
+      {
+        id: 60,
+        name: "The Home Depot Resizing",
+      },
+      {
+        id: 61,
+        name: "Home Depot TAB",
       },
     ],
-    missing: {
-      datasheet: 33,
-      description: 0,
-      image: 23,
+    services: {
+      datasheets: 1,
+      descriptions: 1,
+      images: 1,
     },
+    id_article: 35705,
+    retailersAvailable: [
+      {
+        id: 58,
+        name: "The Home Depot Golden",
+      },
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
+      },
+      {
+        id: 60,
+        name: "The Home Depot Resizing",
+      },
+      {
+        id: 61,
+        name: "Home Depot TAB",
+      },
+    ],
   },
   productToEdit: {
+    ArticleId: 35705,
     idCategory: "2146",
-    ArticleId: 35319,
-    product: [
-      {
-        id_article: 35319,
+    product: {
+      orderId: 14,
+      article_status: "AP",
+      datasheet_status: "AC",
+      description_status: "AC",
+      images_status: "AP",
+      prio: "none",
+      version: 2,
+      brand: null,
+      article: {
+        category: "ILUMINACIÓN|FOCOS|LEDS",
+        company_name: "COMPANY DEV",
+        country: "México",
         id_category: "2146",
+        id_article: 35705,
         name: "FOCO LED A19 (60W) LUZ AMARILLA",
-        upc: "120873",
-        timestamp: "2022-06-14T15:31:50.000Z",
-        status: "NULL",
-        categoryName: "ILUMINACIÓN|FOCOS|LEDS",
-        asignations: [],
-        version: 2,
-        version_status: "AA",
-        retailersAvailable: [
-          {
-            id: 58,
-            name: "The Home Depot Golden",
-            country: "México",
-            id_region: 1,
-            active: 1,
-          },
-        ],
-        missing: {
-          datasheet: 33,
-          description: 0,
-          image: 23,
+        upc: "12087311111",
+      },
+      retailers: [
+        {
+          id: 58,
+          name: "The Home Depot Golden",
+        },
+        {
+          id: 59,
+          name: "The Home Depot Platinum",
         },
+        {
+          id: 60,
+          name: "The Home Depot Resizing",
+        },
+        {
+          id: 61,
+          name: "Home Depot TAB",
+        },
+      ],
+      services: {
+        datasheets: 1,
+        descriptions: 1,
+        images: 1,
       },
-    ],
+      id_article: 35705,
+      retailersAvailable: [
+        {
+          id: 58,
+          name: "The Home Depot Golden",
+        },
+        {
+          id: 59,
+          name: "The Home Depot Platinum",
+        },
+        {
+          id: 60,
+          name: "The Home Depot Resizing",
+        },
+        {
+          id: 61,
+          name: "Home Depot TAB",
+        },
+      ],
+    },
   },
   location: {
     product: { articleId: 109485, versionId: 3 },
-    state: { origin: "RequestWithContentoh" },
+    state: { origin: "Contentoh" },
   },
   user: {
-    id_user: 28,
-    name: "Proveedor",
-    last_name: "Colgate",
-    email: "ilopez@contentoh.com",
-    position: "Prueba Admin",
+    id_user: 59,
+    name: "The Home",
+    last_name: "Depot",
+    email: "cadena.ismael@allfreemail.net",
+    position: "Admin",
     telephone: "+523111366336",
     country: "México",
-    id_company: 1,
-    id_cognito: "f5927f8e-cbf7-4922-9e09-e69ec0b2731a",
+    id_company: 7,
+    id_cognito: "5884ae34-59d6-4454-b98e-821518bcc3a7",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
-    id_stripe: "cus_KuEt6R6vwmN09f",
+    id_stripe: "",
     id_role: 0,
     active: 1,
-    is_retailer: 0,
+    is_retailer: 1,
     membership: {
-      id: 38,
-      start_date: "2022-01-18T17:25:35.000Z",
-      end_date: "2023-01-18T17:25:35.000Z",
-      planID: 8,
-      plan: "prod_KtlhECVSFG2iro",
-      name: "Plan Pro",
-      user_limit: "20",
-      products_limit: "5000",
+      id: 24,
+      start_date: "2021-11-23T03:35:50.000Z",
+      end_date: "2022-11-23T03:35:50.000Z",
+      planID: 9,
+      plan: "prod_KtlkzZVGq6bRTO",
+      name: "Plan Enterprise Full",
+      user_limit: "30",
+      products_limit: "10000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-28/28.png?1655246340910",
+    src: "https://content-management-profile.s3.amazonaws.com/id-59/59.png?1655492937526",
   },
 };

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

@@ -215,6 +215,7 @@ export const ProviderProductEdition = ({
 
     //Converts the data inside the datasheets object to array
     setServices(services);
+    getServices();
 
     //setActiveRetailer(product?.retailers[0]);
     setImages({
@@ -223,10 +224,6 @@ export const ProviderProductEdition = ({
     });
     if (services[2]?.values?.length > 0) setActiveImage(0);
 
-    setActiveRetailer(
-      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
-    );
-
     getPercentage({ data: [product] }).then((res) => setPercentages(res));
     setLoading(false);
   };
@@ -301,11 +298,13 @@ export const ProviderProductEdition = ({
 
   useEffect(async () => {
     loadData();
+    setActiveRetailer(
+      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
+    );
     // getPercentage({ data: [product] }).then((res) =>
     //   setPercentages(res)
     // );
     getCart();
-    getServices();
     setUserGroups(await fetchUsers(token));
     let arr = [];
     switch (user.id_role) {
@@ -1175,6 +1174,7 @@ export const ProviderProductEdition = ({
     sessionStorage.setItem("productEdit", JSON.stringify(prod));
     setProduct(prod);
     setShowGenericModal && setShowGenericModal(false);
+    loadData();
   };
 
   const getSectionStatus = () => {
@@ -1447,9 +1447,7 @@ export const ProviderProductEdition = ({
                 onClick={() => {
                   //setModalSent(true);
                   sendEvaluation();
-                  setMessage(
-                    `¡Evaluación de ${translateConcept()} completada!`
-                  );
+                  setMessage(`¡Evaluación de ${activeTab} completada!`);
                 }}
               />
             </div>
@@ -1464,10 +1462,10 @@ export const ProviderProductEdition = ({
               </div>
               {inCart ? (
                 <button type="button">
-                  <Link to="/checkout">
+                  {/* <Link to="/checkout">
                     <p>Articulo en carrito</p>
                     <p>Ir a checkout</p>
-                  </Link>
+                  </Link> */}
                 </button>
               ) : (
                 <Button
@@ -1486,7 +1484,7 @@ export const ProviderProductEdition = ({
       {showModal && (
         <ProductImageModal images={images} setShowModal={setShowModal} />
       )}
-      {message.length > 0 && (
+      {message.length > 0 && !showSurvey && (
         <GenericModal
           buttonType={componentsArray.length > 0 && "delete-product"}
           componentsArray={

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

@@ -16,7 +16,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6IjcxNWU4ZTc3LTAwMmMtNGMyNC1hNjM2LTYxNDkxYzQ0MzI2MSIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjUyMzA3MTUzLCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjUyMzEwNzUzLCJpYXQiOjE2NTIzMDcxNTMsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.Ov1kjVt1sWrNu-8gPhBvnS6SpCuPmOYcqBwJVIoz-YJvuyNx0lMeRflG99cpgj4SojZqgMfPMQ8gJg5263fhj9oynolP7kh08AS_uoTf6_FK2KCaY8gVF4OJnoJJaX7J12JxzmRMI-lQJftvvoPxo5KYHCf7uZSj-5C5z6yIdk59T3U7vziYiKVtJFvVpA6IEB-oIS57MSdg27kwOtYjWvkfZ5vDRfkoOBGmBBELI9uFbKQS0cmWaLSBhd8ptbXWkAprxm-nkJnH9KQKmCsCLBthqmZTsMDw3ok0RsVpEE7_x4X0Hg0756ebqDe1kLCVuTIBpPx4ySvCdlewvi9bYA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6IjZlYzkzZDk4LTU3Y2YtNDdhMS05MTBhLTk1ZWIxNjdhYjhjNyIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjU1NTAyMDg3LCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjU1NTA1Njg3LCJpYXQiOjE2NTU1MDIwODcsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.fxgw--POlE3fFg2QWJaSD6tWZB9je4bR-rX5MJGOSRH9dc2WvDROjS1x_bT41M-wx9q-_U2xcFTAIff76zd-PYFYuYD29pJzTNl3c8xpQYcg4LwCvsBueRN9-_qxDcGzdSwdzxVbbk8guGdu4FA9ll-nruVIJ5QWnt8yNkWKRfn_bDLWHuQ2fPHsvVScwdn4Q60wERB6GFy6xLuQtRD5zWOBMu-_gLIfvbTm-eEJu-pkB5WtBDQki-UY1yi3bIjk9mNVSM4cdEFA7_84zKWL1O2eUUCOVC7Cn2NXQ0OEgphYmSftTU7nVN_xvl8JSUXdqRpSpkCYka849zCL5OJV7Q",
   articleId: 238,
   category: 846,
   version: 2,
@@ -26,92 +26,78 @@ RetailerProductEditionDefault.args = {
       descriptions: 1,
       images: 1,
     },
-    orderId: 4,
-    status: "ASSIGNED",
-    datasheet_status: null,
+    orderId: 27,
+    status: "RC",
+    datasheet_status: "AC",
     prio: "none",
-    version: 3,
-    description_status: null,
-    images_status: null,
+    version: 2,
+    description_status: "RC",
+    images_status: "AC",
     article: {
-      id_article: 33249,
-      id_category: "684",
-      name: "Crema dental ",
-      upc: "232435",
-      timestamp: "2022-06-14T14:52:51.000Z",
-      id_user: 28,
+      id_article: 55099,
+      id_category: "2004",
+      name: "Producto de prueba 1 THD",
+      upc: "SKU1235THD",
+      timestamp: "2022-06-17T23:41:20.000Z",
+      id_user: 102,
       status: "NULL",
       active: 1,
-      company_id: 1,
-      company_name: "COMPANY DEV",
+      company_id: 833,
+      company_name: "THD Proveedor",
       country: "México",
-      id_order: 4,
-      id_datasheet_especialist: null,
-      id_datasheet_facilitator: null,
-      id_description_especialist: null,
-      id_description_facilitator: null,
-      id_images_especialist: null,
-      id_images_facilitator: null,
-      id_auditor: 37,
+      id_order: 27,
+      id_datasheet_especialist: 36,
+      id_datasheet_facilitator: 52,
+      id_description_especialist: 36,
+      id_description_facilitator: 52,
+      id_images_especialist: 55,
+      id_images_facilitator: 53,
+      id_auditor: 30,
       id_recepcionist: null,
-      category: "SALUD Y BELLEZA|CUIDADO BUCAL|PASTAS DENTALES Y ASEO BUCAL",
-      missingAttributes: 13,
-      missingDescriptions: 4,
-      missingImages: 3,
+      category: "BAÑOS|ACCESORIOS PARA BAÑO|ACCESORIOS INDIVIDUALES",
+      missingAttributes: null,
+      missingDescriptions: null,
+      missingImages: null,
     },
     retailers: [
       {
-        id: 4,
-        name: "Walmart Super y Superama",
+        id: 58,
+        name: "The Home Depot Golden",
         country: "México",
         id_region: 1,
         active: 1,
       },
       {
-        id: 9,
-        name: "Amazon",
+        id: 59,
+        name: "The Home Depot Platinum",
         country: "México",
         id_region: 1,
         active: 1,
       },
-      {
-        id: 1013,
-        name: "Cencosud Colombia",
-        country: "Colombia",
-        id_region: 2,
-        active: 1,
-      },
-      {
-        id: 2005,
-        name: "ClubCo",
-        country: "Costa Rica",
-        id_region: 3,
-        active: 1,
-      },
     ],
     country: "México",
-    upc: "232435",
+    upc: "SKU1235THD",
   },
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 54,
-    name: "ESPECIALISTA TXTS PRUEBA",
-    last_name: "",
-    email: "rlegorreta@contentoh.com",
-    position: null,
+    id_user: 30,
+    name: "Admin",
+    last_name: "Ulises",
+    email: "salmeron.5@hotmail.com",
+    position: "Admin",
     telephone: null,
-    country: null,
+    country: "México",
     id_company: 2,
-    id_cognito: "ca1d24ab-e992-4c19-b4e1-2fe6f720c16b",
+    id_cognito: "c94a7305-9365-46ff-a423-4b4bc3b8b180",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 7,
+    id_role: 6,
     active: 1,
     is_retailer: 0,
     membership: {
@@ -125,6 +111,6 @@ RetailerProductEditionDefault.args = {
       products_limit: "3",
       type: "PyMES",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-54/54.png?1655433250522",
+    src: "https://content-management-profile.s3.amazonaws.com/id-30/30.png?1655598361036",
   },
 };

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

@@ -30,6 +30,7 @@ import { ScreenHeader } from "../../atoms/ScreenHeader";
 import { Loading } from "../../atoms/Loading";
 import succes from "../../../assets/images/genericModal/genericModalCheck.svg";
 import { getNewStatus } from "../../../global-files/data";
+import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs } = state;
@@ -238,8 +239,12 @@ export const RetailerProductEdition = ({
     // getPercentage({ data: [product] }).then((res) =>
     //   setPercentages(res)
     // );
-    setActiveRetailer(
-      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
+    setActiveRetailer((current) =>
+      current.id
+        ? current
+        : product.retailers
+        ? product.retailers[0]
+        : product.retailersAvailable[0]
     );
     getComments();
     setUserGroups(await fetchUsers(token));
@@ -567,11 +572,15 @@ export const RetailerProductEdition = ({
       product[`${getConcept(tab)}_status`] === "QF" ||
       product[`${getConcept(tab)}_status`] === "IN_PROGRESS";
 
+    const auditorUnvalidated = !["RA", "AA"].includes(
+      product[`${getConcept(tab)}_status`]
+    );
+
     switch (userId) {
       case 7:
       case 8:
         return (
-          (["RA", "RF"].includes(product?.status) &&
+          (["RA", "RF"].includes(product?.status) && //"IN_PROGRESS", "RF", "RA"
             statusArray.includes(srvActive?.status)) ||
           (statusArray.includes(product.status) &&
             srv.filter((serv) => statusArray.includes(serv.status)).length ===
@@ -581,14 +590,17 @@ export const RetailerProductEdition = ({
       case 5:
         return (
           unvalidated &&
-          ["IN_PROGRESS", "QF"].includes(product.status) &&
+          ["IN_PROGRESS", "QF"].includes(product.status) && //"RF", "AF", "AA", "AP", "AC
           srv.filter((serv) => statusArray.includes(serv.status)).length ===
             srv.length
         );
       case 6:
         return (
-          statusArray.includes(product.status) &&
-          servicesData.every((serv) => ["RA", "AA"].includes(serv.status))
+          statusArray.includes(product.status) && //RP, RC, AF
+          servicesData.every((serv) =>
+            ["RA", "AA", "AP", "AC"].includes(serv.status)
+          ) &&
+          auditorUnvalidated
         );
       default:
         break;
@@ -666,7 +678,7 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
+        //getServices();
       } else {
         const specialistDone =
           evalStatus === "RF" ||
@@ -729,8 +741,8 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
       }
+      loadData();
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
     } catch (error) {
@@ -1166,7 +1178,36 @@ export const RetailerProductEdition = ({
               sendToFacilitator("A");
             }}
             reject={() => {
-              sendToFacilitator("R");
+              //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
+                    )
+                  }
+                />,
+              ]);
             }}
             showValidationButtons={
               approveRejectButtons() && (auditorAssigned() || userAssigned())
@@ -1300,7 +1341,7 @@ export const RetailerProductEdition = ({
                           createComment(
                             e,
                             document.querySelector(
-                              "#description-commentary-box-0 .ql-container .ql-editor > p"
+                              "#commentary-box .ql-container .ql-editor > p"
                             ).innerHTML,
                             activeTab
                           )