Fix: handle PayPal cancellation and error by resetting processing sta…

…te ; add PayPal debug option to environment variables
aelassas · Feb 24, 2025 · b133cb7 · b133cb7
1 parent 35bd3bd
commit b133cb7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/frontend/.env.example b/frontend/.env.example
@@ -18,6 +18,7 @@ VITE_MI_PAGINATION_MODE=classic # classic or infinite_scroll
 VITE_MI_PAYMENT_GATEWAY=Stripe # Stripe or PayPal
 VITE_MI_STRIPE_PUBLISHABLE_KEY=STRIPE_PUBLISHABLE_KEY
 VITE_MI_PAYPAL_CLIENT_ID=PAYPAL_CLIENT_ID
+VITE_MI_PAYPAL_DEBUG=false
 VITE_MI_BASE_CURRENCY=USD
 VITE_MI_SET_LANGUAGE_FROM_IP=false
 VITE_MI_GOOGLE_ANALYTICS_ENABLED=false

diff --git a/frontend/src/config/env.config.ts b/frontend/src/config/env.config.ts
@@ -104,6 +104,7 @@ const env = {
   PAYMENT_GATEWAY,
   STRIPE_PUBLISHABLE_KEY: String(import.meta.env.VITE_MI_STRIPE_PUBLISHABLE_KEY),
   PAYPAL_CLIENT_ID: String(import.meta.env.VITE_MI_PAYPAL_CLIENT_ID),
+  PAYPAL_DEBUG: (import.meta.env.VITE_MI_PAYPAL_DEBUG && import.meta.env.VITE_MI_PAYPAL_DEBUG.toLowerCase()) === 'true',
   SET_LANGUAGE_FROM_IP: (import.meta.env.VITE_MI_SET_LANGUAGE_FROM_IP && import.meta.env.VITE_MI_SET_LANGUAGE_FROM_IP.toLowerCase()) === 'true',
   GOOGLE_ANALYTICS_ENABLED: (import.meta.env.VITE_MI_GOOGLE_ANALYTICS_ENABLED && import.meta.env.VITE_MI_GOOGLE_ANALYTICS_ENABLED.toLowerCase()) === 'true',
   GOOGLE_ANALYTICS_ID: String(import.meta.env.VITE_MI_GOOGLE_ANALYTICS_ID),

diff --git a/frontend/src/context/PayPalContext.tsx b/frontend/src/context/PayPalContext.tsx
@@ -18,6 +18,7 @@ const PayPalProvider = ({ children }: PayPalProviderProps) => (
         intent: 'capture',
         locale: PayPalService.getLocale(),
         // buyerCountry: 'US',
+        debug: env.PAYPAL_DEBUG,
       }}
     >
       {children}

diff --git a/frontend/src/pages/Checkout.tsx b/frontend/src/pages/Checkout.tsx
@@ -656,6 +656,12 @@ const Checkout = () => {
                             onInit={() => {
                               setPayPalInit(true)
                             }}
+                            onCancel={() => {
+                              setPayPalProcessing(false)
+                            }}
+                            onError={() => {
+                              setPayPalProcessing(false)
+                            }}
                           />
                         </div>
                       ) : null