Merge pull request #1615 from lumi-tip/development-lumi-7770

♻️ small refactor of router.querys and 🐛 bug solving realted to usePersistent and coupons
breatheco-de · Oct 1, 2024 · d6a94c8 · d6a94c8
2 parents c820ffa + c28d4ab
commit d6a94c8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 25 deletions.
diff --git a/public/locales/en/signup.json b/public/locales/en/signup.json
@@ -159,7 +159,8 @@
     "validate-email-title": "Verify your email",
     "validate-email-description": "We sent a confirmation email to: <strong>{{email}}</strong>, please check your email and click on the confirmation link.",
     "email-sent-to": "We sent you a confirmation email to {{email}}!",
-    "email-already-sent": "You have a pending invitation sent less than 1 day ago, check your email"
+    "email-already-sent": "You have a pending invitation sent less than 1 day ago, check your email",
+    "coupon-already-applied": "Coupon already applied"
   },
   "alert-message-validate-email": {
     "title": "Verify email",

diff --git a/public/locales/es/signup.json b/public/locales/es/signup.json
@@ -159,7 +159,8 @@
     "validate-email-title": "Verifique su correo electrónico",
     "validate-email-description": "Enviamos un correo electrónico de confirmación a: <strong>{{email}}</strong>, verifica tu correo electrónico y haz clic en el enlace de confirmación.",
     "email-sent-to": "Enviamos un correo electrónico de confirmación a {{email}}!",
-    "email-already-sent": "Tienes una invitación pendiente enviada hace menos de 1 día, revisa tu correo"
+    "email-already-sent": "Tienes una invitación pendiente enviada hace menos de 1 día, revisa tu correo",
+    "coupon-already-applied": "El cupón ya esta siendo aplicado"
   },
   "alert-message-validate-email": {
     "title": "Verificar correo electrónico",

diff --git a/src/common/components/MktShowPrices.jsx b/src/common/components/MktShowPrices.jsx
@@ -161,13 +161,9 @@ function MktShowPrices({ id, externalPlanProps, cohortId, title, gridColumn1, gr
           firstSectionTitle={t('subscription.upgrade-modal.subscription')}
           secondSectionTitle={t('subscription.upgrade-modal.finance')}
           handleUpgrade={(item) => {
-            const period = item?.period;
-
             const querys = parseQuerys({
               plan: item?.plan_slug,
               plan_id: item?.plan_id,
-              price: item?.price,
-              period,
               cohort: cohortId,
               coupon: queryCoupon || coupon,
             });

diff --git a/src/common/components/PricingCard.jsx b/src/common/components/PricingCard.jsx
@@ -109,8 +109,6 @@ export default function PricingCard({ item, courseData, isFetching, relatedSubsc
     const qs = parseQuerys({
       plan: selectedFinancing?.plan_slug || item?.plan_slug,
       plan_id: selectedFinancing?.plan_id || item?.plan_id,
-      price: selectedFinancing?.price || item?.price,
-      period: selectedFinancing?.period || item?.period,
       coupon: coupon || queryCoupon,
       cohort: courseData?.cohort?.id,
     });

diff --git a/src/common/hooks/usePersistent.js b/src/common/hooks/usePersistent.js
@@ -22,23 +22,26 @@ const usePersistent = (key, initialValue) => {
 
 const usePersistentBySession = (key, initialValue) => {
   const getStoredValues = useMemo(() => {
+    if (typeof window === 'undefined') return initialValue;
+
     const item = isWindow ? window.sessionStorage.getItem(key) : null;
-    const isObject = typeof item === 'object';
-    const objectValue = JSON.parse(item) || initialValue;
-    return isObject ? objectValue : item || initialValue;
+    if (item === null) return initialValue;
+
+    if (item.startsWith('{') || item.startsWith('[')) {
+      return JSON.parse(item);
+    }
+
+    return item;
   }, [key, initialValue]);
 
   const [storedValue, setStoredValue] = useState(getStoredValues);
 
   const setValue = (value) => {
-    try {
-      setStoredValue(value);
-      window.sessionStorage.setItem(key, JSON.stringify(value));
-    } catch (error) {
-      console.error('usePersistent_error:', error);
-    }
+    setStoredValue(value);
+    const valueToStore = typeof value === 'object' ? JSON.stringify(value) : value;
+    window.sessionStorage.setItem(key, valueToStore);
   };
-  return [storedValue, setValue];
+  return [storedValue !== undefined ? storedValue : initialValue, setValue];
 };
 
 export {

diff --git a/src/js_modules/checkout/Summary.jsx b/src/js_modules/checkout/Summary.jsx
@@ -203,8 +203,6 @@ function Summary() {
         query: {
           ...router.query,
           plan_id: selectedPlanCheckoutData?.plan_id,
-          price: selectedPlanCheckoutData?.price,
-          period: selectedPlanCheckoutData?.period,
         },
       });
     } else {

diff --git a/src/pages/bootcamp/[course_slug].jsx b/src/pages/bootcamp/[course_slug].jsx
@@ -207,8 +207,6 @@ function Page({ data }) {
     plan: featuredPlanToEnroll?.plan_slug,
     plan_id: featuredPlanToEnroll?.plan_id,
     has_available_cohorts: planData?.has_available_cohorts,
-    price: featuredPlanToEnroll?.price,
-    period: featuredPlanToEnroll?.period,
     cohort: cohortId,
   }) : `?plan=${data?.plan_slug}&cohort=${cohortId}`;
 

diff --git a/src/pages/checkout/index.jsx b/src/pages/checkout/index.jsx
@@ -113,6 +113,9 @@ function Checkout() {
   const accessToken = getStorageItem('accessToken');
   const tokenExists = accessToken !== null && accessToken !== undefined && accessToken.length > 5;
   const { coupon: couponQuery } = query;
+  const { course } = router.query;
+  const courseChoosed = course;
+
   const [coupon] = usePersistentBySession('coupon', '');
 
   const couponValue = useMemo(() => {
@@ -121,9 +124,6 @@ function Checkout() {
     return couponString || formatedCouponQuery;
   }, [coupon, couponQuery]);
 
-  const { course } = router.query;
-  const courseChoosed = course;
-
   const queryPlanExists = planFormated !== undefined && planFormated?.length > 0;
   const queryMentorshipServiceSlugExists = mentorshipServiceSetSlug && mentorshipServiceSetSlug?.length > 0;
   const queryEventTypeSetSlugExists = eventTypeSetSlug && eventTypeSetSlug?.length > 0;
@@ -161,6 +161,22 @@ function Checkout() {
   };
 
   const handleCoupon = (coupons, actions) => {
+    const alreadyAppliedCoupon = selfAppliedCoupon?.slug === discountCode || selfAppliedCoupon?.slug === couponValue;
+
+    if (alreadyAppliedCoupon) {
+      toast({
+        position: 'top',
+        title: t('signup:alert-message.coupon-already-applied'),
+        status: 'info',
+        duration: 4000,
+        isClosable: true,
+      });
+      if (actions) {
+        actions.setSubmitting(false);
+      }
+      return;
+    }
+
     bc.payment({
       coupons: [coupons || discountCode],
       plan: planFormated,