diff --git a/src/main/java/com/adyen/model/transactionwebhooks/Amount.java b/src/main/java/com/adyen/model/transactionwebhooks/Amount.java index 5081ada76..cde08ff1b 100644 --- a/src/main/java/com/adyen/model/transactionwebhooks/Amount.java +++ b/src/main/java/com/adyen/model/transactionwebhooks/Amount.java @@ -30,10 +30,12 @@ public Amount() {} /** * The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. * * @param currency The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. * @return the current {@code Amount} instance, allowing for method chaining */ public Amount currency(String currency) { @@ -43,10 +45,12 @@ public Amount currency(String currency) { /** * The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. * * @return currency The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. */ @JsonProperty(JSON_PROPERTY_CURRENCY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -56,10 +60,12 @@ public String getCurrency() { /** * The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. * * @param currency The three-character [ISO currency - * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). + * code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the + * amount. */ @JsonProperty(JSON_PROPERTY_CURRENCY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -68,10 +74,10 @@ public void setCurrency(String currency) { } /** - * The amount of the transaction, in [minor + * The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * - * @param value The amount of the transaction, in [minor + * @param value The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * @return the current {@code Amount} instance, allowing for method chaining */ @@ -81,10 +87,10 @@ public Amount value(Long value) { } /** - * The amount of the transaction, in [minor + * The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * - * @return value The amount of the transaction, in [minor + * @return value The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). */ @JsonProperty(JSON_PROPERTY_VALUE) @@ -94,10 +100,10 @@ public Long getValue() { } /** - * The amount of the transaction, in [minor + * The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * - * @param value The amount of the transaction, in [minor + * @param value The numeric value of the amount, in [minor * units](https://docs.adyen.com/development-resources/currency-codes#minor-units). */ @JsonProperty(JSON_PROPERTY_VALUE) diff --git a/src/main/java/com/adyen/model/transactionwebhooks/BankCategoryData.java b/src/main/java/com/adyen/model/transactionwebhooks/BankCategoryData.java index ca0ad9e60..3e5ae9030 100644 --- a/src/main/java/com/adyen/model/transactionwebhooks/BankCategoryData.java +++ b/src/main/java/com/adyen/model/transactionwebhooks/BankCategoryData.java @@ -27,14 +27,14 @@ public class BankCategoryData { /** * The priority for the bank transfer. This sets the speed at which the transfer is sent and the * fees that you have to pay. Required for transfers with `category` **bank**. Possible - * values: * **regular**: for normal, low-value transactions. * **fast**: a faster way to transfer + * values: * **regular**: For normal, low-value transactions. * **fast**: A faster way to transfer * funds, but the fees are higher. Recommended for high-priority, low-value transactions. * - * **wire**: the fastest way to transfer funds, but this has the highest fees. Recommended for - * high-priority, high-value transactions. * **instant**: for instant funds transfers within the + * **wire**: The fastest way to transfer funds, but this has the highest fees. Recommended for + * high-priority, high-value transactions. * **instant**: For instant funds transfers within the * United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). */ public enum PriorityEnum { @@ -135,26 +135,26 @@ public BankCategoryData() {} /** * The priority for the bank transfer. This sets the speed at which the transfer is sent and the * fees that you have to pay. Required for transfers with `category` **bank**. Possible - * values: * **regular**: for normal, low-value transactions. * **fast**: a faster way to transfer + * values: * **regular**: For normal, low-value transactions. * **fast**: A faster way to transfer * funds, but the fees are higher. Recommended for high-priority, low-value transactions. * - * **wire**: the fastest way to transfer funds, but this has the highest fees. Recommended for - * high-priority, high-value transactions. * **instant**: for instant funds transfers within the + * **wire**: The fastest way to transfer funds, but this has the highest fees. Recommended for + * high-priority, high-value transactions. * **instant**: For instant funds transfers within the * United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). * * @param priority The priority for the bank transfer. This sets the speed at which the transfer * is sent and the fees that you have to pay. Required for transfers with `category` - * **bank**. Possible values: * **regular**: for normal, low-value transactions. * **fast**: a + * **bank**. Possible values: * **regular**: For normal, low-value transactions. * **fast**: A * faster way to transfer funds, but the fees are higher. Recommended for high-priority, - * low-value transactions. * **wire**: the fastest way to transfer funds, but this has the - * highest fees. Recommended for high-priority, high-value transactions. * **instant**: for + * low-value transactions. * **wire**: The fastest way to transfer funds, but this has the + * highest fees. Recommended for high-priority, high-value transactions. * **instant**: For * instant funds transfers within the United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). * @return the current {@code BankCategoryData} instance, allowing for method chaining */ @@ -166,26 +166,26 @@ public BankCategoryData priority(PriorityEnum priority) { /** * The priority for the bank transfer. This sets the speed at which the transfer is sent and the * fees that you have to pay. Required for transfers with `category` **bank**. Possible - * values: * **regular**: for normal, low-value transactions. * **fast**: a faster way to transfer + * values: * **regular**: For normal, low-value transactions. * **fast**: A faster way to transfer * funds, but the fees are higher. Recommended for high-priority, low-value transactions. * - * **wire**: the fastest way to transfer funds, but this has the highest fees. Recommended for - * high-priority, high-value transactions. * **instant**: for instant funds transfers within the + * **wire**: The fastest way to transfer funds, but this has the highest fees. Recommended for + * high-priority, high-value transactions. * **instant**: For instant funds transfers within the * United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). * * @return priority The priority for the bank transfer. This sets the speed at which the transfer * is sent and the fees that you have to pay. Required for transfers with `category` - * **bank**. Possible values: * **regular**: for normal, low-value transactions. * **fast**: a + * **bank**. Possible values: * **regular**: For normal, low-value transactions. * **fast**: A * faster way to transfer funds, but the fees are higher. Recommended for high-priority, - * low-value transactions. * **wire**: the fastest way to transfer funds, but this has the - * highest fees. Recommended for high-priority, high-value transactions. * **instant**: for + * low-value transactions. * **wire**: The fastest way to transfer funds, but this has the + * highest fees. Recommended for high-priority, high-value transactions. * **instant**: For * instant funds transfers within the United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). */ @JsonProperty(JSON_PROPERTY_PRIORITY) @@ -197,26 +197,26 @@ public PriorityEnum getPriority() { /** * The priority for the bank transfer. This sets the speed at which the transfer is sent and the * fees that you have to pay. Required for transfers with `category` **bank**. Possible - * values: * **regular**: for normal, low-value transactions. * **fast**: a faster way to transfer + * values: * **regular**: For normal, low-value transactions. * **fast**: A faster way to transfer * funds, but the fees are higher. Recommended for high-priority, low-value transactions. * - * **wire**: the fastest way to transfer funds, but this has the highest fees. Recommended for - * high-priority, high-value transactions. * **instant**: for instant funds transfers within the + * **wire**: The fastest way to transfer funds, but this has the highest fees. Recommended for + * high-priority, high-value transactions. * **instant**: For instant funds transfers within the * United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). * * @param priority The priority for the bank transfer. This sets the speed at which the transfer * is sent and the fees that you have to pay. Required for transfers with `category` - * **bank**. Possible values: * **regular**: for normal, low-value transactions. * **fast**: a + * **bank**. Possible values: * **regular**: For normal, low-value transactions. * **fast**: A * faster way to transfer funds, but the fees are higher. Recommended for high-priority, - * low-value transactions. * **wire**: the fastest way to transfer funds, but this has the - * highest fees. Recommended for high-priority, high-value transactions. * **instant**: for + * low-value transactions. * **wire**: The fastest way to transfer funds, but this has the + * highest fees. Recommended for high-priority, high-value transactions. * **instant**: For * instant funds transfers within the United States and in [SEPA * locations](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). * - * **crossBorder**: for high-value transfers to a recipient in a different country. * - * **internal**: for transfers to an Adyen-issued business bank account (by bank account + * **crossBorder**: For high-value transfers to a recipient in a different country. * + * **internal**: For transfers to an Adyen-issued business bank account (by bank account * number/IBAN). */ @JsonProperty(JSON_PROPERTY_PRIORITY) diff --git a/src/main/java/com/adyen/model/transactionwebhooks/PlatformPayment.java b/src/main/java/com/adyen/model/transactionwebhooks/PlatformPayment.java index 44d895627..f69bf5ac3 100644 --- a/src/main/java/com/adyen/model/transactionwebhooks/PlatformPayment.java +++ b/src/main/java/com/adyen/model/transactionwebhooks/PlatformPayment.java @@ -47,22 +47,22 @@ public class PlatformPayment { * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of interchange - * and scheme fee) incurred on a transaction. * **AdyenCommission**: the transaction fee due to + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of interchange + * and scheme fee) incurred on a transaction. * **AdyenCommission**: The transaction fee due to * Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen under - * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the amount booked - * to your user after the deduction of the relevant fees. * **Commission**: your platform's or - * marketplace's commission on a transaction. * **DCCPlatformCommission**: the Dynamic - * Currency Conversion (DCC) fee on a transaction. * **Interchange**: the interchange fee (fee - * paid to the issuer) incurred on a transaction. * **PaymentFee**: the aggregated amount of all - * transaction fees. * **Remainder**: the leftover amount after currency conversion. * - * **SchemeFee**: the scheme fee incurred on a transaction. * **Surcharge**: the surcharge paid by - * the customer on a transaction. * **Tip**: the tip paid by the customer. * **TopUp**: an - * incoming transfer to top up your user's balance account. * **VAT**: the value-added tax - * charged on the payment. + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen under + * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The amount booked + * to your user after the deduction of the relevant fees. * **Commission**: Your platform's or + * marketplace's commission on a transaction. * **DCCPlatformCommission**: **deprecated** The + * Dynamic Currency Conversion (DCC) fee on a transaction. * **DCCMarkup**: The Dynamic Currency + * Conversion (DCC) fee on a transaction. * **Interchange**: The interchange fee (fee paid to the + * issuer) incurred on a transaction. * **PaymentFee**: The aggregated amount of all transaction + * fees. * **Remainder**: The leftover amount after currency conversion. * **SchemeFee**: The + * scheme fee incurred on a transaction. * **Surcharge**: The surcharge paid by the customer on a + * transaction. * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top + * up your user's balance account. * **VAT**: The value-added tax charged on the payment. */ public enum PlatformPaymentTypeEnum { ACQUIRINGFEES(String.valueOf("AcquiringFees")), @@ -79,6 +79,8 @@ public enum PlatformPaymentTypeEnum { COMMISSION(String.valueOf("Commission")), + DCCMARKUP(String.valueOf("DCCMarkup")), + DCCPLATFORMCOMMISSION(String.valueOf("DCCPlatformCommission")), DEFAULT(String.valueOf("Default")), @@ -292,22 +294,22 @@ public void setPaymentMerchantReference(String paymentMerchantReference) { * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of interchange - * and scheme fee) incurred on a transaction. * **AdyenCommission**: the transaction fee due to + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of interchange + * and scheme fee) incurred on a transaction. * **AdyenCommission**: The transaction fee due to * Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen under - * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the amount booked - * to your user after the deduction of the relevant fees. * **Commission**: your platform's or - * marketplace's commission on a transaction. * **DCCPlatformCommission**: the Dynamic - * Currency Conversion (DCC) fee on a transaction. * **Interchange**: the interchange fee (fee - * paid to the issuer) incurred on a transaction. * **PaymentFee**: the aggregated amount of all - * transaction fees. * **Remainder**: the leftover amount after currency conversion. * - * **SchemeFee**: the scheme fee incurred on a transaction. * **Surcharge**: the surcharge paid by - * the customer on a transaction. * **Tip**: the tip paid by the customer. * **TopUp**: an - * incoming transfer to top up your user's balance account. * **VAT**: the value-added tax - * charged on the payment. + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen under + * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The amount booked + * to your user after the deduction of the relevant fees. * **Commission**: Your platform's or + * marketplace's commission on a transaction. * **DCCPlatformCommission**: **deprecated** The + * Dynamic Currency Conversion (DCC) fee on a transaction. * **DCCMarkup**: The Dynamic Currency + * Conversion (DCC) fee on a transaction. * **Interchange**: The interchange fee (fee paid to the + * issuer) incurred on a transaction. * **PaymentFee**: The aggregated amount of all transaction + * fees. * **Remainder**: The leftover amount after currency conversion. * **SchemeFee**: The + * scheme fee incurred on a transaction. * **Surcharge**: The surcharge paid by the customer on a + * transaction. * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top + * up your user's balance account. * **VAT**: The value-added tax charged on the payment. * * @param platformPaymentType Specifies the nature of the transfer. This parameter helps * categorize transfers so you can reconcile transactions at a later time, using the Balance @@ -315,22 +317,23 @@ public void setPaymentMerchantReference(String paymentMerchantReference) { * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of - * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: the + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of + * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: The * transaction fee due to Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen - * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the - * amount booked to your user after the deduction of the relevant fees. * **Commission**: your + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen + * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The + * amount booked to your user after the deduction of the relevant fees. * **Commission**: Your * platform's or marketplace's commission on a transaction. * - * **DCCPlatformCommission**: the Dynamic Currency Conversion (DCC) fee on a transaction. * - * **Interchange**: the interchange fee (fee paid to the issuer) incurred on a transaction. * - * **PaymentFee**: the aggregated amount of all transaction fees. * **Remainder**: the - * leftover amount after currency conversion. * **SchemeFee**: the scheme fee incurred on a - * transaction. * **Surcharge**: the surcharge paid by the customer on a transaction. * - * **Tip**: the tip paid by the customer. * **TopUp**: an incoming transfer to top up your - * user's balance account. * **VAT**: the value-added tax charged on the payment. + * **DCCPlatformCommission**: **deprecated** The Dynamic Currency Conversion (DCC) fee on a + * transaction. * **DCCMarkup**: The Dynamic Currency Conversion (DCC) fee on a transaction. * + * **Interchange**: The interchange fee (fee paid to the issuer) incurred on a transaction. * + * **PaymentFee**: The aggregated amount of all transaction fees. * **Remainder**: The + * leftover amount after currency conversion. * **SchemeFee**: The scheme fee incurred on a + * transaction. * **Surcharge**: The surcharge paid by the customer on a transaction. * + * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top up your + * user's balance account. * **VAT**: The value-added tax charged on the payment. * @return the current {@code PlatformPayment} instance, allowing for method chaining */ public PlatformPayment platformPaymentType(PlatformPaymentTypeEnum platformPaymentType) { @@ -344,22 +347,22 @@ public PlatformPayment platformPaymentType(PlatformPaymentTypeEnum platformPayme * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of interchange - * and scheme fee) incurred on a transaction. * **AdyenCommission**: the transaction fee due to + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of interchange + * and scheme fee) incurred on a transaction. * **AdyenCommission**: The transaction fee due to * Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen under - * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the amount booked - * to your user after the deduction of the relevant fees. * **Commission**: your platform's or - * marketplace's commission on a transaction. * **DCCPlatformCommission**: the Dynamic - * Currency Conversion (DCC) fee on a transaction. * **Interchange**: the interchange fee (fee - * paid to the issuer) incurred on a transaction. * **PaymentFee**: the aggregated amount of all - * transaction fees. * **Remainder**: the leftover amount after currency conversion. * - * **SchemeFee**: the scheme fee incurred on a transaction. * **Surcharge**: the surcharge paid by - * the customer on a transaction. * **Tip**: the tip paid by the customer. * **TopUp**: an - * incoming transfer to top up your user's balance account. * **VAT**: the value-added tax - * charged on the payment. + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen under + * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The amount booked + * to your user after the deduction of the relevant fees. * **Commission**: Your platform's or + * marketplace's commission on a transaction. * **DCCPlatformCommission**: **deprecated** The + * Dynamic Currency Conversion (DCC) fee on a transaction. * **DCCMarkup**: The Dynamic Currency + * Conversion (DCC) fee on a transaction. * **Interchange**: The interchange fee (fee paid to the + * issuer) incurred on a transaction. * **PaymentFee**: The aggregated amount of all transaction + * fees. * **Remainder**: The leftover amount after currency conversion. * **SchemeFee**: The + * scheme fee incurred on a transaction. * **Surcharge**: The surcharge paid by the customer on a + * transaction. * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top + * up your user's balance account. * **VAT**: The value-added tax charged on the payment. * * @return platformPaymentType Specifies the nature of the transfer. This parameter helps * categorize transfers so you can reconcile transactions at a later time, using the Balance @@ -367,22 +370,23 @@ public PlatformPayment platformPaymentType(PlatformPaymentTypeEnum platformPayme * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of - * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: the + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of + * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: The * transaction fee due to Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen - * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the - * amount booked to your user after the deduction of the relevant fees. * **Commission**: your + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen + * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The + * amount booked to your user after the deduction of the relevant fees. * **Commission**: Your * platform's or marketplace's commission on a transaction. * - * **DCCPlatformCommission**: the Dynamic Currency Conversion (DCC) fee on a transaction. * - * **Interchange**: the interchange fee (fee paid to the issuer) incurred on a transaction. * - * **PaymentFee**: the aggregated amount of all transaction fees. * **Remainder**: the - * leftover amount after currency conversion. * **SchemeFee**: the scheme fee incurred on a - * transaction. * **Surcharge**: the surcharge paid by the customer on a transaction. * - * **Tip**: the tip paid by the customer. * **TopUp**: an incoming transfer to top up your - * user's balance account. * **VAT**: the value-added tax charged on the payment. + * **DCCPlatformCommission**: **deprecated** The Dynamic Currency Conversion (DCC) fee on a + * transaction. * **DCCMarkup**: The Dynamic Currency Conversion (DCC) fee on a transaction. * + * **Interchange**: The interchange fee (fee paid to the issuer) incurred on a transaction. * + * **PaymentFee**: The aggregated amount of all transaction fees. * **Remainder**: The + * leftover amount after currency conversion. * **SchemeFee**: The scheme fee incurred on a + * transaction. * **Surcharge**: The surcharge paid by the customer on a transaction. * + * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top up your + * user's balance account. * **VAT**: The value-added tax charged on the payment. */ @JsonProperty(JSON_PROPERTY_PLATFORM_PAYMENT_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -396,22 +400,22 @@ public PlatformPaymentTypeEnum getPlatformPaymentType() { * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of interchange - * and scheme fee) incurred on a transaction. * **AdyenCommission**: the transaction fee due to + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of interchange + * and scheme fee) incurred on a transaction. * **AdyenCommission**: The transaction fee due to * Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen under - * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the amount booked - * to your user after the deduction of the relevant fees. * **Commission**: your platform's or - * marketplace's commission on a transaction. * **DCCPlatformCommission**: the Dynamic - * Currency Conversion (DCC) fee on a transaction. * **Interchange**: the interchange fee (fee - * paid to the issuer) incurred on a transaction. * **PaymentFee**: the aggregated amount of all - * transaction fees. * **Remainder**: the leftover amount after currency conversion. * - * **SchemeFee**: the scheme fee incurred on a transaction. * **Surcharge**: the surcharge paid by - * the customer on a transaction. * **Tip**: the tip paid by the customer. * **TopUp**: an - * incoming transfer to top up your user's balance account. * **VAT**: the value-added tax - * charged on the payment. + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen under + * [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The amount booked + * to your user after the deduction of the relevant fees. * **Commission**: Your platform's or + * marketplace's commission on a transaction. * **DCCPlatformCommission**: **deprecated** The + * Dynamic Currency Conversion (DCC) fee on a transaction. * **DCCMarkup**: The Dynamic Currency + * Conversion (DCC) fee on a transaction. * **Interchange**: The interchange fee (fee paid to the + * issuer) incurred on a transaction. * **PaymentFee**: The aggregated amount of all transaction + * fees. * **Remainder**: The leftover amount after currency conversion. * **SchemeFee**: The + * scheme fee incurred on a transaction. * **Surcharge**: The surcharge paid by the customer on a + * transaction. * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top + * up your user's balance account. * **VAT**: The value-added tax charged on the payment. * * @param platformPaymentType Specifies the nature of the transfer. This parameter helps * categorize transfers so you can reconcile transactions at a later time, using the Balance @@ -419,22 +423,23 @@ public PlatformPaymentTypeEnum getPlatformPaymentType() { * [marketplaces](https://docs.adyen.com/marketplaces/reports-and-fees/balance-platform-accounting-report/) * or * [platforms](https://docs.adyen.com/platforms/reports-and-fees/balance-platform-accounting-report/). - * Possible values: * **AcquiringFees**: the acquiring fee (the aggregated amount of - * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: the + * Possible values: * **AcquiringFees**: The acquiring fee (the aggregated amount of + * interchange and scheme fee) incurred on a transaction. * **AdyenCommission**: The * transaction fee due to Adyen under [blended * rates](https://www.adyen.com/knowledge-hub/guides/payments-training-guide/get-the-best-from-your-card-processing). - * * **AdyenFees**: all transaction fees due to Adyen. This is the aggregated amount of - * Adyen's commission and markup. * **AdyenMarkup**: the transaction fee due to Adyen - * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: the - * amount booked to your user after the deduction of the relevant fees. * **Commission**: your + * * **AdyenFees**: All transaction fees due to Adyen. This is the aggregated amount of + * Adyen's commission and markup. * **AdyenMarkup**: The transaction fee due to Adyen + * under [Interchange++ pricing](https://www.adyen.com/pricing). * **BalanceAccount**: The + * amount booked to your user after the deduction of the relevant fees. * **Commission**: Your * platform's or marketplace's commission on a transaction. * - * **DCCPlatformCommission**: the Dynamic Currency Conversion (DCC) fee on a transaction. * - * **Interchange**: the interchange fee (fee paid to the issuer) incurred on a transaction. * - * **PaymentFee**: the aggregated amount of all transaction fees. * **Remainder**: the - * leftover amount after currency conversion. * **SchemeFee**: the scheme fee incurred on a - * transaction. * **Surcharge**: the surcharge paid by the customer on a transaction. * - * **Tip**: the tip paid by the customer. * **TopUp**: an incoming transfer to top up your - * user's balance account. * **VAT**: the value-added tax charged on the payment. + * **DCCPlatformCommission**: **deprecated** The Dynamic Currency Conversion (DCC) fee on a + * transaction. * **DCCMarkup**: The Dynamic Currency Conversion (DCC) fee on a transaction. * + * **Interchange**: The interchange fee (fee paid to the issuer) incurred on a transaction. * + * **PaymentFee**: The aggregated amount of all transaction fees. * **Remainder**: The + * leftover amount after currency conversion. * **SchemeFee**: The scheme fee incurred on a + * transaction. * **Surcharge**: The surcharge paid by the customer on a transaction. * + * **Tip**: The tip paid by the customer. * **TopUp**: An incoming transfer to top up your + * user's balance account. * **VAT**: The value-added tax charged on the payment. */ @JsonProperty(JSON_PROPERTY_PLATFORM_PAYMENT_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/src/test/java/com/adyen/CheckoutTest.java b/src/test/java/com/adyen/CheckoutTest.java index b81e95531..396880cdc 100644 --- a/src/test/java/com/adyen/CheckoutTest.java +++ b/src/test/java/com/adyen/CheckoutTest.java @@ -889,7 +889,7 @@ public void testForwardCardDetails() throws Exception { CheckoutForwardResponse response = recurringApi.forward(checkoutForwardRequest); - assertNull(response.getStoredPaymentMethodId()); // card is not tokenized + assertNull(response.getStoredPaymentMethodId()); // card is not tokenized assertNotNull(response.getResponse()); assertEquals(200, (int) response.getResponse().getStatus()); assertTrue(response.getResponse().getBody().contains("PAYMENT_METHOD_ID"));