Merge pull request #571 from Adyen/feature/open-invoice-with-country-…

…selection Show a dropdown of countries if no country is passed in Open Invoices
Adyen · Dec 4, 2020 · 311d20d · 311d20d
2 parents 9d51f9e + cd62aca
commit 311d20d
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 6 deletions.
diff --git a/packages/lib/src/components/Affirm/Affirm.tsx b/packages/lib/src/components/Affirm/Affirm.tsx
@@ -1,6 +1,5 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
-
-const ALLOWED_COUNTRIES = ['CA', 'US'];
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class Affirm extends OpenInvoiceContainer {
     public static type = 'affirm';

diff --git a/packages/lib/src/components/Affirm/config.ts b/packages/lib/src/components/Affirm/config.ts
@@ -0,0 +1 @@
+export const ALLOWED_COUNTRIES = ['CA', 'US'];
diff --git a/packages/lib/src/components/AfterPay/AfterPay.tsx b/packages/lib/src/components/AfterPay/AfterPay.tsx
@@ -2,13 +2,15 @@ import { h } from 'preact';
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
 import ConsentCheckboxLabel from './components/ConsentCheckboxLabel';
 import { getConsentLinkUrl } from './utils';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class AfterPay extends OpenInvoiceContainer {
     public static type = 'afterpay_default';
 
     formatProps(props) {
         return {
             ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES,
             consentCheckboxLabel: <ConsentCheckboxLabel url={getConsentLinkUrl(props.countryCode, props.i18n?.locale)} />
         };
     }

diff --git a/packages/lib/src/components/AfterPay/AfterPayB2B.tsx b/packages/lib/src/components/AfterPay/AfterPayB2B.tsx
@@ -1,7 +1,7 @@
 import { h } from 'preact';
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
 import ConsentCheckboxLabel from './components/ConsentCheckboxLabel';
-import { AFTERPAY_B2B_CONSENT_URL } from './config';
+import { AFTERPAY_B2B_CONSENT_URL, ALLOWED_COUNTRIES } from './config';
 
 export default class AfterPayB2B extends OpenInvoiceContainer {
     public static type = 'afterpay_b2b';
@@ -20,6 +20,7 @@ export default class AfterPayB2B extends OpenInvoiceContainer {
     formatProps(props) {
         return {
             ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES,
             consentCheckboxLabel: <ConsentCheckboxLabel url={AFTERPAY_B2B_CONSENT_URL} />
         };
     }

diff --git a/packages/lib/src/components/AfterPay/config.ts b/packages/lib/src/components/AfterPay/config.ts
@@ -2,5 +2,6 @@ const AFTERPAY_CONSENT_URL_EN = 'https://www.afterpay.nl/en/algemeen/pay-with-af
 const AFTERPAY_CONSENT_URL_BE = 'https://www.afterpay.be/be/footer/betalen-met-afterpay/betalingsvoorwaarden';
 const AFTERPAY_CONSENT_URL_NL = 'https://www.afterpay.nl/nl/algemeen/betalen-met-afterpay/betalingsvoorwaarden';
 const AFTERPAY_B2B_CONSENT_URL = 'https://www.afterpay.nl/nl/algemeen/zakelijke-partners/betalingsvoorwaarden-zakelijk';
+const ALLOWED_COUNTRIES = ['BE', 'NL'];
 
-export { AFTERPAY_CONSENT_URL_EN, AFTERPAY_CONSENT_URL_BE, AFTERPAY_CONSENT_URL_NL, AFTERPAY_B2B_CONSENT_URL };
+export { AFTERPAY_CONSENT_URL_EN, AFTERPAY_CONSENT_URL_BE, AFTERPAY_CONSENT_URL_NL, AFTERPAY_B2B_CONSENT_URL, ALLOWED_COUNTRIES };
diff --git a/packages/lib/src/components/FacilyPay/FacilyPay10x.ts b/packages/lib/src/components/FacilyPay/FacilyPay10x.ts
@@ -1,5 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class FacilyPay10x extends OpenInvoiceContainer {
     public static type = 'facilypay_10x';
+
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
 }
diff --git a/packages/lib/src/components/FacilyPay/FacilyPay12x.ts b/packages/lib/src/components/FacilyPay/FacilyPay12x.ts
@@ -1,5 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class FacilyPay12x extends OpenInvoiceContainer {
     public static type = 'facilypay_12x';
+
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
 }
diff --git a/packages/lib/src/components/FacilyPay/FacilyPay3x.ts b/packages/lib/src/components/FacilyPay/FacilyPay3x.ts
@@ -1,6 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class FacilyPay3x extends OpenInvoiceContainer {
     public static type = 'facilypay_3x';
-}
 
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
+}
diff --git a/packages/lib/src/components/FacilyPay/FacilyPay4x.ts b/packages/lib/src/components/FacilyPay/FacilyPay4x.ts
@@ -1,5 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class FacilyPay4x extends OpenInvoiceContainer {
     public static type = 'facilypay_4x';
+
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
 }
diff --git a/packages/lib/src/components/FacilyPay/FacilyPay6x.ts b/packages/lib/src/components/FacilyPay/FacilyPay6x.ts
@@ -1,5 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class FacilyPay6x extends OpenInvoiceContainer {
     public static type = 'facilypay_6x';
+
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
 }
diff --git a/packages/lib/src/components/FacilyPay/config.ts b/packages/lib/src/components/FacilyPay/config.ts
@@ -0,0 +1 @@
+export const ALLOWED_COUNTRIES = ['ES', 'FR'];
diff --git a/packages/lib/src/components/RatePay/RatePay.ts b/packages/lib/src/components/RatePay/RatePay.ts
@@ -1,5 +1,13 @@
 import OpenInvoiceContainer from '../helpers/OpenInvoiceContainer';
+import { ALLOWED_COUNTRIES } from './config';
 
 export default class RatePay extends OpenInvoiceContainer {
     public static type = 'ratepay';
+
+    formatProps(props) {
+        return {
+            ...super.formatProps(props),
+            allowedCountries: props.countryCode ? [props.countryCode] : ALLOWED_COUNTRIES
+        };
+    }
 }
diff --git a/packages/lib/src/components/RatePay/config.ts b/packages/lib/src/components/RatePay/config.ts
@@ -0,0 +1 @@
+export const ALLOWED_COUNTRIES = ['AT', 'CH', 'DE'];
diff --git a/packages/lib/src/components/internal/OpenInvoice/types.ts b/packages/lib/src/components/internal/OpenInvoice/types.ts
@@ -11,7 +11,7 @@ export interface OpenInvoiceVisibility {
 export interface OpenInvoiceProps {
     allowedCountries?: string[];
     consentCheckboxLabel: any;
-    countryCode: string;
+    countryCode?: string;
     data: {
         companyDetails?: CompanyDetailsSchema;
         personalDetails?: PersonalDetailsSchema;