Merge branch 'main' of https://github.com/deco-sites/ecannadeco

deco-sites · Nov 4, 2024 · 1f126e0 · 1f126e0
2 parents 6cc8950 + d0f5d23
commit 1f126e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/actions/getPlans.ts b/actions/getPlans.ts
@@ -1,7 +1,9 @@
+import { API_URL } from "deco-sites/ecannadeco/sdk/constants.ts";
+
 const getPlans = async (_req: Request): Promise<unknown | null> => {
   try {
     const response = await fetch(
-      "https://api.ecanna.com.br/products/subscriptions",
+      API_URL + "/products/subscriptions",
       {
         method: "GET",
         headers: {

diff --git a/components/ui/CheckoutUpsellModal.tsx b/components/ui/CheckoutUpsellModal.tsx
@@ -168,7 +168,7 @@ const CheckoutUpsellModal = (props: Props) => {
           paramsCheckoutV2.voucher = voucher;
         }
 
-        if (isCreditCard) {
+        if (isCreditCard || plan) {
           paramsCheckoutV2.credit_card = {
             holder: holderName,
             number: creditCardNumber,
@@ -359,6 +359,7 @@ const CheckoutUpsellModal = (props: Props) => {
 
   function ConfirmOrder() {
     const currentPrice = plan ? plan.price : product ? product.price : 0;
+
     return (
       <>
         <h3 class="text-xl text-[#8b8b8b] font-semibold text-center mb-4">
@@ -373,7 +374,7 @@ const CheckoutUpsellModal = (props: Props) => {
               {plan ? plan.name : product && product.name}
             </span>
           </span>
-          {discount !== 1
+          {!discount || discount !== 1
             ? (
               <span>
                 {plan
@@ -446,7 +447,7 @@ const CheckoutUpsellModal = (props: Props) => {
 
         {/* Cartão de crédito */}
 
-        {isCreditCard && (
+        {(isCreditCard || plan) && (
           <>
             <div>
               {
@@ -498,7 +499,8 @@ const CheckoutUpsellModal = (props: Props) => {
                 })} */
               }
             </div>
-            {discount !== 1
+
+            {!discount || discount !== 1
               ? (
                 <div class={`${!addNewCard && "hidden"}`}>
                   <form class="flex flex-wrap gap-[2%]">

diff --git a/components/ui/ChoosePlanSignup.tsx b/components/ui/ChoosePlanSignup.tsx
@@ -4,6 +4,7 @@ import Slider from "../../components/ui/Slider.tsx";
 import { Plan } from "../../components/ui/Checkout.tsx";
 import Icon from "../../components/ui/Icon.tsx";
 import { IS_BROWSER } from "$fresh/runtime.ts";
+import { API_URL } from "deco-sites/ecannadeco/sdk/constants.ts";
 
 function ConfirmSignup() {
   const [newPlan, setNewPlan] = useState<Plan>();
@@ -12,7 +13,7 @@ function ConfirmSignup() {
   useEffect(() => {
     try {
       const _params = fetch(
-        `https://api.ecanna.com.br/v1/products/subscriptions?isPrescriber=false`,
+        `${API_URL}/v1/products/subscriptions?isPrescriber=false`,
       ).then(async (r) => {
         const c = await r.json();
         console.log({ plans: c.docs });

diff --git a/components/ui/MyAccount.tsx b/components/ui/MyAccount.tsx
@@ -16,6 +16,7 @@ import { useUI } from "../../sdk/useUI.ts";
 import { IS_BROWSER } from "$fresh/runtime.ts";
 import { useHolderInfo } from "deco-sites/ecannadeco/sdk/useHolderInfo.ts";
 import { UserData } from "deco-sites/ecannadeco/components/ui/EcannaCardPage.tsx";
+import { API_URL } from "deco-sites/ecannadeco/sdk/constants.ts";
 
 export type Address = {
   cep: string;
@@ -115,7 +116,7 @@ function MyAccount() {
         });
 
       fetch(
-        `https://api.ecanna.com.br/v1/products/subscriptions?isPrescriber=false`,
+        `${API_URL}/v1/products/subscriptions?isPrescriber=false`,
       ).then(async (r) => {
         const c = await r.json();
         const plansList = c.docs as Plan[];