fix /patron with currency not supported by paypal

lichess-org · Jun 23, 2024 · e82d276 · e82d276
1 parent 8e4733f
commit e82d276
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/modules/plan/src/main/ui/PlanUi.scala b/modules/plan/src/main/ui/PlanUi.scala
@@ -32,18 +32,19 @@ final class PlanUi(helpers: Helpers)(contactEmail: EmailAddress):
         ctx.isAuth.option(
           frag(
             stripeScript,
-            frag(
-              // gotta load the paypal SDK twice, for onetime and subscription :facepalm:
-              // https://stackoverflow.com/questions/69024268/how-can-i-show-a-paypal-smart-subscription-button-and-a-paypal-smart-capture-but/69024269
-              script(
-                src := s"https://www.paypal.com/sdk/js?client-id=${payPalPublicKey}&currency=${pricing.currency}$localeParam",
-                namespaceAttr := "paypalOrder"
-              ),
-              script(
-                src := s"https://www.paypal.com/sdk/js?client-id=${payPalPublicKey}&vault=true&intent=subscription&currency=${pricing.currency}$localeParam",
-                namespaceAttr := "paypalSubscription"
+            pricing.payPalSupportsCurrency.option:
+              frag(
+                // gotta load the paypal SDK twice, for onetime and subscription :facepalm:
+                // https://stackoverflow.com/questions/69024268/how-can-i-show-a-paypal-smart-subscription-button-and-a-paypal-smart-capture-but/69024269
+                script(
+                  src := s"https://www.paypal.com/sdk/js?client-id=${payPalPublicKey}&currency=${pricing.currency}$localeParam",
+                  namespaceAttr := "paypalOrder"
+                ),
+                script(
+                  src := s"https://www.paypal.com/sdk/js?client-id=${payPalPublicKey}&vault=true&intent=subscription&currency=${pricing.currency}$localeParam",
+                  namespaceAttr := "paypalSubscription"
+                )
               )
-            )
           )
         )
       .js(ctx.isAuth.option(embedJsUnsafeLoadThen(s"""checkoutStart("$stripePublicKey", $pricingJson)""")))

diff --git a/ui/bits/src/bits.checkout.ts b/ui/bits/src/bits.checkout.ts
@@ -145,6 +145,7 @@ const payPalStyle = {
 };
 
 function payPalOrderStart($checkout: Cash, pricing: Pricing, getAmount: () => number | undefined) {
+  if (!window.paypalOrder) return;
   (window.paypalOrder as any)
     .Buttons({
       style: payPalStyle,
@@ -173,6 +174,7 @@ function payPalOrderStart($checkout: Cash, pricing: Pricing, getAmount: () => nu
 }
 
 function payPalSubscriptionStart($checkout: Cash, pricing: Pricing, getAmount: () => number | undefined) {
+  if (!window.paypalSubscription) return;
   (window.paypalSubscription as any)
     .Buttons({
       style: payPalStyle,