Pspaypal take over changes oxid7

metadata.php

@@ -151,16 +151,6 @@
         'onDeactivate' => '\OxidSolutionCatalysts\PayPal\Core\Events\Events::onDeactivate'
     ],
     'blocks' => [
-        [
-            'template' => 'page/checkout/order.tpl',
-            'block' => 'shippingAndPayment',
-            'file' => 'views/blocks/page/checkout/shipping_and_payment.tpl'
-        ],
-        [
-            'template' => 'page/checkout/order.tpl',
-            'block' => 'checkout_order_btn_submit_bottom',
-            'file' => '/views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl'
-        ],
         [
             'template' => 'headitem.tpl',
             'block' => 'admin_headitem_inccss',
@@ -191,59 +181,66 @@
             'block' => 'base_style',
             'file' => 'views/blocks/layout/base_style.tpl'
         ],
+        [
+            'template' => 'page/account/inc/account_menu.tpl',
+            'block' => 'account_menu',
+            'file' => '/views/blocks/page/account/inc/account_menu.tpl',
+        ],
         [
             'template' => 'page/checkout/basket.tpl',
             'block' => 'basket_btn_next_bottom',
             'file' => '/views/blocks/page/checkout/basket_btn_next_bottom.tpl',
         ],
         [
-            'template' => 'widget/minibasket/minibasket.tpl',
-            'block' => 'dd_layout_page_header_icon_menu_minibasket_functions',
-            'file' => '/views/blocks/widget/minibasket/dd_layout_page_header_icon_menu_minibasket_functions.tpl',
+            'template' => 'page/checkout/basket.tpl',
+            'block' => 'checkout_basket_next_step_top',
+            'file' => '/views/blocks/page/checkout/basket_installment_banner_after.tpl'
         ],
         [
-            'template' => 'payment_main.tpl',
-            'block' => 'admin_payment_main_form',
-            'file' => '/views/blocks/admin/admin_payment_main_form.tpl',
+            'template' => 'page/checkout/basket.tpl',
+            'block' => 'checkout_basket_emptyshippingcart',
+            'file' => '/views/blocks/page/checkout/basket_installment_banner_before.tpl'
         ],
-        // @Todo PAYPAL-486: Using the same file, with 2 themes. Should be more generic, if possible.
         [
-            'template' => 'page/checkout/payment.tpl',
-            'block' => 'select_payment',
-            'file' => '/views/blocks/page/checkout/select_payment.tpl',
+            'template' => 'page/checkout/order.tpl',
+            'block' => 'checkout_order_btn_submit_bottom',
+            'file' => 'views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl'
+        ],
+        [
+            'template' => 'page/checkout/order.tpl',
+            'block' => 'shippingAndPayment',
+            'file' => 'views/blocks/page/checkout/shipping_and_payment.tpl'
         ],
         [
             'template' => 'page/checkout/payment.tpl',
             'block' => 'change_payment',
             'file' => '/views/blocks/page/checkout/change_payment.tpl',
         ],
         [
-            'template' => 'page/details/inc/productmain.tpl',
-            'block' => 'details_productmain_tobasket',
-            'file' => '/views/blocks/page/details/inc/details_productmain_tobasket.tpl',
-        ],
-
-        // PSPAYPAL-491 Installment banners -->
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block' => 'checkout_basket_next_step_top',
-            'file' => '/views/blocks/page/checkout/basket_installment_banner_after.tpl'
-        ],
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block' => 'checkout_basket_emptyshippingcart',
+            'template' => 'page/checkout/payment.tpl',
+            'block' => 'checkout_payment_main',
             'file' => '/views/blocks/page/checkout/basket_installment_banner_before.tpl'
         ],
         [
             'template' => 'page/checkout/payment.tpl',
-            'block' => 'checkout_payment_main',
-            'file' => '/views/blocks/page/checkout/basket_installment_banner_before.tpl'
+            'block' => 'select_payment',
+            'file' => '/views/blocks/page/checkout/select_payment.tpl',
+        ],
+        [
+            'template' => 'page/checkout/thankyou.tpl',
+            'block' => 'checkout_thankyou_info',
+            'file' => '/views/blocks/page/checkout/thankyou.tpl',
         ],
         [
             'template' => 'page/details/inc/productmain.tpl',
             'block' => 'details_productmain_price_value',
             'file' => '/views/blocks/page/details/inc/productmain.tpl'
         ],
+        [
+            'template' => 'page/details/inc/productmain.tpl',
+            'block' => 'details_productmain_tobasket',
+            'file' => '/views/blocks/page/details/inc/details_productmain_tobasket.tpl',
+        ],
         [
             'template' => 'page/list/list.tpl',
             'block' => 'page_list_listhead',
@@ -260,16 +257,10 @@
             'file' => '/views/blocks/page/shop/start.tpl',
         ],
         [
-            'template' => 'page/account/inc/account_menu.tpl',
-            'block' => 'account_menu',
-            'file' => '/views/blocks/page/account/inc/account_menu.tpl',
-        ],
-        [
-            'template' => 'page/checkout/thankyou.tpl',
-            'block' => 'checkout_thankyou_info',
-            'file' => '/views/blocks/page/checkout/thankyou.tpl',
+            'template' => 'widget/minibasket/minibasket.tpl',
+            'block' => 'dd_layout_page_header_icon_menu_minibasket_functions',
+            'file' => '/views/blocks/widget/minibasket/dd_layout_page_header_icon_menu_minibasket_functions.tpl',
         ],
-        // <-- PSPAYPAL-491
     ],
     'settings' => [
         [
@@ -567,7 +558,7 @@
         [
             'name' => 'oscPayPalDefaultShippingPriceExpress',
             'type' => 'str',
-            'value' => 3.5,
+            'value' => '3.5',
             'group' => null
         ],
         [

out/src/css/paypal.css

@@ -7,3 +7,10 @@
     max-width: 250px; }
   .paypal-button-wrapper.small {
     max-width: 200px; }
+
+.paypal-button-right {
+  margin-left: auto;
+  text-align: right; }
+
+#paypal-installment-banner-container {
+  margin-bottom: 1rem; }

resources/build/js/paypal-frontend-googlepay-3ds.js

@@ -0,0 +1,64 @@
+// After receiving PAYER_ACTION_REQUIRED from PayPal
+
+window.OxidPayPalGooglePay3DS = {
+    handle: async (paypalOrderResponse) => {
+        // Create new payment data request with 3DS parameters
+        const paymentDataRequest = await window.OxidPayPalGooglePay.getGooglePaymentDataRequest();
+        const threeDSPaymentDataRequest = {
+            ...paymentDataRequest,
+            paymentData: {
+                tokenizationData: {
+                    type: 'PAYMENT_GATEWAY',
+                    token: paypalOrderResponse.id // Original PayPal order ID
+                },
+                // 3DS specific parameters
+                threeDSData: {
+                    authenticationParameters: {
+                        threeDSRequestData: {
+                            threeDSServerTransID: generateTransactionId(),
+                            challengeWindowSize: "03", // Full screen
+                            messageCategory: "PAYMENT_AUTHENTICATION"
+                        }
+                    }
+                }
+            }
+        };
+
+        try {
+            // This triggers the 3DS popup
+            const paymentData = await paymentClient.loadPaymentData(threeDSPaymentDataRequest);
+
+            // After successful 3DS authentication
+            // Update PayPal order with new payment token
+            const updateOrderResponse = await fetch(`/v2/checkout/orders/${paypalOrderResponse.id}`, {
+                method: 'PATCH',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify([{
+                    op: 'replace',
+                    path: '/payment_source/google_pay/card/authentication_result',
+                    value: {
+                        liability_shift: "POSSIBLE",
+                        three_d_secure: {
+                            authentication_status: "Y",
+                            enrollment_status: "Y"
+                        }
+                    }
+                }])
+            });
+
+            // Finally capture the order
+            if (updateOrderResponse.ok) {
+                const captureResponse = await fetch(`/v2/checkout/orders/${paypalOrderResponse.id}/capture`, {
+                    method: 'POST'
+                });
+                return captureResponse;
+            }
+        } catch (error) {
+            // Handle 3DS or payment errors
+            console.error('3DS Authentication failed:', error);
+            throw error;
+        }
+    }
+};