Changeset 3084475

Timestamp:

05/10/2024 10:22:32 AM (21 months ago)

Author:

geideapg123

Message:

Enable support for block based checkout

Location:

geidea-online-payments/trunk

Files:

• assets/js/checkout.js (added)
• class.blocks-checkout.php (added)
• class.geidea.php (modified) (3 diffs)
• functions/ProcessPayment.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• wc-geidea.php (modified) (3 diffs)

geidea-online-payments/trunk/class.geidea.php

@@ -8 +8 @@
  * @class       WC_Geidea
  * @extends     WC_Payment_Gateway
- * @version     3.1.1
+ * @version     3.2.0
  * @author      Geidea
  */
@@ -110 +110 @@
         add_action('wp_ajax_ajax_order', array('WC_Gateway_Geidea', 'init_payment'));
         add_action('wp_ajax_nopriv_ajax_order', array('WC_Gateway_Geidea', 'init_payment'));
+        add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
     }
 
@@ -171 +172 @@
         return $settings;
     }
+
+    public function payment_scripts()
+    {
+        if (!isset($_GET['geidea-session'])) {
+            return;
+        }
+        if ($this->enabled === 'no') {
+            return;
+        }
+        if (!isset($_GET['geidea_session_nonce']) || !wp_verify_nonce(sanitize_key(wp_unslash($_GET['geidea_session_nonce'])), 'geidea_session_action')) {
+            echo '<script>alert("Nonce Verification Failed")</script>';
+            echo '<script>setTimeout(document.location.href = "' . wc_get_checkout_url() . '", 1000)</script>';
+            return;
+        }
+
+        $data_string = urldecode(wp_unslash($_GET['geidea-session'])); // phpcs:ignore
+        $data_array = json_decode($data_string, true);
+
+?>
+        <div style="display: none;">
+            <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+            <script src='<?php echo $this->config['jsSdkUrl']; ?>'></script>
+            <script>
+                let y_offsetWhenScrollDisabled = 0;
+
+                function disableScrollOnBody() {
+                    y_offsetWhenScrollDisabled = jQuery(window).scrollTop();
+                    jQuery('body').addClass('scrollDisabled').css('margin-top', -y_offsetWhenScrollDisabled);
+                }
+
+                function enableScrollOnBody() {
+                    jQuery('body').removeClass('scrollDisabled').css('margin-top', 0);
+                    jQuery(window).scrollTop(y_offsetWhenScrollDisabled);
+                }
+
+                let onError = function(error) {
+                    enableScrollOnBody();
+                    jQuery("#place_order").removeAttr("disabled");
+                    alert("Geidea Payment Gateway error: " + error.responseMessage);
+                    setTimeout(document.location.href = '<?php echo wc_get_checkout_url(); ?>', 1000);
+                }
+
+                let onCancel = function() {
+                    enableScrollOnBody();
+                    jQuery("#place_order").removeAttr("disabled");
+                    setTimeout(document.location.href = '<?php echo wc_get_checkout_url(); ?>', 1000);
+                }
+
+                const startV2HPP = (data) => {
+                    console.log("Session create API response", data);
+                    disableScrollOnBody();
+                    let onSuccess = function(_message, _statusCode) {
+                        setTimeout(document.location.href = data.successUrl, 1000);
+                    }
+                    try {
+                        if (data.responseCode !== '000') {
+                            throw data
+                        }
+                        const api = new GeideaCheckout(onSuccess, onError, onCancel);
+                        api.startPayment(data.session.id);
+                    } catch (error) {
+                        let receivedError;
+                        const errorFields = [];
+
+                        if (error.status && error.errors) {
+                            const errorsObject = error.errors;
+
+                            for (const key of Object.keys(errorsObject)) {
+                                errorFields.push(key.replace('$.', ''))
+                            }
+                            receivedError = {
+                                responseCode: '100',
+                                responseMessage: 'Field formatting errors',
+                                detailResponseMessage: `Fields with errors: ${errorFields.toString()}`,
+                                reference: error.reference,
+                                detailResponseCode: null,
+                                orderId: null
+                            }
+                        } else {
+                            receivedError = {
+                                responseCode: error.responseCode,
+                                responseMessage: error.responseMessage,
+                                detailResponseMessage: error.detailedResponseMessage,
+                                detailResponseCode: error.detailedResponseCode,
+                                orderId: null,
+                                reference: error.reference,
+                            }
+                        }
+                        onError(receivedError);
+                    }
+                }
+
+                startV2HPP(JSON.parse('<?php echo $data_array; ?>'));
+            </script>
+        </div>
+<?php
+    }
 }

geidea-online-payments/trunk/functions/ProcessPayment.php

@@ -40 +40 @@
         $token_id = null;
         try {
-            if (isset($_POST['wc-geidea-payment-token']) && isset($_POST['woocommerce-process-checkout-nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['woocommerce-process-checkout-nonce'])), 'woocommerce-process_checkout')) {
-                $selected_token_id = sanitize_text_field(wp_unslash($_POST['wc-geidea-payment-token']));
+            if (isset($_POST['wc-geidea-payment-token'])) { // phpcs:ignore
+                $selected_token_id = sanitize_text_field(wp_unslash($_POST['wc-geidea-payment-token'])); // phpcs:ignore
                 $token = WC_Payment_Tokens::get($selected_token_id);
                 if ($token) {
@@ -47 +47 @@
                 }
             }
-            if (isset($_POST['wc-geidea-new-payment-method']) && isset($_POST['woocommerce-process-checkout-nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['woocommerce-process-checkout-nonce'])), 'woocommerce-process_checkout')) {
+            if (isset($_POST['wc-geidea-new-payment-method']) && sanitize_text_field(wp_unslash($_POST['wc-geidea-new-payment-method']))) { // phpcs:ignore
                 $save_card = true;
             }
@@ -158 +158 @@
         </script>
         ';
+        $geidea_session_nonce = wp_create_nonce('geidea_session_action');
         return array(
             'result' => 'success',
-            'messages' => $script,
-            'refresh' => true,
-            'reload' => false,
+            'redirect' => wc_get_checkout_url() . '?geidea-session=' . urlencode(json_encode($response['body'])) . "&geidea_session_nonce=$geidea_session_nonce"
         );
     }

geidea-online-payments/trunk/readme.txt

@@ -2 +2 @@
 
 Contributors: geideapg123
-Version: 3.1.1
+Version: 3.2.0
 Tags: credit card, geidea, Apple Pay, payment, payment for WordPress, payment for woocommerce, payment request, woocommerce
 Requires at least: 6.0.2
 Tested up to: 6.5
 Requires PHP: 7.4
-Stable tag: 3.1.1
+Stable tag: 3.2.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -209 +209 @@
 = 3.1.1 - 2024-04-08 =
 * Plugin tested on wordpress v6.5
+
+= 3.2.0 - 2024-05-12 =
+* Enable support for block based checkout

geidea-online-payments/trunk/wc-geidea.php

@@ -4 +4 @@
 Plugin Name: Geidea Online Payments
 Description: Geidea Online Payments.
-Version: 3.1.1
+Version: 3.2.0
 Author: Geidea
 Author URI: https://geidea.net
@@ -53 +53 @@
 }
 
+/**
+ * Function for declare compatibility with cart_checkout_blocks feature
+ */
+function declare_cart_checkout_blocks_compatibility()
+{
+    if (class_exists('\Automattic\WooCommerce\Utilities\FeaturesUtil')) {
+        \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility(
+            'cart_checkout_blocks',
+            __FILE__,
+            true
+        );
+    }
+}
+
+/**
+ * Function for register a payment method type
+ */
+function register_order_approval_payment_method_type()
+{
+    if (!class_exists('Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType')) {
+        return;
+    }
+    require_once('class.blocks-checkout.php');
+    add_action(
+        'woocommerce_blocks_payment_method_type_registration',
+        function (Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry) {
+            $payment_method_registry->register(new WC_geidea_Blocks);
+        }
+    );
+}
+
 /*
  * Function for load plugin
@@ -75 +106 @@
     add_filter('woocommerce_payment_gateways', 'geidea_add_gateway');
     add_action('admin_menu', 'geidea_add_card_tokens_menu', 99);
+    add_action('before_woocommerce_init', 'declare_cart_checkout_blocks_compatibility');
+    add_action('woocommerce_blocks_loaded', 'register_order_approval_payment_method_type');
 }