Merge branch 'develop' into fixes/order-status-pre_authorized

Adyen · Mar 6, 2024 · 4219077 · 4219077
2 parents c6ce184 + d16c44f
commit 4219077
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 12 deletions.
diff --git a/etc/config.xml b/etc/config.xml
@@ -2025,8 +2025,8 @@
                 <supports_auto_capture>1</supports_auto_capture>
                 <is_wallet>1</is_wallet>
                 <group>adyen-alternative-payment-method</group>
-          </adyen_mobilepay>
-          <adyen_vipps>
+            </adyen_mobilepay>
+            <adyen_vipps>
                 <active>0</active>
                 <model>AdyenPaymentVippsFacade</model>
                 <title>Vipps</title>
@@ -2048,6 +2048,28 @@
                 <is_wallet>1</is_wallet>
                 <group>adyen-alternative-payment-method</group>
             </adyen_vipps>
+            <adyen_bizum>
+                <active>0</active>
+                <model>AdyenPaymentBizumFacade</model>
+                <title>Bizum</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_bizum>
         </payment>
     </default>
-</config>
+</config>
diff --git a/etc/di.xml b/etc/di.xml
@@ -826,7 +826,6 @@
                 <item name="adyen_giropay" xsi:type="string">AdyenPaymentCommandManager</item>
                 <item name="adyen_eps" xsi:type="string">AdyenPaymentCommandManager</item>
                 <item name="adyen_directEbanking" xsi:type="string">AdyenPaymentCommandManager</item>
-
             </argument>
         </arguments>
     </type>
@@ -3931,8 +3930,8 @@
             <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentMobilepayValueHandlerPool</argument>
             <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
             <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
-       </arguments>
-    </virtualType>   
+        </arguments>
+    </virtualType>
     <virtualType name="AdyenPaymentVippsFacade" type="Adyen\Payment\Model\Method\Adapter">
         <arguments>
             <argument name="code" xsi:type="string">adyen_vipps</argument>
@@ -3977,5 +3976,31 @@
             <argument name="methodCode" xsi:type="string">adyen_vipps</argument>
         </arguments>
     </virtualType>
-</config>
-
+    <virtualType name="AdyenPaymentBizumFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_bizum</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">AdyenPaymentBizumValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentBizumValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentBizumConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentBizumConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentBizumConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentBizumConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_bizum</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/etc/events.xml b/etc/events.xml
@@ -281,4 +281,7 @@
     <event name="sales_order_payment_place_end">
         <observer name="adyen_sales_order_payment_place_end_order_status" instance="Adyen\Payment\Observer\SetOrderStateAfterPaymentObserver" />
     </event>
-</config>
+    <event name="payment_method_assign_data_adyen_bizum">
+        <observer name="adyen_bizum_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+</config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -104,6 +104,7 @@
                 <item name="adyen_klarna_b2b" xsi:type="string">klarna_b2b</item>
                 <item name="adyen_mobilepay" xsi:type="string">mobilepay</item>
                 <item name="adyen_vipps" xsi:type="string">vipps</item>
+                <item name="adyen_bizum" xsi:type="string">bizum</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>
@@ -150,4 +151,4 @@
             </argument>
         </arguments>
     </type>
-</config>
+</config>
diff --git a/etc/graphql/di.xml b/etc/graphql/di.xml
@@ -84,6 +84,7 @@
                 <item name="adyen_klarna_b2b" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_mobilepay" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_vipps" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_bizum" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
             </argument>
         </arguments>
     </type>

diff --git a/etc/payment.xml b/etc/payment.xml
@@ -237,10 +237,13 @@
             <allow_multiple_address>1</allow_multiple_address>
         </method>
         <method name="adyen_mobilepay">
-          <allow_multiple_address>1</allow_multiple_address>
+            <allow_multiple_address>1</allow_multiple_address>
         </method>
         <method name="adyen_vipps">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="adyen_bizum">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
     </methods>
 </payment>
diff --git a/view/base/web/images/logos/bizum.svg b/view/base/web/images/logos/bizum.svg
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -293,6 +293,9 @@
                                                                         <item name="adyen_vipps" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="adyen_bizum" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>
@@ -310,4 +313,4 @@
             </arguments>
         </referenceBlock>
     </body>
-</page>
+</page>
diff --git a/view/frontend/layout/multishipping_checkout_billing.xml b/view/frontend/layout/multishipping_checkout_billing.xml
@@ -94,6 +94,7 @@
                     <item name="adyen_klarna_b2b" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                     <item name="adyen_mobilepay" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                     <item name="adyen_vipps" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_bizum" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                 </argument>
                 <argument name="cacheable" xsi:type="boolean">false</argument>
             </arguments>