fix: fixe merge conflicts

No-Country-simulation · Dec 19, 2024 · 7a0c97a · 7a0c97a
2 parents 515c400 + 8141c2c
commit 7a0c97a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/client/src/features/cart/components/Paypal/Paid.tsx b/client/src/features/cart/components/Paypal/Paid.tsx
@@ -2,6 +2,8 @@
 import { PayPalButtons, PayPalScriptProvider } from '@paypal/react-paypal-js';
 export const Paid = () => {
   const clientId: string = process.env.NEXT_PUBLIC_CLIENT_ID!;
+  const price = '19.99'; // En formato string con dos decimales
+  const currency = 'USD'; // Código de moneda, e.g., USD, EUR, etc.
   return (
     <div className="flex items-center justify-center">
       <PayPalScriptProvider
@@ -14,6 +16,19 @@ export const Paid = () => {
             color: 'blue',
             label: 'paypal',
           }}
+          createOrder={(data, actions) => {
+            return actions.order.create({
+              intent: 'CAPTURE', // Captura inmediata del pago
+              purchase_units: [
+                {
+                  amount: {
+                    currency_code: currency, // Código de moneda requerido
+                    value: price, // Precio estático
+                  },
+                },
+              ],
+            });
+          }}
         />
       </PayPalScriptProvider>
     </div>

diff --git a/client/src/features/courses/components/CourseCard/CourseCard.module.css b/client/src/features/courses/components/CourseCard/CourseCard.module.css
@@ -10,8 +10,8 @@
   width: 100%;
   max-width: 550px;
   height: 100%;
-  min-height: 535px;
-  max-height: 535px;
+  min-height: 550px;
+  max-height: 550px;
   border-radius: 8px;
   display: flex;
   flex-direction: column;

diff --git a/client/src/features/courses/components/CourseCard/index.tsx b/client/src/features/courses/components/CourseCard/index.tsx
@@ -110,7 +110,7 @@ const CourseCard = ({
         {categoria}
       </span>
 
-      <div className="grow p-4">
+      <div className="grow px-4 pt-4">
         <div className="flex items-center justify-between">
           <h3 className="line-clamp-2 max-h-14 min-h-14 text-ellipsis text-lg font-bold text-slate-200">
             {title}
@@ -153,15 +153,15 @@ const CourseCard = ({
           ) : null}
         </div>
         {price ? (
-          <div className="mt-4 flex items-center gap-2">
+          <div className="mt-4 flex items-center">
             <strong className="text-lg font-bold text-slate-200">${price}</strong>
           </div>
         ) : null}
       </div>
 
-      <div className="mt-auto flex items-center p-4">
+      <div className="mt-2 flex items-center p-3">
         <Button
-          className="relative z-10 rounded-lg px-4 py-2 text-sm text-white"
+          className="relative z-10 rounded-lg px-4 text-sm text-white"
           onClick={() => {
             saveToCart({
               courseId,