Merge branch 'main' into main

Adyen · Oct 3, 2024 · 7e033b6 · 7e033b6
2 parents a5b5f64 + b77251e
commit 7e033b6
Show file tree

Hide file tree

Showing 11 changed files with 186 additions and 0 deletions.
diff --git a/etc/config.xml b/etc/config.xml
@@ -2207,6 +2207,72 @@
                 <title>Stored DANA</title>
                 <model>AdyenPaymentDanaVaultFacade</model>
             </adyen_dana_vault>
+            <adyen_kcp_naverpay>
+                <active>0</active>
+                <model>AdyenPaymentKcpNaverpayFacade</model>
+                <title>NaverPay</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>1</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_kcp_naverpay>
+            <adyen_kcp_payco>
+                <active>0</active>
+                <model>AdyenPaymentKcpPaycoFacade</model>
+                <title>PayCo</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>1</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_kcp_payco>
+            <adyen_kcp_creditcard>
+                <active>0</active>
+                <model>AdyenPaymentKcpCreditcardFacade</model>
+                <title>Credit Card via KCP</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_kcp_creditcard>
         </payment>
     </default>
 </config>
diff --git a/etc/di.xml b/etc/di.xml
@@ -4236,4 +4236,85 @@
             <argument name="methodCode" xsi:type="string">adyen_dana_vault</argument>
         </arguments>
     </virtualType>
+    <virtualType name="AdyenPaymentKcpNaverpayFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_kcp_naverpay</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentKcpNaverpayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpNaverpayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentKcpNaverpayConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpNaverpayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentKcpNaverpayConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpNaverpayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_kcp_naverpay</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpPaycoFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_kcp_payco</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentKcpPaycoValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpPaycoValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentKcpPaycoConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpPaycoConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentKcpPaycoConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpPaycoConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_kcp_payco</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpCreditcardFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_kcp_creditcard</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentKcpCreditcardValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpCreditcardValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentKcpCreditcardConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpCreditcardConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentKcpCreditcardConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentKcpCreditcardConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_kcp_creditcard</argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/etc/events.xml b/etc/events.xml
@@ -302,4 +302,13 @@
     <event name="payment_method_assign_data_adyen_dana">
         <observer name="adyen_dana_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
     </event>
+    <event name="payment_method_assign_data_adyen_kcp_naverpay">
+        <observer name="adyen_kcp_naverpay_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_kcp_payco">
+        <observer name="adyen_kcp_payco_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_kcp_creditcard">
+        <observer name="adyen_kcp_creditcard_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
 </config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -111,6 +111,9 @@
                 <item name="adyen_paypo" xsi:type="string">paypo</item>
                 <item name="adyen_upi" xsi:type="string">upi</item>
                 <item name="adyen_dana" xsi:type="string">dana</item>
+                <item name="adyen_kcp_naverpay" xsi:type="string">kcp_naverpay</item>
+                <item name="adyen_kcp_payco" xsi:type="string">kcp_payco</item>
+                <item name="adyen_kcp_creditcard" xsi:type="string">kcp_creditcard</item>
             </argument>
             <argument name="customMethodRenderers" xsi:type="array">
                 <item name="adyen_cc" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-cc-method</item>

diff --git a/etc/graphql/di.xml b/etc/graphql/di.xml
@@ -92,6 +92,9 @@
                 <item name="adyen_paypo" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_upi" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_dana" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_kcp_naverpay" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_kcp_payco" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_kcp_creditcard" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
             </argument>
         </arguments>
     </type>

diff --git a/etc/payment.xml b/etc/payment.xml
@@ -263,5 +263,14 @@
         <method name="adyen_dana">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="adyen_kcp_naverpay">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_kcp_payco">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_kcp_creditcard">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
     </methods>
 </payment>
diff --git a/view/base/web/images/logos/kcp_creditcard.svg b/view/base/web/images/logos/kcp_creditcard.svg
diff --git a/view/base/web/images/logos/kcp_naverpay.svg b/view/base/web/images/logos/kcp_naverpay.svg
diff --git a/view/base/web/images/logos/kcp_payco.svg b/view/base/web/images/logos/kcp_payco.svg
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -317,6 +317,15 @@
                                                                         <item name="adyen_dana" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="adyen_kcp_naverpay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_kcp_payco" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_kcp_creditcard" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>