Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Observer/AdyenCcDataAssignObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Magento\Payment\Observer\AbstractDataAssignObserver;
use Magento\Quote\Api\Data\PaymentInterface;
use Adyen\Payment\Gateway\Request\Header\HeaderDataBuilderInterface;
use Magento\Vault\Api\Data\PaymentTokenInterface;

class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
{
Expand All @@ -46,6 +47,7 @@ class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
self::CC_TYPE,
self::RETURN_URL,
self::RECURRING_PROCESSING_MODEL,
PaymentTokenInterface::PUBLIC_HASH,
HeaderDataBuilderInterface::ADDITIONAL_DATA_FRONTEND_TYPE_KEY
];

Expand Down
2 changes: 2 additions & 0 deletions Observer/AdyenPaymentMethodDataAssignObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Magento\Framework\Event\Observer;
use Magento\Payment\Observer\AbstractDataAssignObserver;
use Magento\Quote\Api\Data\PaymentInterface;
use Magento\Vault\Api\Data\PaymentTokenInterface;

class AdyenPaymentMethodDataAssignObserver extends AbstractDataAssignObserver
{
Expand All @@ -39,6 +40,7 @@ class AdyenPaymentMethodDataAssignObserver extends AbstractDataAssignObserver
self::RETURN_URL,
self::RECURRING_PROCESSING_MODEL,
self::CC_NUMBER,
PaymentTokenInterface::PUBLIC_HASH,
HeaderDataBuilderInterface::ADDITIONAL_DATA_FRONTEND_TYPE_KEY
];

Expand Down
29 changes: 28 additions & 1 deletion etc/graphql/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,33 @@
<item name="adyen_scalapay_3x" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_scalapay_4x" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_paynow" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_cc_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenCc</item>
<item name="adyen_ideal_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_klarna_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_paypal_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_bcmc_mobile_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_amazonpay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_googlepay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_sepadirectdebit_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_applepay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_directEbanking_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_eps_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_giropay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_kakaopay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_klarna_account_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_klarna_paynow_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_paybybank_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_trustly_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_twint_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_zip_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_gcash_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_carnet_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_momo_wallet_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_bcmc_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_cashapp_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_ach_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_dana_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
<item name="adyen_paybybank_ais_dd_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
Comment on lines +112 to +138
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For better readability and maintainability, it would be beneficial to sort these new <item> entries alphabetically by their name attribute. This will make it easier to locate specific payment methods in the future as the list grows.

                <item name="adyen_ach_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_amazonpay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_applepay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_bcmc_mobile_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_bcmc_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_carnet_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_cashapp_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_cc_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenCc</item>
                <item name="adyen_dana_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_directEbanking_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_eps_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_gcash_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_giropay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_googlepay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_ideal_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_kakaopay_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_klarna_account_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_klarna_paynow_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_klarna_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_momo_wallet_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_paybybank_ais_dd_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_paybybank_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_paypal_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_sepadirectdebit_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_trustly_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_twint_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                <item name="adyen_zip_vault" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>

</argument>
</arguments>
</type>
Expand All @@ -126,4 +153,4 @@
</argument>
</arguments>
</type>
</config>
</config>
4 changes: 3 additions & 1 deletion etc/schema.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,17 @@ input AdyenAdditionalDataCc {
stateData: String @doc(description: "JSON string of filled fields.")
returnUrl: String @doc(description: "The URL to return to in case of a redirection. The format depends on the channel. This URL can have a maximum of 1024 characters. It can include a placeholder `:merchantReference` to identify the order e.g. `https://your-company.com/checkout?shopperOrder=:merchantReference`.")
recurringProcessingModel: String @doc(description: "Recurring processing model to tokenize the payment method.")
public_hash: String @doc(description: "Reference of the vault payment token for recurring payments")
}

input AdyenAdditionalData {
brand_code: String! @doc(description:"Type of alternative payment method.")
stateData: String! @doc(description:"JSON string of filled fields.")
stateData: String @doc(description:"JSON string of filled fields.")
df_value: String @doc(description: "Ratepay device identification token.")
guestEmail: String @doc(description: "Email address if customer is guest.")
returnUrl: String @doc(description: "The URL to return to in case of a redirection. The format depends on the channel. This URL can have a maximum of 1024 characters. It can include a placeholder `:merchantReference` to identify the order e.g. `https://your-company.com/checkout?shopperOrder=:merchantReference`.")
recurringProcessingModel: String @doc(description: "Recurring processing model to tokenize the payment method.")
public_hash: String @doc(description: "Reference of the vault payment token for recurring payments")
}

input AdyenAdditionalDataPosCloud {
Expand Down
Loading