Changeset 3266406

Timestamp:

04/03/2025 01:32:49 PM (10 months ago)

Author:

vivawalletplugins

Message:

preparing version 1.0.1

Location:

viva-com-smart-for-woocommerce/trunk

Files:

• changelog.txt (modified) (1 diff)
• composer.json (modified) (2 diffs)
• includes/assets/js/admin-vivacom-smart.js (modified) (1 diff)
• includes/assets/js/admin-vivacom-smart.min.js (modified) (1 diff)
• includes/class-wc-vivacom-smart-blocks-support.php (modified) (1 diff)
• includes/class-wc-vivacom-smart-endpoints.php (modified) (5 diffs)
• includes/class-wc-vivacom-smart-helpers.php (modified) (18 diffs)
• includes/class-wc-vivacom-smart-subscriptions.php (modified) (10 diffs)
• includes/class-wc-vivacom-smart.php (modified) (14 diffs)
• package.json (modified) (1 diff)
• readme.md (modified) (2 diffs)
• uninstall.php (modified) (1 diff)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/ClassLoader.php (modified) (25 diffs)
• vendor/composer/InstalledVersions.php (modified) (6 diffs)
• vendor/composer/autoload_real.php (modified) (2 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/composer/installed.json (modified) (1 diff)
• vendor/composer/installed.php (modified) (2 diffs)
• vendor_prefixed/vivawallet/composer.json (modified) (1 diff)
• vendor_prefixed/vivawallet/lib/Application.php (modified) (2 diffs)
• wc-vivacom-smart.php (modified) (6 diffs)

viva-com-smart-for-woocommerce/trunk/changelog.txt

@@ -1 @@
-2024-01-28 - version 1.0.0
+2025-03-27 - version 1.0.1
+* Add brand color selection for smart checkout
+* Fix double call to viva ( both environments) on configuration
+
+2025-01-28 - version 1.0.0
 * Viva.com | Smart Checkout. Initial release.

viva-com-smart-for-woocommerce/trunk/composer.json

@@ -16 +16 @@
         "phpunit/phpunit": "*",
         "humbug/php-scoper": "*",
-        "vivawallet/vivawallet-php": "2.2.2"
+        "vivawallet/vivawallet-php": "2.2.3"
     },
     "repositories": {
@@ -31 +31 @@
     },
     "scripts": {
+        "phpcs-config": [
+            "\"phpcs/vendor/bin/phpcs\" --config-set installed_paths phpcs/vendor/wp-coding-standards/wpcs,phpcs/vendor/phpcompatibility/php-compatibility,phpcs/vendor/woocommerce/woocommerce-sniffs/src,phpcs/vendor/phpcompatibility/phpcompatibility-wp,phpcs/vendor/phpcompatibility/phpcompatibility-paragonie,phpcs/vendor/phpcsstandards/phpcsutils,phpcs/vendor/phpcsstandards/phpcsextra"
+        ],
+        "phpcs-scan": [
+            "@phpcs-config",
+            "\"phpcs/vendor/bin/phpcs\""
+        ],
         "post-autoload-dump": [
             "@php vendor/humbug/php-scoper/bin/php-scoper add-prefix --prefix=VivaComSmartCheckout --output-dir=./vendor_prefixed/guzzlehttp --config=php-scoper/guzzlehttp.inc.php --force",

viva-com-smart-for-woocommerce/trunk/includes/assets/js/admin-vivacom-smart.js

@@ -7 +7 @@
         var advanced_settings_checkbox = jQuery( '#woocommerce_vivacom_smart_advanced_settings_enabled' );
         var advancedSettingsEnabled    = advanced_settings_checkbox.is( ':checked' );
+
+        jQuery('#woocommerce_vivacom_smart_brand_color').wpColorPicker();
 
         if ( demoMode ) {

viva-com-smart-for-woocommerce/trunk/includes/assets/js/admin-vivacom-smart.min.js

@@ -1 @@
-jQuery(document).ready(function(){var e=jQuery("#woocommerce_vivacom_smart_test_mode"),o=e.is(":checked"),t=jQuery("#woocommerce_vivacom_smart_advanced_settings_enabled"),r=t.is(":checked");(o?(jQuery("#woocommerce_vivacom_smart_client_id").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_client_secret").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_title_live")):(jQuery("#woocommerce_vivacom_smart_demo_client_id").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_client_secret").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_title_demo"))).hide(),r?(jQuery("#woocommerce_vivacom_smart_main_descr").show(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").show(),(e.is(":checked")?jQuery("#woocommerce_vivacom_smart_demo_source_code"):jQuery("#woocommerce_vivacom_smart_source_code")).closest("tr").show()):(jQuery("#woocommerce_vivacom_smart_main_descr").hide(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").hide()),t.on("change",function(){jQuery("#woocommerce_vivacom_smart_main_descr").toggle(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").toggle(),(e.is(":checked")?jQuery("#woocommerce_vivacom_smart_demo_source_code"):jQuery("#woocommerce_vivacom_smart_source_code")).closest("tr").toggle()}),e.on("change",function(){jQuery("#woocommerce_vivacom_smart_client_id").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_client_secret").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_demo_client_id").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_demo_client_secret").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_title_live").toggle(),jQuery("#woocommerce_vivacom_smart_title_demo").toggle(),t.is(":checked")&&(jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").toggle())})});
+jQuery(document).ready(function(){var e=jQuery("#woocommerce_vivacom_smart_test_mode"),o=e.is(":checked"),c=jQuery("#woocommerce_vivacom_smart_advanced_settings_enabled"),r=c.is(":checked");jQuery("#woocommerce_vivacom_smart_brand_color").wpColorPicker(),(o?(jQuery("#woocommerce_vivacom_smart_client_id").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_client_secret").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_title_live")):(jQuery("#woocommerce_vivacom_smart_demo_client_id").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_client_secret").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_title_demo"))).hide(),r?(jQuery("#woocommerce_vivacom_smart_main_descr").show(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").show(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").show(),(e.is(":checked")?jQuery("#woocommerce_vivacom_smart_demo_source_code"):jQuery("#woocommerce_vivacom_smart_source_code")).closest("tr").show()):(jQuery("#woocommerce_vivacom_smart_main_descr").hide(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").hide(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").hide()),c.on("change",function(){jQuery("#woocommerce_vivacom_smart_main_descr").toggle(),jQuery("#woocommerce_vivacom_smart_title").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_description").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_order_status").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_logo_enabled").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_installments").closest("tr").toggle(),(e.is(":checked")?jQuery("#woocommerce_vivacom_smart_demo_source_code"):jQuery("#woocommerce_vivacom_smart_source_code")).closest("tr").toggle()}),e.on("change",function(){jQuery("#woocommerce_vivacom_smart_client_id").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_client_secret").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_demo_client_id").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_demo_client_secret").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_title_live").toggle(),jQuery("#woocommerce_vivacom_smart_title_demo").toggle(),c.is(":checked")&&(jQuery("#woocommerce_vivacom_smart_demo_source_code").closest("tr").toggle(),jQuery("#woocommerce_vivacom_smart_source_code").closest("tr").toggle())})});

viva-com-smart-for-woocommerce/trunk/includes/class-wc-vivacom-smart-blocks-support.php

@@ -1 +1 @@
 <?php
+/**
+ * Blocks support
+ *
+ * @package   VivaComSmartForWooCommerce
+ */
+
 use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
 

viva-com-smart-for-woocommerce/trunk/includes/class-wc-vivacom-smart-endpoints.php

@@ -85 +85 @@
 
             if (
-                empty( $parameters['EventData']['TransactionId'] )
-                || empty( $parameters['EventData']['OrderCode'] )
-                || is_null( $parameters['EventData']['TransactionTypeId'] )
-            ) {
+                empty( $parameters['EventData']['TransactionId'] )
+                || empty( $parameters['EventData']['OrderCode'] )
+                || is_null( $parameters['EventData']['TransactionTypeId'] )
+            ) {
                 return new WP_REST_Response( $res, 200 );
             }
 
-            $order_code     = (string) $parameters['EventData']['OrderCode'];
-            $transaction = array(
-                'id' =>   (string) $parameters['EventData']['TransactionId'],
-                'typeId' =>   (int) $parameters['EventData']['TransactionTypeId'],
-            );
+            $order_code  = (string) $parameters['EventData']['OrderCode'];
+            $transaction = array(
+                'id'     => (string) $parameters['EventData']['TransactionId'],
+                'typeId' => (int) $parameters['EventData']['TransactionTypeId'],
+            );
 
             global $wpdb;
 
-            $wc_order_id = $wpdb->get_var( $wpdb->prepare(
-                "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add LIMIT 1",
-                $order_code
-            )
-            );
+            $wc_order_id = $wpdb->get_var(
+                $wpdb->prepare(
+                    "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add LIMIT 1",
+                    $order_code
+                )
+            );
 
             if ( ! empty( $wc_order_id ) ) {
@@ -119 +120 @@
             WC_Vivacom_Smart_Logger::log( "Payments methods endpoint post callback\n Smart checkout\n Request: " . wp_json_encode( $parameters ) );
 
-            if ( isset( $parameters['EventTypeId'] ) && 1796 === $parameters['EventTypeId'] ) {
-                $viva_settings         = get_option( 'woocommerce_vivacom_smart_settings' );
-                $environment           = 'yes' === $viva_settings['test_mode'] ? 'demo' : 'live';
-                $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
-                $transaction_response  = WC_Vivacom_Smart_Helpers::get_transaction( $bearer_authentication, $transaction['id'] );
-
-                if ( ! empty( $transaction_response ) && ! empty( $transaction_response->orderCode ) ) {
-                    // CHECK TRANSACTION VALID AND UPDATE.
-                    $transaction_order = (string) $transaction_response->orderCode;
-
-                    if ( $transaction_order === $order_code ) {
-                        if ( 'F' === $transaction_response->statusId ) {
-                            $date = new DateTime($parameters['EventData']['CardExpirationDate']);
-                            $tokenData = array(
-                                'lastFourDigits' => (isset($parameters['EventData']['CardNumber']) && strlen($parameters['EventData']['CardNumber']) > 4) ? substr((string)$parameters['EventData']['CardNumber'], -4) : 'XXXX',
-                                'cardType'     => (string) $parameters['EventData']['BankId'],
-                                'expiryMonth' => $date->format('m') ?? null,
-                                'expiryYear' => $date->format('Y') ?? null,
-                            );
-                            WC_Vivacom_Smart_Helpers::complete_order( $order->get_id(), $transaction, '', false );
-
-                            // Check and save card token if subscription.
-                            if ( WC_Vivacom_Smart_Helpers::check_subscription( $order->get_id() ) && $order->get_user() ) {
-                                WC_Vivacom_Smart_Helpers::save_payment_token( $transaction['id'], $order, $tokenData );
-                            }
-                        }
-                    }
-                } else {
-                    // WEBHOOK WILL BE RESEND.
-                    return new WP_REST_Response( $res, 400 );
-                }
-            } else {
-                $note = __( 'Transaction failed using Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' );
-
-                if ( isset( $parameters['CorrelationId'] ) && ! empty( $parameters['CorrelationId'] ) ) {
-                    $note .= __( 'with Viva-CorrelationId: ', 'viva-com-smart-for-woocommerce' ) . $parameters['CorrelationId'];
-
-                } else {
-                    $note .= '.';
-                }
-
-                $order->add_order_note( $note, false );
-                $order->save();
-            }
+            if ( isset( $parameters['EventTypeId'] ) && 1796 === $parameters['EventTypeId'] ) {
+                $viva_settings         = get_option( 'woocommerce_vivacom_smart_settings' );
+                $environment           = 'yes' === $viva_settings['test_mode'] ? 'demo' : 'live';
+                $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
+                $transaction_response  = WC_Vivacom_Smart_Helpers::get_transaction( $bearer_authentication, $transaction['id'] );
+
+                if ( ! empty( $transaction_response ) && ! empty( $transaction_response->orderCode ) ) {
+                    // CHECK TRANSACTION VALID AND UPDATE.
+                    $transaction_order = (string) $transaction_response->orderCode;
+
+                    if ( $transaction_order === $order_code ) {
+                        if ( 'F' === $transaction_response->statusId ) {
+                            $date      = new DateTime( $parameters['EventData']['CardExpirationDate'] );
+                            $token_data = array(
+                                'lastFourDigits' => ( isset( $parameters['EventData']['CardNumber'] ) && strlen( $parameters['EventData']['CardNumber'] ) > 4 ) ? substr( (string) $parameters['EventData']['CardNumber'], -4 ) : 'XXXX',
+                                'cardType'       => (string) $parameters['EventData']['BankId'],
+                                'expiryMonth'    => $date->format( 'm' ) ?? null,
+                                'expiryYear'     => $date->format( 'Y' ) ?? null,
+                            );
+                            WC_Vivacom_Smart_Helpers::complete_order( $order->get_id(), $transaction, '', false );
+
+                            // Check and save card token if subscription.
+                            if ( WC_Vivacom_Smart_Helpers::check_subscription( $order->get_id() ) && $order->get_user() ) {
+                                WC_Vivacom_Smart_Helpers::save_payment_token( $transaction['id'], $order, $token_data );
+                            }
+                        }
+                    }
+                } else {
+                    // WEBHOOK WILL BE RESEND.
+                    return new WP_REST_Response( $res, 400 );
+                }
+            } else {
+                $note = __( 'Transaction failed using Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' );
+
+                if ( isset( $parameters['CorrelationId'] ) && ! empty( $parameters['CorrelationId'] ) ) {
+                    $note .= __( 'with Viva-CorrelationId: ', 'viva-com-smart-for-woocommerce' ) . $parameters['CorrelationId'];
+
+                } else {
+                    $note .= '.';
+                }
+
+                $order->add_order_note( $note, false );
+                $order->save();
+            }
 
             return new WP_REST_Response( $res, 200 );
@@ -182 +183 @@
             global $wpdb;
 
-            $wc_order_id = $wpdb->get_var( $wpdb->prepare(
-                "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add DESC LIMIT 1",
-                $viva_ref
-            )
-            );
+            $wc_order_id = $wpdb->get_var(
+                $wpdb->prepare(
+                    "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add DESC LIMIT 1",
+                    $viva_ref
+                )
+            );
 
             if ( ! empty( $wc_order_id ) ) {
@@ -199 +201 @@
                 wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
             }
-
         }
 
@@ -212 +213 @@
                 wc_add_notice( __( 'There was a problem processing your payment. Please try again', 'viva-com-smart-for-woocommerce' ), 'error' );
                 wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
-                exit();
-            }
-
-            $viva_ref = sanitize_text_field( wp_unslash( $_GET['s'] ) );
-            $cancelled = isset( $_GET['cancel'] ) && 1 == $_GET['cancel'];
+                exit();
+            }
+
+            $viva_ref  = sanitize_text_field( wp_unslash( $_GET['s'] ) );
+            $cancelled = isset( $_GET['cancel'] ) && 1 == $_GET['cancel'];
             global $wpdb;
 
-            $wc_order_id = $wpdb->get_var( $wpdb->prepare(
-                "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add DESC LIMIT 1",
-                $viva_ref
-            )
-            );
-
-            if (  empty( $wc_order_id ) ) {
-
-                wc_add_notice( __( 'There was a problem processing your payment. Please try again', 'viva-com-smart-for-woocommerce' ), 'error' );
-                wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
-                exit();
-
-            }
-
-            $order = wc_get_order( $wc_order_id );
-
-            if ( $cancelled ) {
-                $viva_settings         = get_option( 'woocommerce_vivacom_smart_settings' );
-                $environment           = 'yes' === $viva_settings['test_mode'] ? 'demo' : 'live';
-                $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
-                $order_response = WC_Vivacom_Smart_Helpers::get_order( $bearer_authentication, [ 'orderCode' => $viva_ref ] );
-                $stateId = $order_response->stateId;
-            }
-
-            if ( isset( $stateId ) && 2 == $stateId ) {
-                $order->update_status( 'cancelled', __( 'Unpaid order cancelled - customer cancelled in smart checkout.', 'viva-com-smart-for-woocommerce' ) );
-                wc_add_notice( __( 'The Order was cancelled', 'viva-com-smart-for-woocommerce' ), 'error' );
-                wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
-                exit();
-            }
-
-            wc_add_notice( __( 'There was a problem processing your payment. Please try again', 'viva-com-smart-for-woocommerce' ), 'error' );
-            wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
-            exit();
-        }
-
+            $wc_order_id = $wpdb->get_var(
+                $wpdb->prepare(
+                    "SELECT woocommerce_order_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE vivacom_order_code = %s ORDER BY date_add DESC LIMIT 1",
+                    $viva_ref
+                )
+            );
+
+            if ( empty( $wc_order_id ) ) {
+
+                wc_add_notice( __( 'There was a problem processing your payment. Please try again', 'viva-com-smart-for-woocommerce' ), 'error' );
+                wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
+                exit();
+
+            }
+
+            $order = wc_get_order( $wc_order_id );
+
+            if ( $cancelled ) {
+                $viva_settings         = get_option( 'woocommerce_vivacom_smart_settings' );
+                $environment           = 'yes' === $viva_settings['test_mode'] ? 'demo' : 'live';
+                $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
+                $order_response        = WC_Vivacom_Smart_Helpers::get_order( $bearer_authentication, array( 'orderCode' => $viva_ref ) );
+                $state_id               = $order_response->stateId;
+            }
+
+            if ( isset( $state_id ) && 2 == $state_id ) {
+                $order->update_status( 'cancelled', __( 'Unpaid order cancelled - customer cancelled in smart checkout.', 'viva-com-smart-for-woocommerce' ) );
+                wc_add_notice( __( 'The Order was cancelled', 'viva-com-smart-for-woocommerce' ), 'error' );
+                wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
+                exit();
+            }
+
+            wc_add_notice( __( 'There was a problem processing your payment. Please try again', 'viva-com-smart-for-woocommerce' ), 'error' );
+            wp_safe_redirect( esc_url_raw( ( wc_get_checkout_url() ) ) );
+            exit();
+        }
     }
 

viva-com-smart-for-woocommerce/trunk/includes/class-wc-vivacom-smart-helpers.php

@@ -89 +89 @@
      *
      * @param int    $order_id order_id.
-     * @param array $transaction transaction.
+     * @param array  $transaction transaction.
      * @param string $note note.
      * @param bool   $has_cart has_cart.
@@ -102 +102 @@
         }
 
-        global $wpdb;
+        global $wpdb;
 
         $order = wc_get_order( $order_id );
@@ -108 +108 @@
         $order->payment_complete( $transaction['id'] );
 
-        $vivacom_order = self::get_smart_checkout_order( $order_id );
-
-        $transaction_type = in_array( $transaction['typeId'], [ 1, 80 ] ) ? 'preauthorization' : 'payment';
-
-        $transaction_data = array(
-            'order_id' => $vivacom_order['id'],
-            'transaction_id' => $transaction['id'],
-            'transaction_type_id' => self::get_transaction_type( $transaction_type ),
-            'amount' => $order->get_total()
-        );
-
-        $status = __( 'Order has been paid with Viva.com Smart Checkout, Transaction Id:', 'viva-com-smart-for-woocommerce' );
-        $status .= $transaction['id'];
-        $status .= '<br>' . $note;
-
-        $wpdb->insert(
-            $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
-            $transaction_data
-        );
+        $vivacom_order = self::get_smart_checkout_order( $order_id );
+
+        $transaction_type = in_array( $transaction['typeId'], array( 1, 80 ) ) ? 'preauthorization' : 'payment';
+
+        $transaction_data = array(
+            'order_id'            => $vivacom_order['id'],
+            'transaction_id'      => $transaction['id'],
+            'transaction_type_id' => self::get_transaction_type( $transaction_type ),
+            'amount'              => $order->get_total(),
+        );
+
+        $status  = __( 'Order has been paid with Viva.com Smart Checkout, Transaction Id:', 'viva-com-smart-for-woocommerce' );
+        $status .= $transaction['id'];
+        $status .= '<br>' . $note;
+
+        $wpdb->insert(
+            $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
+            $transaction_data
+        );
 
         $order->set_transaction_id( $transaction['id'] );
@@ -134 +134 @@
         $viva_settings = get_option( 'woocommerce_vivacom_smart_settings' );
 
-        $default_order_status = ! empty( $viva_settings['order_status'] ) ? $viva_settings['order_status'] : 'completed';
-
-        $order_status = 'preauthorization' === $transaction_type ? 'on-hold' : $default_order_status;
+        $default_order_status = ! empty( $viva_settings['order_status'] ) ? $viva_settings['order_status'] : 'completed';
+
+        $order_status = 'preauthorization' === $transaction_type ? 'on-hold' : $default_order_status;
 
         $order->update_status( $order_status );
@@ -143 +143 @@
     }
 
-    /**
-     * Get order from viva orders table
-     *
-     * @param string $order_id order_id.
-     *
-     * @return array|null
-     */
-    public static function get_smart_checkout_order( string $order_id ) {
-        global $wpdb;
-
-        return $wpdb->get_row(
-            $wpdb->prepare(
-                "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE woocommerce_order_id = %s ORDER BY date_add DESC LIMIT 1",
-                $order_id
-            ), ARRAY_A
-        );
-    }
-
-    /**
-     * Get transaction
-     *
-     * @param string $order_id order_id.
-     * @param string $type_id type_id.
-     *
-     * @return string|null
-     */
-    public static function get_smart_checkout_transaction(string $order_id, string $type_id) {
-        global $wpdb;
-
-        return $wpdb->get_row(
-          $wpdb->prepare(
-              "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transactions WHERE order_id = %s AND transaction_type_id = %s ORDER BY date_add DESC LIMIT 1",
-              $order_id,
-              $type_id
-          ), ARRAY_A
-        );
-    }
-
-    /**
-     * Get transaction type from db
-     *
-     * @param string $name name.
-     *
-     * @return string|null $transaction_type_id transaction_type_id
-     */
-    public static function get_transaction_type( string $name) {
-        global $wpdb;
-
-        return $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transaction_types WHERE name = %s",
-                $name
-            )
-        );
-    }
+    /**
+     * Get order from viva orders table
+     *
+     * @param string $order_id order_id.
+     *
+     * @return array|null
+     */
+    public static function get_smart_checkout_order( string $order_id ) {
+        global $wpdb;
+
+        return $wpdb->get_row(
+            $wpdb->prepare(
+                "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_orders WHERE woocommerce_order_id = %s ORDER BY date_add DESC LIMIT 1",
+                $order_id
+            ),
+            ARRAY_A
+        );
+    }
+
+    /**
+     * Get transaction
+     *
+     * @param string $order_id order_id.
+     * @param string $type_id type_id.
+     *
+     * @return string|null
+     */
+    public static function get_smart_checkout_transaction( string $order_id, string $type_id ) {
+        global $wpdb;
+
+        return $wpdb->get_row(
+            $wpdb->prepare(
+                "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transactions WHERE order_id = %s AND transaction_type_id = %s ORDER BY date_add DESC LIMIT 1",
+                $order_id,
+                $type_id
+            ),
+            ARRAY_A
+        );
+    }
+
+    /**
+     * Get transaction type from db
+     *
+     * @param string $name name.
+     *
+     * @return string|null $transaction_type_id transaction_type_id
+     */
+    public static function get_transaction_type( string $name ) {
+        global $wpdb;
+
+        return $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transaction_types WHERE name = %s",
+                $name
+            )
+        );
+    }
 
     /**
@@ -212 +214 @@
     public static function process_refund( $authentication, $source, $order_id, $amount ) {
 
-        global $wpdb;
+        global $wpdb;
         $order       = wc_get_order( $order_id );
         $order_total = $order->get_total();
@@ -227 +229 @@
             }
 
-            $vivacom_order = self::get_smart_checkout_order( $order_id );
-
-            if ( empty( $vivacom_order ) ) {
-                throw new Exception( __( 'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            // Get capture transaction if present or payment
-            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'capture' ) ) ?? self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'payment' ) );
+            $vivacom_order = self::get_smart_checkout_order( $order_id );
+
+            if ( empty( $vivacom_order ) ) {
+                throw new Exception( __( 'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            // Get capture transaction if present or payment.
+            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'capture' ) ) ?? self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'payment' ) );
 
             if ( empty( $vivacom_transaction ) ) {
@@ -250 +252 @@
 
                 $transaction_data = array(
-                    'order_id' => $vivacom_order['id'],
-                    'transaction_id' => $transaction_id,
-                    'transaction_type_id' => self::get_transaction_type('refund'),
-                    'amount'          => $refund_amount
+                    'order_id'            => $vivacom_order['id'],
+                    'transaction_id'      => $transaction_id,
+                    'transaction_type_id' => self::get_transaction_type( 'refund' ),
+                    'amount'              => $refund_amount,
                 );
 
-                $wpdb->insert(
-                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
-                    $transaction_data
-                );
+                $wpdb->insert(
+                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
+                    $transaction_data
+                );
 
                 $note = ( $full_refund ) ? __( 'Full refund was executed with ID: ', 'viva-com-smart-for-woocommerce' ) . $transaction_id : __( 'Partial refund was executed with ID: ', 'viva-com-smart-for-woocommerce' ) . $transaction_id;
@@ -265 +267 @@
                 $order->add_order_note( $note, false );
                 $order->save();
-            } else {
-                if ( $transaction_response->hasError() ) {
+            } elseif ( $transaction_response->hasError() ) {
                     throw new Exception( __( 'Transaction Response Error: ', 'viva-com-smart-for-woocommerce' ) . $transaction_response->getError()->getMessage() );
-                }
             }
 
@@ -277 +277 @@
     }
 
-    /**
-     * Process Capture
-     */
-    public static function process_capture( $authentication, $order, $amount ) {
-
-        global $wpdb;
-        $transaction_id = null;
-        $order_id = $order->get_id();
-        $order_status = $order->get_status();
-
-        try {
-
-            if ( 'on-hold' !== $order_status ) {
-                throw new Exception( __( 'Wrong order status for capturing.', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            if ( self::TECHNICAL_NAME !== $order->get_payment_method() ) {
-                throw new Exception( __( 'Wrong payment method of order.', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $vivacom_order = WC_Vivacom_Smart_Helpers::get_smart_checkout_order( $order_id );
-
-            if ( empty( $vivacom_order ) ) {
-                throw new Exception( __(  'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type('preauthorization') );
-
-            if ( empty( $vivacom_transaction ) ) {
-                throw new Exception( __( 'The transaction ID for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            if ( ! ( self::get_transaction_type('preauthorization') === $vivacom_transaction['transaction_type_id'] ) ) {
-                throw new Exception( __( 'Wrong transaction type!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $transaction_client   = new TransactionClient( $authentication );
-            $transaction_response = $transaction_client->captureAuthorizedTransaction( $vivacom_transaction['transaction_id'], $amount );
-
-            WC_Vivacom_Smart_Logger::log( 'Api Capture response: ' . wp_json_encode( $transaction_response->all() ) );
-
-            if ( $transaction_response->isSuccessful() && ! empty( $transaction_response->getBody() ) && ! empty( $transaction_response->getBody()->transactionId ) ) {
-                $transaction_id = $transaction_response->getBody()->transactionId;
-
-                $transaction_data = array(
-                    'order_id' => $vivacom_order['id'],
-                    'transaction_id' => $transaction_id,
-                    'transaction_type_id' => self::get_transaction_type('capture'),
-                    'amount'          => $amount
-                );
-
-                $wpdb->insert(
-                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
-                    $transaction_data
-                );
-
-            } else {
-                if ( $transaction_response->hasError() ) {
-                    throw new Exception( __( 'Transaction Response Error: ', 'viva-com-smart-for-woocommerce' ) . $transaction_response->getError()->getMessage() );
-                }
-            }
-
-        } catch ( Exception $e ) {
-            return new WP_Error( 'error', $e->getMessage() );
-        }
-
-        return [
-            'transaction_id' => $transaction_id ?? 'n/a'
-        ];
-    }
-
-    /**
-     * Process Void
-     */
-    public static function process_void( $authentication, $source, $order, $amount ) {
-        global $wpdb;
-        $transaction_id = null;
-        $order_id = $order->get_id();
-        $order_status = $order->get_status();
-
-        try {
-            if ( 'on-hold' !== $order_status ) {
-                throw new Exception( __( 'Wrong order status for capturing.', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            if ( self::TECHNICAL_NAME !== $order->get_payment_method() ) {
-                throw new Exception( __( 'Wrong payment method of order.', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $vivacom_order = WC_Vivacom_Smart_Helpers::get_smart_checkout_order( $order_id );
-
-            if ( empty( $vivacom_order ) ) {
-                throw new Exception( __(  'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type('preauthorization') );
-
-            if ( empty( $vivacom_transaction ) ) {
-                throw new Exception( __( 'The transaction ID for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            if ( ! ( self::get_transaction_type('preauthorization') === $vivacom_transaction['transaction_type_id'] ) ) {
-                throw new Exception( __( 'Wrong transaction type!', 'viva-com-smart-for-woocommerce' ) );
-            }
-
-            $transaction_client   = new TransactionClient( $authentication );
-            $transaction_response = $transaction_client->voidAuthorizedTransaction( $vivacom_transaction['transaction_id'], $amount, $source );
-
-            WC_Vivacom_Smart_Logger::log( 'Api Void response: ' . wp_json_encode( $transaction_response->all() ) );
-
-            if ( $transaction_response->isSuccessful() && ! empty( $transaction_response->getBody() ) && ! empty( $transaction_response->getBody()->transactionId ) ) {
-                $transaction_id = $transaction_response->getBody()->transactionId;
-
-                $transaction_data = array(
-                    'order_id' => $vivacom_order['id'],
-                    'transaction_id' => $transaction_id,
-                    'transaction_type_id' => self::get_transaction_type('void'),
-                    'amount'          => $amount
-                );
-
-                $wpdb->insert(
-                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
-                    $transaction_data
-                );
-
-            } else {
-                if ( $transaction_response->hasError() ) {
-                    throw new Exception( __( 'Transaction Response Error: ', 'viva-com-smart-for-woocommerce' ) . $transaction_response->getError()->getMessage() );
-                }
-            }
-
-        } catch ( Exception $e ) {
-            return new WP_Error( 'error', $e->getMessage() );
-        }
-
-        return [
-            'transaction_id' => $transaction_id ?? 'n/a'
-        ];
-    }
+    /**
+     * Process Capture
+     *
+     * @param Authentication  $authentication authentication.
+     * @param object|WC_Order $order order.
+     * @param string          $amount amount.
+     *
+     * @return array|WP_Error
+     * @throws Exception Throws exception.
+     */
+    public static function process_capture( $authentication, $order, $amount ) {
+
+        global $wpdb;
+        $transaction_id = null;
+        $order_id       = $order->get_id();
+        $order_status   = $order->get_status();
+
+        try {
+
+            if ( 'on-hold' !== $order_status ) {
+                throw new Exception( __( 'Wrong order status for capturing.', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            if ( self::TECHNICAL_NAME !== $order->get_payment_method() ) {
+                throw new Exception( __( 'Wrong payment method of order.', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $vivacom_order = self::get_smart_checkout_order( $order_id );
+
+            if ( empty( $vivacom_order ) ) {
+                throw new Exception( __( 'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'preauthorization' ) );
+
+            if ( empty( $vivacom_transaction ) ) {
+                throw new Exception( __( 'The transaction ID for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            if ( ! ( self::get_transaction_type( 'preauthorization' ) === $vivacom_transaction['transaction_type_id'] ) ) {
+                throw new Exception( __( 'Wrong transaction type!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $transaction_client   = new TransactionClient( $authentication );
+            $transaction_response = $transaction_client->captureAuthorizedTransaction( $vivacom_transaction['transaction_id'], $amount );
+
+            WC_Vivacom_Smart_Logger::log( 'Api Capture response: ' . wp_json_encode( $transaction_response->all() ) );
+
+            if ( $transaction_response->isSuccessful() && ! empty( $transaction_response->getBody() ) && ! empty( $transaction_response->getBody()->transactionId ) ) {
+                $transaction_id = $transaction_response->getBody()->transactionId;
+
+                $transaction_data = array(
+                    'order_id'            => $vivacom_order['id'],
+                    'transaction_id'      => $transaction_id,
+                    'transaction_type_id' => self::get_transaction_type( 'capture' ),
+                    'amount'              => $amount,
+                );
+
+                $wpdb->insert(
+                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
+                    $transaction_data
+                );
+
+            } elseif ( $transaction_response->hasError() ) {
+                    throw new Exception( __( 'Transaction Response Error: ', 'viva-com-smart-for-woocommerce' ) . $transaction_response->getError()->getMessage() );
+            }
+        } catch ( Exception $e ) {
+            return new WP_Error( 'error', $e->getMessage() );
+        }
+
+        return array(
+            'transaction_id' => $transaction_id ?? 'n/a',
+        );
+    }
+
+    /**
+     * Process Void
+     *
+     * @param Authentication  $authentication authentication.
+     * @param string          $source source.
+     * @param object|WC_Order $order order.
+     * @param string          $amount amount.
+     *
+     * @return array|WP_Error
+     * @throws Exception Throws exception.
+     */
+    public static function process_void( $authentication, $source, $order, $amount ) {
+        global $wpdb;
+        $transaction_id = null;
+        $order_id       = $order->get_id();
+        $order_status   = $order->get_status();
+
+        try {
+            if ( 'on-hold' !== $order_status ) {
+                throw new Exception( __( 'Wrong order status for capturing.', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            if ( self::TECHNICAL_NAME !== $order->get_payment_method() ) {
+                throw new Exception( __( 'Wrong payment method of order.', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $vivacom_order = self::get_smart_checkout_order( $order_id );
+
+            if ( empty( $vivacom_order ) ) {
+                throw new Exception( __( 'The viva order code for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $vivacom_transaction = self::get_smart_checkout_transaction( $vivacom_order['id'], self::get_transaction_type( 'preauthorization' ) );
+
+            if ( empty( $vivacom_transaction ) ) {
+                throw new Exception( __( 'The transaction ID for this order could not be found. Something is wrong!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            if ( ! ( self::get_transaction_type( 'preauthorization' ) === $vivacom_transaction['transaction_type_id'] ) ) {
+                throw new Exception( __( 'Wrong transaction type!', 'viva-com-smart-for-woocommerce' ) );
+            }
+
+            $transaction_client   = new TransactionClient( $authentication );
+            $transaction_response = $transaction_client->voidAuthorizedTransaction( $vivacom_transaction['transaction_id'], $amount, $source );
+
+            WC_Vivacom_Smart_Logger::log( 'Api Void response: ' . wp_json_encode( $transaction_response->all() ) );
+
+            if ( $transaction_response->isSuccessful() && ! empty( $transaction_response->getBody() ) && ! empty( $transaction_response->getBody()->transactionId ) ) {
+                $transaction_id = $transaction_response->getBody()->transactionId;
+
+                $transaction_data = array(
+                    'order_id'            => $vivacom_order['id'],
+                    'transaction_id'      => $transaction_id,
+                    'transaction_type_id' => self::get_transaction_type( 'void' ),
+                    'amount'              => $amount,
+                );
+
+                $wpdb->insert(
+                    $wpdb->prefix . 'viva_com_smart_wc_checkout_transactions',
+                    $transaction_data
+                );
+
+            } elseif ( $transaction_response->hasError() ) {
+                    throw new Exception( __( 'Transaction Response Error: ', 'viva-com-smart-for-woocommerce' ) . $transaction_response->getError()->getMessage() );
+            }
+        } catch ( Exception $e ) {
+            return new WP_Error( 'error', $e->getMessage() );
+        }
+
+        return array(
+            'transaction_id' => $transaction_id ?? 'n/a',
+        );
+    }
 
     /**
@@ -422 +431 @@
      * @param string          $transaction_id transaction_id.
      * @param object|WC_Order $order order.
-     * @param array           $tokenData tokenData.
+     * @param array           $token_data token_data.
      *
      * @return int
      */
-    public static function save_payment_token( $transaction_id, $order, $tokenData ) {
-        // Check token provided or create.
-        global $wpdb;
-        $users_tokens = WC_Payment_Tokens::get_customer_tokens( $order->get_customer_id(), self::TECHNICAL_NAME );
-
-        foreach ( $users_tokens as $key => $value ) {
-            $token_object = WC_Payment_Tokens::get( $key );
-            if ( $token_object->get_token() === $transaction_id ) {
-                $token = $token_object;
-                break;
-            }
-        }
-
-        if ( empty( $token ) ) {
-            $token = new WC_Payment_Token_CC();
-        }
-
-        $token->set_token( $transaction_id );
-        $token->set_gateway_id( self::TECHNICAL_NAME );
-        $token->set_user_id( $order->get_customer_id() );
-        $token->set_card_type( $tokenData['cardType'] );
-        $token->set_last4( $tokenData['lastFourDigits'] );
-        $token->set_expiry_month( $tokenData['expiryMonth'] );
-        $token->set_expiry_year( $tokenData['expiryYear'] );
-        $token->save();
-
-        if ( ! empty( $order ) ) {
-            if ( self::check_subscription( $order->get_id() ) ) {
-                if ( function_exists( 'wcs_get_subscriptions_for_order' ) && class_exists( 'WC_Subscriptions_Change_Payment_Gateway' ) ) {
-                    $subscriptions = wcs_get_subscriptions_for_order( $order );
-                    foreach ( $subscriptions as $subscription ) {
-                        // check if subscription already has a saved token related.
-                        $token_id = $wpdb->get_var( $wpdb->prepare(
-                            "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
-                            $subscription->get_id()
-                        )
-                        );
-
-                        $transaction_object_id = $wpdb->get_var( $wpdb->prepare(
-                            "SELECT id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transactions WHERE transaction_id = %s ORDER BY date_add LIMIT 1",
-                            $transaction_id
-                        )
-                        );
-
-                        $wpdb->insert($wpdb->prefix."viva_com_smart_wc_checkout_recurring",
-                            array(
-                                "token_id" => $token->get_id(),
-                                "transaction_id" => $transaction_object_id,
-                                "recurring_id" => $subscription->get_id()
-                            )
-                        );
-
-
-                        if ( ! empty( $token_id ) ) {
-                            WC_Subscriptions_Change_Payment_Gateway::update_payment_method( $subscription, self::TECHNICAL_NAME, $token->get_meta_data() );
-                        }
-                    }
-                }
-            }
-        }
-
-        return $token->get_id();
-    }
+    public static function save_payment_token( $transaction_id, $order, $token_data ) {
+        // Check token provided or create.
+        global $wpdb;
+        $users_tokens = WC_Payment_Tokens::get_customer_tokens( $order->get_customer_id(), self::TECHNICAL_NAME );
+
+        foreach ( $users_tokens as $key => $value ) {
+            $token_object = WC_Payment_Tokens::get( $key );
+            if ( $token_object->get_token() === $transaction_id ) {
+                $token = $token_object;
+                break;
+            }
+        }
+
+        if ( empty( $token ) ) {
+            $token = new WC_Payment_Token_CC();
+        }
+
+        $token->set_token( $transaction_id );
+        $token->set_gateway_id( self::TECHNICAL_NAME );
+        $token->set_user_id( $order->get_customer_id() );
+        $token->set_card_type( $token_data['cardType'] );
+        $token->set_last4( $token_data['lastFourDigits'] );
+        $token->set_expiry_month( $token_data['expiryMonth'] );
+        $token->set_expiry_year( $token_data['expiryYear'] );
+        $token->save();
+
+        if ( ! empty( $order ) ) {
+            if ( self::check_subscription( $order->get_id() ) ) {
+                if ( function_exists( 'wcs_get_subscriptions_for_order' ) && class_exists( 'WC_Subscriptions_Change_Payment_Gateway' ) ) {
+                    $subscriptions = wcs_get_subscriptions_for_order( $order );
+                    foreach ( $subscriptions as $subscription ) {
+                        // check if subscription already has a saved token related.
+                        $token_id = $wpdb->get_var(
+                            $wpdb->prepare(
+                                "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
+                                $subscription->get_id()
+                            )
+                        );
+
+                        $transaction_object_id = $wpdb->get_var(
+                            $wpdb->prepare(
+                                "SELECT id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_transactions WHERE transaction_id = %s ORDER BY date_add LIMIT 1",
+                                $transaction_id
+                            )
+                        );
+
+                        $wpdb->insert(
+                            $wpdb->prefix . 'viva_com_smart_wc_checkout_recurring',
+                            array(
+                                'token_id'       => $token->get_id(),
+                                'transaction_id' => $transaction_object_id,
+                                'recurring_id'   => $subscription->get_id(),
+                            )
+                        );
+
+                        if ( ! empty( $token_id ) ) {
+                            WC_Subscriptions_Change_Payment_Gateway::update_payment_method( $subscription, self::TECHNICAL_NAME, $token->get_meta_data() );
+                        }
+                    }
+                }
+            }
+        }
+
+        return $token->get_id();
+    }
 
     /**
@@ -509 +520 @@
 
         return ! empty( $merchant_currencies ) ? $merchant_currencies : array();
-
     }
 
@@ -608 +618 @@
     }
 
-    /**
-     * Create Source Item
-     *
-     * @param Authentication $authentication authentication.
-     * @param string $prefix
-     * @param array $options
-     *
-     * @return void
-     */
-    public static function create_source_item ( Authentication $authentication, string $prefix, array $options ) {
-        $source_client    = new SourceClient( $authentication );
-        do {
-            $already_exists_error = false;
-            $random_code = sprintf("%04d", rand( 101, 9999));
-            $options['code'] = "$prefix-" . $random_code;
-            $source_item     = new SourceItem( (object) $options );
-            $source_response = $source_client->createSource( $source_item );
-            WC_Vivacom_Smart_Logger::log( 'API CREATE SOURCE' . ( $source_response->isSuccessful() ? ' SUCCESS ' : ' FAILED ' ) . " \nARGS: " . wp_json_encode( $options ) . "\nRESULT: " . wp_json_encode( $source_response->all() ) );
-            $already_exists_error = $source_response->isSuccessful() && 409 === $source_response->getHttpCode() && $source_response->hasError() && stripos( $source_response->getBody()->message, 'already exists' );
-        } while ( true === $already_exists_error );
-
-        return $source_item;
-    }
+    /**
+     * Create Source Item
+     *
+     * @param Authentication $authentication authentication.
+     * @param string         $prefix prefix.
+     * @param array          $options options.
+     *
+     * @return SourceItem
+     */
+    public static function create_source_item( Authentication $authentication, string $prefix, array $options ) {
+        $source_client = new SourceClient( $authentication );
+        do {
+            $already_exists_error = false;
+            $random_code          = sprintf( '%04d', rand( 101, 9999 ) );
+            $options['code']      = "$prefix-" . $random_code;
+            $source_item          = new SourceItem( (object) $options );
+            $source_response      = $source_client->createSource( $source_item );
+            WC_Vivacom_Smart_Logger::log( 'API CREATE SOURCE' . ( $source_response->isSuccessful() ? ' SUCCESS ' : ' FAILED ' ) . " \nARGS: " . wp_json_encode( $options ) . "\nRESULT: " . wp_json_encode( $source_response->all() ) );
+            $already_exists_error = $source_response->isSuccessful() && 409 === $source_response->getHttpCode() && $source_response->hasError() && stripos( $source_response->getBody()->message, 'already exists' );
+        } while ( true === $already_exists_error );
+
+        return $source_item;
+    }
 
     /**
@@ -643 +653 @@
         $domain           = self::get_domain();
         $options          = array(
-            'name'       => sprintf( Application::SOURCE_NAME_FORMAT, $cms_abbreviation, $domain ),
-            'domain'     => $domain,
-            'successUrl' => self::get_redirect_url( 'success' ),
-            'failureUrl' => self::get_redirect_url( 'fail' ),
+            'name'             => sprintf( Application::SOURCE_NAME_FORMAT, $cms_abbreviation, $domain ),
+            'domain'           => $domain,
+            'successUrl'       => self::get_redirect_url( 'success' ),
+            'failureUrl'       => self::get_redirect_url( 'fail' ),
             'paramCancelOrder' => Application::PARAM_CANCEL_ORDER,
         );
 
-        $source_item = self::create_source_item( $authentication, $cms_abbreviation, $options );
+        $source_item = self::create_source_item( $authentication, $cms_abbreviation, $options );
         return ! empty( $source_item ) ? $source_item : null;
     }
@@ -735 +745 @@
 
         return $order_response ?? null;
-
-    }
-
-    /**
-     * Get Viva order
-     *
-     * @param Authentication $authentication authentication
-     * @param array $options options
-     *
-     * @return Response|null
-     */
-    public static function get_order( Authentication $authentication, $options = array() ) {
-        $order_client = new OrderClient( $authentication );
-        $order_response = $order_client->retrieveOrder( $options );
-        if ( $order_response->isSuccessful() && ! is_null( $order_response->getBody() ) ) {
-            $response = $order_response->getBody();
-        } else {
-            WC_Vivacom_Smart_Logger::log( 'Order Retrieve failed for order code : ' . $options['orderCode'] );
-        }
-
-        return $response ?? null;
-    }
+    }
+
+    /**
+     * Get Viva order
+     *
+     * @param Authentication $authentication authentication.
+     * @param array          $options options.
+     *
+     * @return Response|null
+     */
+    public static function get_order( Authentication $authentication, $options = array() ) {
+        $order_client   = new OrderClient( $authentication );
+        $order_response = $order_client->retrieveOrder( $options );
+        if ( $order_response->isSuccessful() && ! is_null( $order_response->getBody() ) ) {
+            $response = $order_response->getBody();
+        } else {
+            WC_Vivacom_Smart_Logger::log( 'Order Retrieve failed for order code : ' . $options['orderCode'] );
+        }
+
+        return $response ?? null;
+    }
 
     /**
@@ -848 +857 @@
             || ( function_exists( 'wcs_is_subscription' ) && wcs_is_subscription( $order_id ) )
             || ( function_exists( 'wcs_order_contains_renewal' ) && wcs_order_contains_renewal( $order_id ) );
-
     }
 
@@ -869 +877 @@
             'viva-com-smart-for-woocommerce'
         );
-        $settings = array(
-            'main_title'                => array(
-                'title' => __( 'Viva.com Smart Checkout settings', 'viva-com-smart-for-woocommerce' ),
-                'type'  => 'title',
-            ),
-            'enabled'                   => array(
-                'title'   => __( 'Enable Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
-                'type'    => 'checkbox',
-                'label'   => __( 'Enable Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
-                'default' => 'no',
-            ),
-            'sep'                       => array(
-                'title'       => '',
-                'type'        => 'title',
-                'description' => '<hr>',
-            ),
-            'credentials'               => array(
-                'title'       => __( 'Set Viva.com API credentials', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'title',
-                'description' => $credentials_desc,
-            ),
-            'test_mode'                 => array(
-                'title'       => __( 'Demo mode', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'checkbox',
-                'label'       => __( 'Enable demo mode', 'viva-com-smart-for-woocommerce' ),
-                'description' => $test_mode_desc,
-                'default'     => 'yes',
-            ),
-            'title_live'                => array(
-                'title' => __( 'Live mode credentials', 'viva-com-smart-for-woocommerce' ),
-                'type'  => 'title',
-            ),
-            'title_demo'                => array(
-                'title' => __( 'Demo mode credentials', 'viva-com-smart-for-woocommerce' ),
-                'type'  => 'title',
-            ),
-            'client_id'                 => array(
-                'title'       => __( 'Live Client ID', 'viva-com-smart-for-woocommerce' ),
+        $settings       = array(
+            'main_title'                => array(
+                'title' => __( 'Viva.com Smart Checkout settings', 'viva-com-smart-for-woocommerce' ),
+                'type'  => 'title',
+            ),
+            'enabled'                   => array(
+                'title'   => __( 'Enable Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
+                'type'    => 'checkbox',
+                'label'   => __( 'Enable Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
+                'default' => 'no',
+            ),
+            'sep'                       => array(
+                'title'       => '',
+                'type'        => 'title',
+                'description' => '<hr>',
+            ),
+            'credentials'               => array(
+                'title'       => __( 'Set Viva.com API credentials', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'title',
+                'description' => $credentials_desc,
+            ),
+            'test_mode'                 => array(
+                'title'       => __( 'Demo mode', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'checkbox',
+                'label'       => __( 'Enable demo mode', 'viva-com-smart-for-woocommerce' ),
+                'description' => $test_mode_desc,
+                'default'     => 'yes',
+            ),
+            'title_live'                => array(
+                'title' => __( 'Live mode credentials', 'viva-com-smart-for-woocommerce' ),
+                'type'  => 'title',
+            ),
+            'title_demo'                => array(
+                'title' => __( 'Demo mode credentials', 'viva-com-smart-for-woocommerce' ),
+                'type'  => 'title',
+            ),
+            'client_id'                 => array(
+                'title'       => __( 'Live Client ID', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'Client ID provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+            ),
+            'demo_client_id'            => array(
+                'title'       => __( 'Demo Client ID', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'Client ID provided by Viva.com. ', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+            ),
+            'client_secret'             => array(
+                'title'       => __( 'Live Client Secret', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'Client Secret provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+            ),
+            'demo_client_secret'        => array(
+                'title'       => __( 'Demo Client Secret', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'Client Secret provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+            ),
+            'sep_2'                     => array(
+                'title'       => '',
+                'type'        => 'title',
+                'description' => '<hr>',
+            ),
+            'advanced_settings_title'   => array(
+                'title' => __( 'Advanced settings', 'viva-com-smart-for-woocommerce' ),
+                'type'  => 'title',
+            ),
+            'advanced_settings_enabled' => array(
+                'title'   => __( 'Show advanced settings', 'viva-com-smart-for-woocommerce' ),
+                'type'    => 'checkbox',
+                'label'   => __( 'Show advanced settings. If this checkbox is unchecked, the plugin will use default settings.', 'viva-com-smart-for-woocommerce' ),
+                'default' => 'no',
+            ),
+            'sep_3'                     => array(
+                'title'       => '',
+                'type'        => 'title',
+                'description' => '<hr>',
+            ),
+            'main_descr'                => array(
+                'title' => $main_desc,
+                'type'  => 'title',
+            ),
+            'title'                     => array(
+                'title'       => __( 'Title', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'This controls the title that the user sees during checkout.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => __( 'Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
+            ),
+            'description'               => array(
+                'title'       => __( 'Description', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'This controls the description that the user sees during checkout.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => __( 'Pay using 30+ methods (cards, digital wallets, local payment methods, online banking, and more)', 'viva-com-smart-for-woocommerce' ),
+            ),
+            'installments'              => array(
+                'title'       => __( 'Instalments', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'text',
+                'description' => __( 'WARNING: Only available to Greek Viva.com accounts. <br>Example: 90:3,180:6<br>Order total 90 euro -> allow 0 and 3 installments <br>Order total 180 euro -> allow 0, 3 and 6 installments<br>Leave empty in case you do not want to offer installments.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+            ),
+            'brand_color'              => array(
+                'title'       => __( 'Brand color', 'viva-com-smart-for-woocommerce' ),
                 'type'        => 'text',
-                'description' => __( 'Client ID provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
+                'description' => __('Select a color or enter a HEX code.', 'viva-com-smart-for-woocommerce'),
                 'default'     => '',
             ),
-            'demo_client_id'            => array(
-                'title'       => __( 'Demo Client ID', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'Client ID provided by Viva.com. ', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-            ),
-            'client_secret'             => array(
-                'title'       => __( 'Live Client Secret', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'Client Secret provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-            ),
-            'demo_client_secret'        => array(
-                'title'       => __( 'Demo Client Secret', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'Client Secret provided by Viva.com.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-            ),
-            'sep_2'                     => array(
-                'title'       => '',
-                'type'        => 'title',
-                'description' => '<hr>',
-            ),
-            'advanced_settings_title'   => array(
-                'title' => __( 'Advanced settings', 'viva-com-smart-for-woocommerce' ),
-                'type'  => 'title',
-            ),
-            'advanced_settings_enabled' => array(
-                'title'   => __( 'Show advanced settings', 'viva-com-smart-for-woocommerce' ),
-                'type'    => 'checkbox',
-                'label'   => __( 'Show advanced settings. If this checkbox is unchecked, the plugin will use default settings.', 'viva-com-smart-for-woocommerce' ),
-                'default' => 'no',
-            ),
-            'sep_3'                     => array(
-                'title'       => '',
-                'type'        => 'title',
-                'description' => '<hr>',
-            ),
-            'main_descr'                => array(
-                'title' => $main_desc,
-                'type'  => 'title',
-            ),
-            'title'                     => array(
-                'title'       => __( 'Title', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'This controls the title that the user sees during checkout.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => __( 'Viva.com Smart Checkout', 'viva-com-smart-for-woocommerce' ),
-            ),
-            'description'               => array(
-                'title'       => __( 'Description', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'This controls the description that the user sees during checkout.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => __( 'Pay using 30+ methods (cards, digital wallets, local payment methods, online banking, and more)', 'viva-com-smart-for-woocommerce' ),
-            ),
-            'installments'              => array(
-                'title'       => __( 'Instalments', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'text',
-                'description' => __( 'WARNING: Only available to Greek Viva.com accounts. <br>Example: 90:3,180:6<br>Order total 90 euro -> allow 0 and 3 installments <br>Order total 180 euro -> allow 0, 3 and 6 installments<br>Leave empty in case you do not want to offer installments.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-            ),
-
-            'source_code'               => array(
-                'title'       => __( 'Live Source Code List', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'select',
-                'description' => __( 'Provides a list with all source codes that are set in your Viva.com banking app.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-                'options'     => array(),
-            ),
-            'demo_source_code'          => array(
-                'title'       => __( 'Demo Source Code List', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'select',
-                'description' => __( 'Provides a list with all source codes that are set in your Viva.com banking app.', 'viva-com-smart-for-woocommerce' ),
-                'default'     => '',
-                'options'     => array(),
-            ),
-            'logo_enabled'              => array(
-                'title'   => __( 'Show logo on checkout page', 'viva-com-smart-for-woocommerce' ),
-                'type'    => 'checkbox',
-                'label'   => __( 'Enable Viva.com logo on checkout page (default = yes).', 'viva-com-smart-for-woocommerce' ),
-                'default' => 'yes',
-            ),
-            'order_status'              => array(
-                'title'       => __( 'Order status after successful payment.', 'viva-com-smart-for-woocommerce' ),
-                'description' => __( 'Your WooCommerce will be updated to this status after successful payment on Viva.com (default = completed).', 'viva-com-smart-for-woocommerce' ),
-                'default'     => 'completed',
-                'type'        => 'select',
-                'options'     => array(
-                    'completed'  => __( 'Completed', 'viva-com-smart-for-woocommerce' ),
-                    'processing' => __( 'Processing', 'viva-com-smart-for-woocommerce' ),
-                ),
-            ),
-        );
-
-        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '6.5.0', '>' ) ) {
-            $settings['enable_preauthorizations'] = array(
-                'title'       => __( 'Preauthorized Payments', 'viva-com-smart-for-woocommerce' ),
-                'type'        => 'checkbox',
-                'label'       => __( 'Enable Preauthorized Payments', 'viva-com-smart-for-woocommerce' ),
-                'description' => 'By enabling this you will create order in preauthorized status',
-                'default'     => 'no',
-            );
-        }
+            'source_code'               => array(
+                'title'       => __( 'Live Source Code List', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'select',
+                'description' => __( 'Provides a list with all source codes that are set in your Viva.com banking app.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+                'options'     => array(),
+            ),
+            'demo_source_code'          => array(
+                'title'       => __( 'Demo Source Code List', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'select',
+                'description' => __( 'Provides a list with all source codes that are set in your Viva.com banking app.', 'viva-com-smart-for-woocommerce' ),
+                'default'     => '',
+                'options'     => array(),
+            ),
+            'logo_enabled'              => array(
+                'title'   => __( 'Show logo on checkout page', 'viva-com-smart-for-woocommerce' ),
+                'type'    => 'checkbox',
+                'label'   => __( 'Enable Viva.com logo on checkout page (default = yes).', 'viva-com-smart-for-woocommerce' ),
+                'default' => 'yes',
+            ),
+            'order_status'              => array(
+                'title'       => __( 'Order status after successful payment.', 'viva-com-smart-for-woocommerce' ),
+                'description' => __( 'Your WooCommerce will be updated to this status after successful payment on Viva.com (default = completed).', 'viva-com-smart-for-woocommerce' ),
+                'default'     => 'completed',
+                'type'        => 'select',
+                'options'     => array(
+                    'completed'  => __( 'Completed', 'viva-com-smart-for-woocommerce' ),
+                    'processing' => __( 'Processing', 'viva-com-smart-for-woocommerce' ),
+                ),
+            ),
+        );
+
+        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '6.5.0', '>' ) ) {
+            $settings['enable_preauthorizations'] = array(
+                'title'       => __( 'Preauthorized Payments', 'viva-com-smart-for-woocommerce' ),
+                'type'        => 'checkbox',
+                'label'       => __( 'Enable Preauthorized Payments', 'viva-com-smart-for-woocommerce' ),
+                'description' => 'By enabling this you will create order in preauthorized status',
+                'default'     => 'no',
+            );
+        }
 
         /**
@@ -1074 +1087 @@
 
         $split_instal_vivacom = explode( ',', $installments_pattern );
-        $c                       = count( $split_instal_vivacom );
+        $c                    = count( $split_instal_vivacom );
         $instal_vivacom_max   = array();
-        for ( $i = 0; $i < $c; $i ++ ) {
+        for ( $i = 0; $i < $c; $i++ ) {
             list( $instal_amount, $instal_term ) = explode( ':', $split_instal_vivacom[ $i ] );
             $instal_amount                       = (int) number_format( $instal_amount, 2, '', '' );

viva-com-smart-for-woocommerce/trunk/includes/class-wc-vivacom-smart-subscriptions.php

@@ -45 +45 @@
     public function viva_payments_subscription_payment_method_to_display( $title ) {
 
-        global $wpdb;
+        global $wpdb;
         if ( ! isset( $_SERVER['REQUEST_URI'] ) ) {
             return $title;
@@ -74 +74 @@
         }
 
-        $token_id = $wpdb->get_var( $wpdb->prepare(
-            "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
-            $subscription->get_id()
-        )
-        );
+        $token_id = $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
+                $subscription->get_id()
+            )
+        );
 
         $token = WC_Payment_Tokens::get( $token_id );
@@ -86 +87 @@
 
         return $title . ' - ' . $token->get_display_name();
-
     }
 
@@ -98 +98 @@
      */
     public function add_subscription_payment_meta( $payment_meta, $subscription ) {
-        global $wpdb;
-
-        $token_data = $wpdb->get_row( $wpdb->prepare(
-            "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
-            $subscription->get_id()
-        ), ARRAY_A
-        );
-
-        $token = $wpdb->get_row( $wpdb->prepare(
-            "SELECT token FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE token_id = %s LIMIT 1",
-            $token_data['token_id']        ), ARRAY_A
-        );
-
-        $token_id = $token_data['token_id'];
+        global $wpdb;
+
+        $token_data = $wpdb->get_row(
+            $wpdb->prepare(
+                "SELECT * FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
+                $subscription->get_id()
+            ),
+            ARRAY_A
+        );
+
+        $token = $wpdb->get_row(
+            $wpdb->prepare(
+                "SELECT token FROM {$wpdb->prefix}woocommerce_payment_tokens WHERE token_id = %s LIMIT 1",
+                $token_data['token_id']
+            ),
+            ARRAY_A
+        );
+
+        $token_id = $token_data['token_id'];
 
         // disabled option to not allow admin to change the tokens from subscription edit admin page.
@@ -122 +127 @@
                     'disabled' => true,
                 ),
-                WC_Vivacom_Smart_Helpers::TOKEN => array(
+                WC_Vivacom_Smart_Helpers::TOKEN    => array(
                     'value'    => $token['token'],
                     'label'    => __( 'Viva.com Smart Card Token', 'viva-com-smart-for-woocommerce' ),
@@ -130 +135 @@
         );
         return $payment_meta;
-
     }
 
@@ -159 +163 @@
                 || $token_object->get_token() !== $payment_meta['post_meta'][ WC_Vivacom_Smart_Helpers::TOKEN ]['value']
                 ) {
-                    throw new Exception( __( 'You are not allowed to change the Card Token.', 'viva-com-smart-for-woocommerce' ) );
+                    throw new Exception( esc_html__( 'You are not allowed to change the Card Token.', 'viva-com-smart-for-woocommerce' ) );
                 }
             }
@@ -199 +203 @@
      */
     public function process_subscription_payment( $order_id, $amount ) {
-        global $wpdb;
+        global $wpdb;
 
         $order = wc_get_order( $order_id );
@@ -211 +215 @@
             foreach ( $related_subscriptions as $subscription ) {
                 $subscription  = wcs_get_subscription( $subscription );
-                $token_id = $wpdb->get_var( $wpdb->prepare(
-                    "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
-                    $subscription->get_id()
-                )
-                );
+                $token_id      = $wpdb->get_var(
+                    $wpdb->prepare(
+                        "SELECT token_id FROM {$wpdb->prefix}viva_com_smart_wc_checkout_recurring WHERE recurring_id = %s ORDER BY date_add LIMIT 1",
+                        $subscription->get_id()
+                    )
+                );
                 $payment_token = WC_Payment_Tokens::get( $token_id );
             }
@@ -255 +260 @@
 
                 if ( $transaction_response->isSuccessful() && ! empty( $transaction_response->getBody() ) ) {
-                    $transaction = array (
-                        'id'     => $transaction_response->getBody()->transactionId,
-                        'typeId' => 5 // id for chrgetoken
-                    );
-                    $note = __( 'Payment method used for automatic renewal: ', 'viva-com-smart-for-woocommerce' );
-                    $note .= $payment_token->get_display_name();
+                    $transaction = array(
+                        'id'     => $transaction_response->getBody()->transactionId,
+                        'typeId' => 5, // id for chrgetoken.
+                    );
+                    $note        = __( 'Payment method used for automatic renewal: ', 'viva-com-smart-for-woocommerce' );
+                    $note       .= $payment_token->get_display_name();
 
                     WC_Vivacom_Smart_Helpers::complete_order( $order_id, $transaction, $note, false );

viva-com-smart-for-woocommerce/trunk/includes/class-wc-vivacom-smart.php

@@ -113 +113 @@
              * @since 1.0.0
              */
-            $this->icon = apply_filters( 'viva_com_smart_wc_icon', '' . $plugin_dir . 'assets/vivacom.png' );
+            $this->icon = apply_filters( 'viva_com_smart_wc_icon', '' . $plugin_dir . 'assets/vivacom.png' );
         }
 
@@ -169 +169 @@
         $this->order_status       = $this->get_option( 'order_status' );
 
-        set_transient( 'viva_com_smart_wc_admin_notice', true, 0 );
+        set_transient( 'viva_com_smart_wc_admin_notice', true, 0 );
 
         add_action( 'woocommerce_receipt_vivacom_smart', array( $this, 'receipt_page' ) );
@@ -186 +186 @@
         add_action( 'woocommerce_settings_start', array( $this, 'admin_settings_start' ) );
 
-        //Add custom Order actions
-        add_filter('woocommerce_order_actions', array( $this, 'woocommerce_vivacom_smart_custom_actions' ) );
-        add_action('woocommerce_order_action_wc_viva_smart_capture', array( $this, 'woocommerce_vivacom_smart_capture' ) );
-        add_action('woocommerce_order_action_wc_viva_smart_void', array( $this, 'woocommerce_vivacom_smart_void' ) );
-
-    }
-
-    /**
-     * Custom Order Actions
-     */
-    public function woocommerce_vivacom_smart_custom_actions( $actions ) {
-        $actions['wc_viva_smart_capture'] = __( 'Capture Viva.com Payment', 'viva-com-smart-for-woocommerce' );
-        $actions['wc_viva_smart_void'] = __( 'Void Viva.com Payment', 'viva-com-smart-for-woocommerce' );
-
-        return $actions;
-    }
-
-    /**
-     * Capture Payment
-     */
-    public function woocommerce_vivacom_smart_capture( $order ) {
-        $environment           = 'yes' === $this->test_mode ? 'demo' : 'live';
-        $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
-        $amount = (int) number_format( $order->get_total(), 2, '', '' );
-
-        if ( $bearer_authentication->hasValidToken() ) {
-            $result = WC_Vivacom_Smart_Helpers::process_capture( $bearer_authentication, $order, $amount );
-            if ( is_wp_error( $result ) ) {
-                $order->add_order_note( sprintf( __( 'Capture prauthorized payment failed: %s', 'viva-com-smart-for-woocommerce' ), $result->get_error_message() ) );
-            } else {
-                $order->add_order_note( sprintf( __( 'Capture prauthorized payment successfull: Tranaction Id: %s', 'viva-com-smart-for-woocommerce' ), $result['transaction_id'] ) );
-                $order->update_status( 'completed' );
-            }
-            $order->save();
-        } else {
-            return new WP_Error( 'error', sprintf( __( 'Viva.com: Your %s credentials are NOT valid. Please check your credentials!', 'viva-com-smart-for-woocommerce' ), $environment ) );
-        }
-    }
-
-    /**
-     * Void Payment
-     */
-    public function woocommerce_vivacom_smart_void( $order ) {
-        $environment           = 'yes' === $this->test_mode ? 'demo' : 'live';
-        $source                = 'yes' === $this->test_mode ? $this->demo_source_code : $this->source_code;
-        $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
-        $amount = (int) number_format( $order->get_total(), 2, '', '' );
-
-        if ( $bearer_authentication->hasValidToken() ) {
-            $result = WC_Vivacom_Smart_Helpers::process_void( $bearer_authentication, $source, $order, $amount );
-            if ( is_wp_error( $result ) ) {
-                $order->add_order_note( sprintf( __( 'Cancel of prauthorized payment failed: %s', 'viva-com-smart-for-woocommerce' ), $result->get_error_message() ) );
-            } else {
-                $order->add_order_note( sprintf( __( 'Cancel of prauthorized payment successfull: Tranaction Id: %s', 'viva-com-smart-for-woocommerce' ), $result['transaction_id'] ) );
-                $order->update_status( 'cancelled' );
-            }
-            $order->save();
-        } else {
-            return new WP_Error( 'error', sprintf( __( 'Viva.com: Your %s credentials are NOT valid. Please check your credentials!', 'viva-com-smart-for-woocommerce' ), $environment ) );
-        }
-    }
+        // Add custom Order actions.
+        add_filter( 'woocommerce_order_actions', array( $this, 'woocommerce_vivacom_smart_custom_actions' ) );
+        add_action( 'woocommerce_order_action_wc_viva_smart_capture', array( $this, 'woocommerce_vivacom_smart_capture' ) );
+        add_action( 'woocommerce_order_action_wc_viva_smart_void', array( $this, 'woocommerce_vivacom_smart_void' ) );
+    }
+
+    /**
+     * Adds custom actions for Viva.com Smart payments in WooCommerce.
+     *
+     * @param array $actions An array of existing WooCommerce payment actions.
+     *
+     * @return array Modified array including Viva.com Smart custom actions.
+     */
+    public function woocommerce_vivacom_smart_custom_actions( $actions ) {
+        $actions['wc_viva_smart_capture'] = __( 'Capture Viva.com Payment', 'viva-com-smart-for-woocommerce' );
+        $actions['wc_viva_smart_void']    = __( 'Void Viva.com Payment', 'viva-com-smart-for-woocommerce' );
+
+        return $actions;
+    }
+
+    /**
+     * Captures a Viva.com Smart payment for a WooCommerce order.
+     *
+     * @param object|WC_Order $order order.
+     *
+     * @return  bool|WP_Error
+     */
+    public function woocommerce_vivacom_smart_capture( $order ) {
+        $environment           = 'yes' === $this->test_mode ? 'demo' : 'live';
+        $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
+        $amount                = (int) number_format( $order->get_total(), 2, '', '' );
+
+        if ( $bearer_authentication->hasValidToken() ) {
+            $result = WC_Vivacom_Smart_Helpers::process_capture( $bearer_authentication, $order, $amount );
+            if ( is_wp_error( $result ) ) {
+                $order->add_order_note( sprintf( __( 'Capture prauthorized payment failed: %s', 'viva-com-smart-for-woocommerce' ), $result->get_error_message() ) );
+            } else {
+                $order->add_order_note( sprintf( __( 'Capture prauthorized payment successfull: Tranaction Id: %s', 'viva-com-smart-for-woocommerce' ), $result['transaction_id'] ) );
+                $order->update_status( 'completed' );
+            }
+            $order->save();
+        } else {
+            return new WP_Error( 'error', sprintf( __( 'Viva.com: Your %s credentials are NOT valid. Please check your credentials!', 'viva-com-smart-for-woocommerce' ), $environment ) );
+        }
+    }
+
+    /**
+     * Void a Viva.com Smart payment for a WooCommerce order.
+     *
+     * @param object|WC_Order $order order.
+     *
+     * @return bool|WP_Error
+     */
+    public function woocommerce_vivacom_smart_void( $order ) {
+        $environment           = 'yes' === $this->test_mode ? 'demo' : 'live';
+        $source                = 'yes' === $this->test_mode ? $this->demo_source_code : $this->source_code;
+        $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
+        $amount                = (int) number_format( $order->get_total(), 2, '', '' );
+
+        if ( $bearer_authentication->hasValidToken() ) {
+            $result = WC_Vivacom_Smart_Helpers::process_void( $bearer_authentication, $source, $order, $amount );
+            if ( is_wp_error( $result ) ) {
+                $order->add_order_note( sprintf( __( 'Cancel of prauthorized payment failed: %s', 'viva-com-smart-for-woocommerce' ), $result->get_error_message() ) );
+            } else {
+                $order->add_order_note( sprintf( __( 'Cancel of prauthorized payment successfull: Tranaction Id: %s', 'viva-com-smart-for-woocommerce' ), $result['transaction_id'] ) );
+                $order->update_status( 'cancelled' );
+            }
+            $order->save();
+        } else {
+            return new WP_Error( 'error', sprintf( __( 'Viva.com: Your %s credentials are NOT valid. Please check your credentials!', 'viva-com-smart-for-woocommerce' ), $environment ) );
+        }
+    }
 
     /**
@@ -265 +276 @@
      * @param string $order_id order_id.
      *
-     * @return string
+     * @return void
      */
     public function generate_form( string $order_id ) {
 
-        global $wpdb;
+        global $wpdb;
         $order      = wc_get_order( $order_id );
         $order_data = WC_Vivacom_Smart_Helpers::get_order_data( $order );
+
+        $brand_color = str_replace( '#', '', $this->get_option( 'brand_color' ) );
 
         $allow_recurring = false;
@@ -298 +311 @@
             ),
             'payment'    => array(
-                'maxInstallments'     => $max_installments,
-                'allowRecurring'      => $allow_recurring,
-                'preauth'             => 'yes' === $this->get_option('enable_preauthorizations'),
+                'maxInstallments' => $max_installments,
+                'allowRecurring'  => $allow_recurring,
+                'preauth'         => 'yes' === $this->get_option( 'enable_preauthorizations' ),
             ),
             'messages'   => array(
                 'customer' => $order_data['messages']['customer_message'],
                 'merchant' => $order_data['messages']['merchant_message'],
-                'tags'     => array( 'woocommerce-smart' ),
+                'tags'     => array( 'woocommerce-smart' ),
             ),
         );
@@ -312 +325 @@
 
         // IF ORDER CODE AND ORDER PENDING EXISTS ELSE CREATE OTHER.
-        $vivacom_order = WC_Vivacom_Smart_Helpers::get_smart_checkout_order( $order->get_id() );
+        $vivacom_order = WC_Vivacom_Smart_Helpers::get_smart_checkout_order( $order->get_id() );
 
         $action_adr = '';
         if ( ! empty( $vivacom_order['vivacom_order_code'] ) ) {
             $order_code = $vivacom_order['vivacom_order_code'];
-            $action_adr = Application::getSmartCheckoutUrl( $order_code, $environment );
+            $action_adr = Application::getSmartCheckoutUrl(
+                [
+                    'ref'   => $order_code,
+                    'color' => $brand_color,
+                ],
+                $environment
+            );
         } else {
             $bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
@@ -325 +344 @@
 
                 if ( $order_response->isSuccessful() ) {
-                    $order_code = $order_response->getBody()->orderCode;
-                    $insert_data = array(
-                        'woocommerce_order_id' => $order->get_id(),
-                        'vivacom_order_code' => $order_code,
-                        'client_id' => 'yes' === $this->test_mode ? $this->demo_client_id : $this->client_id,//get client id
-                        'currency' => $order_data['currency'],
-                        'amount' => $order->get_total(),
-                        'is_demo' => 'yes' === $this->test_mode
-                    );
-                    $wpdb->insert(
-                        $wpdb->prefix . 'viva_com_smart_wc_checkout_orders',
-                        $insert_data
-                    );
-                    $action_adr = Application::getSmartCheckoutUrl( $order_code, $environment );
-                } else {
+                    $order_code  = $order_response->getBody()->orderCode;
+                    $insert_data = array(
+                        'woocommerce_order_id' => $order->get_id(),
+                        'vivacom_order_code'   => $order_code,
+                        'client_id'            => 'yes' === $this->test_mode ? $this->demo_client_id : $this->client_id, // get client id.
+                        'currency'             => $order_data['currency'],
+                        'amount'               => $order->get_total(),
+                        'is_demo'              => 'yes' === $this->test_mode,
+                    );
+                    $wpdb->insert(
+                        $wpdb->prefix . 'viva_com_smart_wc_checkout_orders',
+                        $insert_data
+                    );
+                    $action_adr = Application::getSmartCheckoutUrl(
+                        [
+                            'ref'   => $order_code,
+                            'color' => $brand_color,
+                        ],
+                        $environment
+                    );              } else {
                     $error = __( 'There was a problem processing your payment. Please try again or use an other payment method.', 'viva-com-smart-for-woocommerce' );
                     wc_add_notice( $error, 'error' );
@@ -351 +375 @@
         }
 
-        $order_ref = $order_code ?? '';
+        $order_ref = $order_code ?? '';
 
         wc_enqueue_js(
@@ -377 +401 @@
 
         echo '<form action="' . esc_url( $action_adr ) . '" method="GET" id="vivacom_smart_payment_form">' . "\n" .
-            '<input type="hidden" name="Ref" value="' . esc_attr($order_ref) . '" />' . "\n" .
-            '<input type="submit" class="button alt" id="submit_vivacom_smart_payment_form" value="' . esc_html__( 'Pay Now', 'viva-com-smart-for-woocommerce' ) . '" /> <a class="button cancel" href="' . esc_url( $order->get_cancel_order_url() ) . '">' . esc_html__( 'Cancel', 'viva-com-smart-for-woocommerce' ) . '</a>' . "\n" .
+            '<input type="hidden" name="Ref" value="' . esc_attr( $order_ref ) . '" />' . "\n" .
+            '<input type="hidden" name="color" value="' . esc_attr( $brand_color ) . '" />' . "\n" .
+            '<input type="submit" class="button alt" id="submit_vivacom_smart_payment_form" value="' . esc_html__( 'Pay Now', 'viva-com-smart-for-woocommerce' ) . '" /> <a class="button cancel" href="' . esc_url( $order->get_cancel_order_url() ) . '">' . esc_html__( 'Cancel', 'viva-com-smart-for-woocommerce' ) . '</a>' . "\n" .
             '</form>';
     }
@@ -397 +422 @@
             'redirect' => esc_url_raw( add_query_arg( 'order-pay', $order->get_id(), add_query_arg( 'key', $order->get_order_key(), wc_get_page_permalink( 'checkout' ) ) ) ),
         );
-
     }
 
@@ -605 +629 @@
         }
 
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
+
         $suffix = defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ? '' : '.min';
 
@@ -650 +677 @@
                 $this->update_option( 'demo_source_code', '' );
             }
-        } else {
-            if ( $this->client_id !== $old_client_id || $this->client_secret !== $old_client_secret ) {
+        } elseif ( $this->client_id !== $old_client_id || $this->client_secret !== $old_client_secret ) {
                 $this->update_option( 'source_code', '' );
-            }
         }
 
@@ -699 +724 @@
      */
     private function admin_sources() {
-        // GET DEMO AND LIVE CLIENT TOKEN THEN GET SOURCES.
-        $demo_bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( 'demo' );
-        $live_bearer_authentication = WC_Vivacom_Smart_Helpers::get_bearer_authentication( 'live' );
-
-        $this->demo_source_list = $demo_bearer_authentication->hasValidToken() ? WC_Vivacom_Smart_Helpers::get_sources( $demo_bearer_authentication ) : new SourceList();
-        $this->live_source_list = $live_bearer_authentication->hasValidToken() ? WC_Vivacom_Smart_Helpers::get_sources( $live_bearer_authentication ) : new SourceList();
-
-        if ( count( $this->demo_source_list ) > 0 ) {
-            foreach ( $this->demo_source_list as $key => $value ) {
-                $this->form_fields['demo_source_code']['options'][ $value->getCode() ] =
+        $environment                          = 'yes' == $this->test_mode ? 'demo' : 'live';
+        $bearer_authentication                = WC_Vivacom_Smart_Helpers::get_bearer_authentication( $environment );
+        $this->{"{$environment}_source_list"} = $bearer_authentication->hasValidToken() ? WC_Vivacom_Smart_Helpers::get_sources( $bearer_authentication ) : new SourceList();
+
+        if ( count( $this->{"{$environment}_source_list"} ) > 0 ) {
+            $source_code_key = 'demo' == $environment ? "{$environment}_source_code" : 'source_code';
+
+            foreach ( $this->{"{$environment}_source_list"} as $key => $value ) {
+                $this->form_fields[ $source_code_key ]['options'][ $value->getCode() ] =
                     $value->getCode() . ' - ' . $value->getname() . ' - ' . $value->getDomain();
             }
         }
-
-        if ( count( $this->live_source_list ) > 0 ) {
-            foreach ( $this->live_source_list as $key => $value ) {
-                $this->form_fields['source_code']['options'][ $value->getCode() ] =
-                    $value->getCode() . ' - ' . $value->getName() . ' - ' . $value->getDomain();
-            }
-        }
-
     }
 
@@ -775 +791 @@
         return true;
     }
-
 }

viva-com-smart-for-woocommerce/trunk/package.json

@@ -2 +2 @@
   "name": "viva-com-smart-for-woocommerce",
   "title": "Viva Wallet Smart Checkout",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "repository": {
     "type": "git",

viva-com-smart-for-woocommerce/trunk/readme.md

@@ -6 +6 @@
 **Tested up to:** 6.7
 **Requires PHP:** 7.4
-**Stable tag:** 1.0.0
+**Stable tag:** 1.0.1
 **License:** GPLv2
 **License URI:** [https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
@@ -55 +55 @@
 ## Changelog
 
+## 1.0.1 - 2025-03-27
+- Add brand color picker option for smart checkout
+- Fix double request to viva during configuration
 ### 1.0.0 - 2025-02-05
 - Initial release.  

viva-com-smart-for-woocommerce/trunk/uninstall.php

@@ -1 +1 @@
 <?php
+/**
+ * Uninstall script for the Viva.com Smart for WooCommerce plugin.
+ *
+ * This script is executed when the plugin is uninstalled via WordPress.
+ * It ensures that all relevant settings and options related to the plugin
+ * are removed from the database.
+ *
+ * @package VivaCom_Smart_For_WooCommerce
+ */
+
 if ( ! defined( 'ABSPATH' ) ) {
     exit;

viva-com-smart-for-woocommerce/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit166d4c7020968fe2a6155eb8d0d0c1d8::getLoader();
+return ComposerAutoloaderInit8799c650735842202cde6eabb2f6ea6d::getLoader();

viva-com-smart-for-woocommerce/trunk/vendor/composer/ClassLoader.php

@@ -43 +43 @@
 class ClassLoader
 {
-    /** @var ?string */
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
+     * @var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
+     * @var array<string, list<string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr4 = array();
@@ -65 +65 @@
     // PSR-0
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr0 = array();
@@ -79 +81 @@
 
     /**
-     * @var string[]
-     * @psalm-var array<string, string>
+     * @var array<string, string>
      */
     private $classMap = array();
@@ -88 +89 @@
 
     /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
+     * @var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var ?string */
+    /** @var string|null */
     private $apcuPrefix;
 
     /**
-     * @var self[]
+     * @var array<string, self>
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param ?string $vendorDir
+     * @param string|null $vendorDir
      */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
-    }
-
-    /**
-     * @return string[]
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
      */
     public function getPrefixes()
@@ -122 +123 @@
 
     /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
+     * @return array<string, list<string>>
      */
     public function getPrefixesPsr4()
@@ -131 +131 @@
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirs()
@@ -140 +139 @@
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirsPsr4()
@@ -149 +147 @@
 
     /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
+     * @return array<string, string> Array of classname => path
      */
     public function getClassMap()
@@ -158 +155 @@
 
     /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
+     * @param array<string, string> $classMap Class to filename map
      *
      * @return void
@@ -176 +172 @@
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @return void
@@ -184 +180 @@
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
@@ -193 +190 @@
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
@@ -202 +199 @@
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
@@ -208 +205 @@
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
@@ -214 +211 @@
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
@@ -223 +220 @@
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
@@ -233 +230 @@
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
@@ -243 +241 @@
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
@@ -253 +251 @@
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
@@ -264 +262 @@
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
@@ -273 +271 @@
      * replacing any others previously set for this prefix.
      *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
      *
      * @return void
@@ -291 +289 @@
      * replacing any others previously set for this namespace.
      *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
@@ -426 +424 @@
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
@@ -477 +476 @@
 
     /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
      */
     public static function getRegisteredLoaders()
@@ -556 +555 @@
         return false;
     }
+
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
-}

viva-com-smart-for-woocommerce/trunk/vendor/composer/InstalledVersions.php

@@ -34 +34 @@
 
     /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
+    /**
      * @var bool|null
      */
@@ -99 +104 @@
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
@@ -120 +125 @@
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
@@ -310 +315 @@
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
     }
 
@@ -323 +334 @@
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
+                }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
                 }
             }
@@ -341 +362 @@
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array() && !$copiedLocalDir) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;

viva-com-smart-for-woocommerce/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit166d4c7020968fe2a6155eb8d0d0c1d8
+class ComposerAutoloaderInit8799c650735842202cde6eabb2f6ea6d
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit166d4c7020968fe2a6155eb8d0d0c1d8', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8799c650735842202cde6eabb2f6ea6d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit166d4c7020968fe2a6155eb8d0d0c1d8', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8799c650735842202cde6eabb2f6ea6d', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit166d4c7020968fe2a6155eb8d0d0c1d8::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit8799c650735842202cde6eabb2f6ea6d::getInitializer($loader));
 
         $loader->register(true);

viva-com-smart-for-woocommerce/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit166d4c7020968fe2a6155eb8d0d0c1d8
+class ComposerStaticInit8799c650735842202cde6eabb2f6ea6d
 {
     public static $prefixLengthsPsr4 = array (
@@ -164 +164 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit166d4c7020968fe2a6155eb8d0d0c1d8::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit166d4c7020968fe2a6155eb8d0d0c1d8::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit166d4c7020968fe2a6155eb8d0d0c1d8::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit8799c650735842202cde6eabb2f6ea6d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit8799c650735842202cde6eabb2f6ea6d::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit8799c650735842202cde6eabb2f6ea6d::$classMap;
 
         }, null, ClassLoader::class);

viva-com-smart-for-woocommerce/trunk/vendor/composer/installed.json

@@ -35 +35 @@
             },
             "time": "2024-11-26T13:24:01+00:00",
-            "default-branch": true,
             "type": "composer-plugin",
             "extra": {

viva-com-smart-for-woocommerce/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'vivacom/woocommerce',
-        'pretty_version' => 'dev-main',
-        'version' => 'dev-main',
-        'reference' => '024233744bd894eaeb9235d94cb5697a456d9a8a',
+        'pretty_version' => 'dev-59ed2595eb0bf8bd239d3355027895ba6562b1c1',
+        'version' => 'dev-59ed2595eb0bf8bd239d3355027895ba6562b1c1',
+        'reference' => '59ed2595eb0bf8bd239d3355027895ba6562b1c1',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -23 +23 @@
         ),
         'vivacom/woocommerce' => array(
-            'pretty_version' => 'dev-main',
-            'version' => 'dev-main',
-            'reference' => '024233744bd894eaeb9235d94cb5697a456d9a8a',
+            'pretty_version' => 'dev-59ed2595eb0bf8bd239d3355027895ba6562b1c1',
+            'version' => 'dev-59ed2595eb0bf8bd239d3355027895ba6562b1c1',
+            'reference' => '59ed2595eb0bf8bd239d3355027895ba6562b1c1',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

viva-com-smart-for-woocommerce/trunk/vendor_prefixed/vivawallet/composer.json

@@ -2 +2 @@
     "name": "vivawallet\/vivawallet-php",
     "description": "Package to handle http requests to Viva Wallet APi for native checkout",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "type": "library",
     "require": {

viva-com-smart-for-woocommerce/trunk/vendor_prefixed/vivawallet/lib/Application.php

@@ -6 +6 @@
 {
     public const VIVAWALLET_ABBREVIATION = 'VW';
-    public const SDK_VERSION = '2.2.2';
+    public const SDK_VERSION = '2.2.3';
     public const SOURCE_NAME_FORMAT = 'Viva Wallet For %s - %s';
     public const PARAM_CANCEL_ORDER = 'cancel';
@@ -37 +37 @@
         }
     }
-    public static function getSmartCheckoutUrl(string $ref, string $environment) : string
+    public static function getSmartCheckoutUrl(array $params, string $environment) : string
     {
-        return \implode([self::BASE_URLS[$environment]['default'], self::ENDPOINTS['smartCheckout'], '?', \http_build_query(['ref' => $ref])]);
+        $baseUrl = self::BASE_URLS[$environment]['default'];
+        $endpoint = self::ENDPOINTS['smartCheckout'];
+        $filteredParams = \array_filter($params, function ($param) {
+            return !empty($param);
+        });
+        return \implode([$baseUrl, $endpoint, '?', \http_build_query($filteredParams)]);
     }
 }

viva-com-smart-for-woocommerce/trunk/wc-vivacom-smart.php

@@ -6 +6 @@
  *  Author: Viva.com
  *  Author URI: https://www.viva.com/
- *  Version: 1.0.0
+ *  Version: 1.0.1
  *  Requires Plugins: woocommerce
  *  Requires at least: 6.5
@@ -15 +15 @@
  *  License: GPLv2
  *  Domain Path: /languages
+ *
+ * @package VivaComSmartForWooCommerce
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-    exit();
+    exit();
 }
 /**
  * Instantiate Singleton class
+ *
  */
 if ( ! class_exists( 'WC_Vivacom_Smart' ) ) {
-
-    class  WC_Vivacom_Smart {
-
-        /**
-         * Instance
-         *
-         * @var WC_Vivacom_Smart The reference the *Singleton* instance of this class
-         */
-        private static $instance;
-
-        /**
-         * Get instance
-         *
-         * @return WC_Vivacom_Smart The *Singleton* instance.
-         */
-        public static function get_instance() : self {
-            if ( null === self::$instance ) {
-                self::$instance = new self();
-            }
-            return self::$instance;
-        }
-
-        /**
-         * Construct
-         */
-        private function __construct() {
-            add_action( 'plugins_loaded', [$this, 'init']);
-        }
-
-        /**
-         * Clone
-         */
-        private function __clone() {
-        }
-
-        /**
-         * Wakeup
-         */
-        public function __wakeup() {
-        }
-
-        /**
-         * Init
-         */
-        public function init() {
-            try {
-                $this->define_constants();
-                $this->validate_setup();
-                $this->load_plugin_files();
-                $this->setup_options();
-                $this->add_hooks();
-                $this->add_filters();
-                $this->setup_locale();
-            } catch (Exception $e) {
-                $errors = unserialize($e->getMessage());
-                add_action( 'admin_notices', function () use ($errors){
-                    $this->print_notices($errors);
-                });
-                return;
-            }
-        }
-
-        private function validate_setup() {
-            $errors = [];
-
-            // Woocommerce needs to be active
-            if ( ! class_exists( 'WooCommerce' ) ) {
-                $errors[] = sprintf(
-                    esc_html__(
-                        'The Viva.com payment gateway requires WooCommerce. Download link %s here.',
-                        'viva-com-smart-for-woocommerce'
-                    ),
-                    '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' );
-            }
-
-            // WooCommerce needs to adhere to our minimum supported WC versions
-            if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, WC_VIVA_COM_SMART_MIN_WOO_VERSION, '<' ) ) {
-                $errors[] = sprintf(
-                    esc_html__(
-                        'The Viva.com payment gateway requires WooCommerce. Download link %s here.',
-                        'viva-com-smart-for-woocommerce'
-                    ),
-                    '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' );
-            }
-            if ( !empty($errors) ) {
-                throw new \Exception(serialize($errors));
-            }
-        }
-
-        private function define_constants() : void {
-            define( 'WC_VIVA_COM_SMART_VERSION', '1.0.0' );
-            define( 'WC_VIVA_COM_SMART_MIN_PHP_VERSION', '7.3.0' );
-            define( 'WC_VIVA_COM_SMART_MIN_WOO_VERSION', '3.5.0' );
-            define( 'WC_VIVA_COM_SMART_MAIN_FILE', __FILE__ );
-            define( 'WC_VIVA_COM_SMART_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-            define( 'WC_VIVA_COM_SMART_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
-            define( 'WC_VIVA_PREFIXED_DIRECTORY', '/vendor_prefixed' );
-            define( 'WC_VIVA_COM_SMART_DB_SCHEMA', '1.0');
-        }
-
-        private function load_plugin_files() : void {
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/vendor/autoload.php';
-
-            if ( is_dir( WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY ) ) {
-                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/guzzlehttp/guzzle/src/functions.php';
-                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/symfony/deprecation-contracts/function.php';
-                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/ralouphie/src/getallheaders.php';
-            }
-
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-logger.php';
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-helpers.php';
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart.php';
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-endpoints.php';
-            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-subscriptions.php';
-        }
-
-        private function setup_options() : void {
-            $viva_settings = get_option( 'woocommerce_vivacom_smart_settings', [] );
-            if ( empty( $viva_settings['version'] ) ) {
-                $this->update_version_in_db( $viva_settings, false );
-            } elseif ( WC_VIVA_COM_SMART_VERSION !== $viva_settings['version'] ) {
-                $this->update_version_in_db( $viva_settings, true );
-            }
-        }
-
-        /**
-         * Update version in database
-         *
-         * @param array $viva_settings viva_settings.
-         *
-         * @param bool  $current current.
-         *
-         * @return void
-         */
-        public function update_version_in_db( $viva_settings, $current ) {
-            global $wp_version;
-            $active_plugins = get_option( 'active_plugins' );
-
-            if ( $current ) {
-                $message = "Viva.com smart plugin version updated \nNew version: " . WC_VIVA_COM_SMART_VERSION . "\nOld version : " . $viva_settings['version'];
-            } else {
-                $message = "Viva.com smart plugin version updated \nNew version: " . WC_VIVA_COM_SMART_VERSION;
-            }
-
-            $message .= "\nWordpress Version: " . $wp_version;
-
-            // Check if get_plugins() function exists. This is required on the front end of the site.
-            if ( ! function_exists( 'get_plugins' ) ) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
-            }
-
-            $all_plugins = get_plugins();
-
-            $message .= "\n Other active plugins: ";
-
-            foreach ( $active_plugins as $active_plugin ) {
-                $version  = ! empty( $all_plugins[ $active_plugin ]['Version'] ) ? $all_plugins[ $active_plugin ]['Version'] : 'Unknown Version';
-                $message .= "\n " . $all_plugins[ $active_plugin ]['Name'] . ' - Version: ' . $version;
-            }
-
-            WC_Vivacom_Smart_Logger::log( $message, true );
-
-            $viva_settings['version'] = WC_VIVA_COM_SMART_VERSION;
-            update_option( 'woocommerce_vivacom_smart_settings', $viva_settings );
-
-        }
-
-        private function add_hooks() : void {
-            add_action( 'woocommerce_blocks_loaded', [ $this, 'woocommerce_vivacom_smart_woocommerce_blocks_support' ] );
-            add_action( 'before_woocommerce_init', [ $this, 'woocommerce_vivacom_smart_before_woocommerce_init'] );
-        }
-
-        /**
-         * Woocommerce blocks support
-         */
-        public function woocommerce_vivacom_smart_woocommerce_blocks_support() : void {
-            if ( class_exists( 'Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType' ) ) {
-                require_once dirname( __FILE__ ) . '/includes/class-wc-vivacom-smart-blocks-support.php';
-                add_action(
-                    'woocommerce_blocks_payment_method_type_registration',
-                    function( Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
-                        $payment_method_registry->register( new WC_Vivacom_Smart_Blocks_support );
-                    }
-                );
-            }
-        }
-
-        public function woocommerce_vivacom_smart_before_woocommerce_init () : void {
-            if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
-                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
-                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
-            }
-        }
-
-        private function add_filters() : void {
-            add_filter( 'woocommerce_payment_gateways', [ $this, 'add_gateways' ] );
-            add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), [ $this, 'plugin_action_links' ] );
-            add_filter( 'plugin_row_meta', [ $this, 'plugin_row_meta' ], 10, 2 );
-        }
-
-        /**
-         * Add gateways
-         *
-         * @param array $gateways add vivacom gateways.
-         *
-         * @return array
-         */
-        public function add_gateways( $gateways ) {
-            if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
-                $gateways[] = 'WC_Vivacom_Smart_Payment_Gateway_Subscriptions';
-            } else {
-                $gateways[] = 'WC_Vivacom_Smart_Payment_Gateway';
-            }
-
-            return $gateways;
-        }
-
-        /**
-         * Add plugin action links.
-         *
-         * @param array $links Links.
-         *
-         * @return array
-         */
-        public function plugin_action_links( $links ) {
-            $plugin_links = array(
-                '<a href="admin.php?page=wc-settings&tab=checkout&section=vivacom_smart">' . esc_html__( 'Settings', 'viva-com-smart-for-woocommerce' ) . '</a>',
-            );
-            return array_merge( $plugin_links, $links );
-        }
-
-        /**
-         * Add plugin row meta.
-         *
-         * @param mixed $links Plugin Row Meta.
-         * @param mixed $file  Plugin Base file.
-         *
-         * @return array
-         */
-        public function plugin_row_meta( $links, $file ) {
-            if ( plugin_basename( __FILE__ ) === $file ) {
-                $row_meta = array(
-                    'docs'    => '<a href="' . esc_url( 'https://docs.woocommerce.com/document/viva-com-smart-for-woocommerce' ) . '" aria-label="' . esc_attr__( 'View Viva.com Smart Checkout plugin documentation', 'viva-com-smart-for-woocommerce' ) . '">' . esc_html__( 'Documentation', 'viva-com-smart-for-woocommerce' ) . '</a>',
-                    'support' => '<a href="' . esc_url( 'mailto: [email protected]' ) . '" aria-label="' . esc_attr__( 'Get support from Viva.com Team', 'viva-com-smart-for-woocommerce' ) . '">' . esc_html__( 'Get support', 'viva-com-smart-for-woocommerce' ) . '</a>',
-                );
-                return array_merge( $links, $row_meta );
-            }
-            return (array) $links;
-        }
-
-        public function setup_locale() : void {
-            add_filter( 'plugin_locale', [ $this, 'woocommerce_vivacom_smart_fix_locale' ], 99, 2 );
-            load_plugin_textdomain( 'viva-com-smart-for-woocommerce', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
-        }
-
-        /**
-         * Vivacom_fix_locale
-         *
-         * @param string $locale locale.
-         * @param string $domain domain.
-         * @return string
-         */
-        public function woocommerce_vivacom_smart_fix_locale( $locale, $domain ) {
-            if ( 'viva-com-smart-for-woocommerce' === $domain ) {
-                $locale = substr( $locale, 0, 2 );
-            }
-            return $locale;
-        }
-
-        public function print_notices(array $notices) {
-            foreach ($notices as $notice) {
-                echo '<div class="notice notice-error"><p><strong>' . esc_html( $notice ) . '</strong></p></div>';
-            }
-        }
-
-        private function create_orders_table() : void {
-            $charset_collate = $this->wpdb()->get_charset_collate();
-            $db_prefix =$this->wpdb()->prefix;
-
-            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_orders
+    /**
+     * WC_Vivacom_Smart Class
+     */
+    class WC_Vivacom_Smart {
+
+        /**
+         * Instance
+         *
+         * @var WC_Vivacom_Smart The reference the *Singleton* instance of this class
+         */
+        private static $instance;
+
+        /**
+         * Get instance
+         *
+         * @return WC_Vivacom_Smart The *Singleton* instance.
+         */
+        public static function get_instance(): self {
+            if ( null === self::$instance ) {
+                self::$instance = new self();
+            }
+            return self::$instance;
+        }
+
+        /**
+         * Construct
+         */
+        private function __construct() {
+            add_action( 'plugins_loaded', array( $this, 'init' ) );
+        }
+
+        /**
+         * Clone
+         */
+        private function __clone() {
+        }
+
+        /**
+         * Wakeup
+         */
+        public function __wakeup() {
+        }
+
+        /**
+         * Init
+         */
+        public function init() {
+            try {
+                $this->define_constants();
+                $this->validate_setup();
+                $this->load_plugin_files();
+                $this->setup_options();
+                $this->add_hooks();
+                $this->add_filters();
+                $this->setup_locale();
+            } catch ( Exception $e ) {
+                $errors = unserialize( $e->getMessage() );
+                add_action(
+                    'admin_notices',
+                    function () use ( $errors ) {
+                        $this->print_notices( $errors );
+                    }
+                );
+                return;
+            }
+        }
+
+        /**
+         * Validates the WooCommerce and plugin setup requirements.
+         *
+         * @throws \Exception If WooCommerce is not installed, active, or does not meet the minimum version requirement.
+         */
+        private function validate_setup() {
+            $errors = array();
+
+            // Woocommerce needs to be active.
+            if ( ! class_exists( 'WooCommerce' ) ) {
+                $errors[] = sprintf(
+                    esc_html__(
+                        'The Viva.com payment gateway requires WooCommerce. Download link %s here.',
+                        'viva-com-smart-for-woocommerce'
+                    ),
+                    '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>'
+                );
+            }
+
+            // WooCommerce needs to adhere to our minimum supported WC versions.
+            if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, WC_VIVA_COM_SMART_MIN_WOO_VERSION, '<' ) ) {
+                $errors[] = sprintf(
+                    esc_html__(
+                        'The Viva.com payment gateway requires WooCommerce. Download link %s here.',
+                        'viva-com-smart-for-woocommerce'
+                    ),
+                    '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>'
+                );
+            }
+            if ( ! empty( $errors ) ) {
+                throw new \Exception( serialize( $errors ) );
+            }
+        }
+
+        /**
+         * Defines essential constants for the Viva.com Smart payment gateway.
+         *
+         * @return void
+         */
+        private function define_constants(): void {
+            define( 'WC_VIVA_COM_SMART_VERSION', '1.0.1' );
+            define( 'WC_VIVA_COM_SMART_MIN_PHP_VERSION', '7.3.0' );
+            define( 'WC_VIVA_COM_SMART_MIN_WOO_VERSION', '3.5.0' );
+            define( 'WC_VIVA_COM_SMART_MAIN_FILE', __FILE__ );
+            define( 'WC_VIVA_COM_SMART_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
+            define( 'WC_VIVA_COM_SMART_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+            define( 'WC_VIVA_PREFIXED_DIRECTORY', '/vendor_prefixed' );
+            define( 'WC_VIVA_COM_SMART_DB_SCHEMA', '1.0' );
+        }
+
+        /**
+         * Loads the necessary plugin files for Viva.com Smart payment gateway.
+         *
+         * @return void
+         */
+        private function load_plugin_files(): void {
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/vendor/autoload.php';
+
+            if ( is_dir( WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY ) ) {
+                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/guzzlehttp/guzzle/src/functions.php';
+                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/symfony/deprecation-contracts/function.php';
+                require_once WC_VIVA_COM_SMART_PLUGIN_PATH . WC_VIVA_PREFIXED_DIRECTORY . '/ralouphie/src/getallheaders.php';
+            }
+
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-logger.php';
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-helpers.php';
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart.php';
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-endpoints.php';
+            require_once WC_VIVA_COM_SMART_PLUGIN_PATH . '/includes/class-wc-vivacom-smart-subscriptions.php';
+        }
+
+        /**
+         * Sets up the plugin options and handles version updates.
+         *
+         * @return void
+         */
+        private function setup_options(): void {
+            $viva_settings = get_option( 'woocommerce_vivacom_smart_settings', array() );
+            if ( empty( $viva_settings['version'] ) ) {
+                $this->update_version_in_db( $viva_settings, false );
+            } elseif ( WC_VIVA_COM_SMART_VERSION !== $viva_settings['version'] ) {
+                $this->update_version_in_db( $viva_settings, true );
+            }
+        }
+
+        /**
+         * Update version in database
+         *
+         * @param array $viva_settings viva_settings.
+         *
+         * @param bool  $current current.
+         *
+         * @return void
+         */
+        public function update_version_in_db( $viva_settings, $current ) {
+            global $wp_version;
+            $active_plugins = get_option( 'active_plugins' );
+
+            if ( $current ) {
+                $message = "Viva.com smart plugin version updated \nNew version: " . WC_VIVA_COM_SMART_VERSION . "\nOld version : " . $viva_settings['version'];
+            } else {
+                $message = "Viva.com smart plugin version updated \nNew version: " . WC_VIVA_COM_SMART_VERSION;
+            }
+
+            $message .= "\nWordpress Version: " . $wp_version;
+
+            // Check if get_plugins() function exists. This is required on the front end of the site.
+            if ( ! function_exists( 'get_plugins' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            }
+
+            $all_plugins = get_plugins();
+
+            $message .= "\n Other active plugins: ";
+
+            foreach ( $active_plugins as $active_plugin ) {
+                $version  = ! empty( $all_plugins[ $active_plugin ]['Version'] ) ? $all_plugins[ $active_plugin ]['Version'] : 'Unknown Version';
+                $message .= "\n " . $all_plugins[ $active_plugin ]['Name'] . ' - Version: ' . $version;
+            }
+
+            WC_Vivacom_Smart_Logger::log( $message, true );
+
+            $viva_settings['version'] = WC_VIVA_COM_SMART_VERSION;
+            update_option( 'woocommerce_vivacom_smart_settings', $viva_settings );
+        }
+
+        /**
+         * Adds custom action hooks for the plugin.
+         *
+         * @return void
+         */
+        private function add_hooks(): void {
+            add_action( 'woocommerce_blocks_loaded', array( $this, 'woocommerce_vivacom_smart_woocommerce_blocks_support' ) );
+            add_action( 'before_woocommerce_init', array( $this, 'woocommerce_vivacom_smart_before_woocommerce_init' ) );
+        }
+
+        /**
+         * Woocommerce blocks support
+         */
+        public function woocommerce_vivacom_smart_woocommerce_blocks_support(): void {
+            if ( class_exists( 'Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType' ) ) {
+                require_once __DIR__ . '/includes/class-wc-vivacom-smart-blocks-support.php';
+                add_action(
+                    'woocommerce_blocks_payment_method_type_registration',
+                    function ( Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
+                        $payment_method_registry->register( new WC_Vivacom_Smart_Blocks_support() );
+                    }
+                );
+            }
+        }
+
+        /**
+         * Declares compatibility with specific WooCommerce features before WooCommerce initialization.
+         *
+         * @return void
+         */
+        public function woocommerce_vivacom_smart_before_woocommerce_init(): void {
+            if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
+                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
+                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+            }
+        }
+
+        /**
+         * Adds custom filters for the Viva.com Smart payment gateway plugin.
+         *
+         * @return void
+         */
+        private function add_filters(): void {
+            add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
+            add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
+            add_filter( 'plugin_row_meta', array( $this, 'plugin_row_meta' ), 10, 2 );
+        }
+
+        /**
+         * Add gateways
+         *
+         * @param array $gateways add vivacom gateways.
+         *
+         * @return array
+         */
+        public function add_gateways( $gateways ) {
+            if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+                $gateways[] = 'WC_Vivacom_Smart_Payment_Gateway_Subscriptions';
+            } else {
+                $gateways[] = 'WC_Vivacom_Smart_Payment_Gateway';
+            }
+
+            return $gateways;
+        }
+
+        /**
+         * Add plugin action links.
+         *
+         * @param array $links Links.
+         *
+         * @return array
+         */
+        public function plugin_action_links( $links ) {
+            $plugin_links = array(
+                '<a href="admin.php?page=wc-settings&tab=checkout&section=vivacom_smart">' . esc_html__( 'Settings', 'viva-com-smart-for-woocommerce' ) . '</a>',
+            );
+            return array_merge( $plugin_links, $links );
+        }
+
+        /**
+         * Add plugin row meta.
+         *
+         * @param mixed $links Plugin Row Meta.
+         * @param mixed $file  Plugin Base file.
+         *
+         * @return array
+         */
+        public function plugin_row_meta( $links, $file ) {
+            if ( plugin_basename( __FILE__ ) === $file ) {
+                $row_meta = array(
+                    'docs'    => '<a href="' . esc_url( 'https://docs.woocommerce.com/document/viva-com-smart-for-woocommerce' ) . '" aria-label="' . esc_attr__( 'View Viva.com Smart Checkout plugin documentation', 'viva-com-smart-for-woocommerce' ) . '">' . esc_html__( 'Documentation', 'viva-com-smart-for-woocommerce' ) . '</a>',
+                    'support' => '<a href="' . esc_url( 'mailto: [email protected]' ) . '" aria-label="' . esc_attr__( 'Get support from Viva.com Team', 'viva-com-smart-for-woocommerce' ) . '">' . esc_html__( 'Get support', 'viva-com-smart-for-woocommerce' ) . '</a>',
+                );
+                return array_merge( $links, $row_meta );
+            }
+            return (array) $links;
+        }
+
+        /**
+         * Sets up the plugin's locale for translation.
+         *
+         * @return void
+         */
+        public function setup_locale(): void {
+            add_filter( 'plugin_locale', array( $this, 'woocommerce_vivacom_smart_fix_locale' ), 99, 2 );
+            load_plugin_textdomain( 'viva-com-smart-for-woocommerce', false, plugin_basename( __DIR__ ) . '/languages' );
+        }
+
+        /**
+         * Vivacom_fix_locale
+         *
+         * @param string $locale locale.
+         * @param string $domain domain.
+         * @return string
+         */
+        public function woocommerce_vivacom_smart_fix_locale( $locale, $domain ) {
+            if ( 'viva-com-smart-for-woocommerce' === $domain ) {
+                $locale = substr( $locale, 0, 2 );
+            }
+            return $locale;
+        }
+
+        /**
+         * Prints error notices for the plugin.
+         *
+         * @param array $notices An array of notice messages to be displayed.
+         *
+         * @return void
+         */
+        public function print_notices( array $notices ) {
+            foreach ( $notices as $notice ) {
+                echo '<div class="notice notice-error"><p><strong>' . esc_html( $notice ) . '</strong></p></div>';
+            }
+        }
+
+        /**
+         * Creates the Viva orders table in the WordPress database.
+         *
+         * @return void
+         */
+        private function create_orders_table(): void {
+            $charset_collate = $this->wpdb()->get_charset_collate();
+            $db_prefix       = $this->wpdb()->prefix;
+
+            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_orders
                     ( 
                         id int(11) NOT NULL AUTO_INCREMENT,
@@ -318 +379 @@
                         INDEX(vivacom_order_code)
                     ) $charset_collate;";
-            dbDelta( $sql );
-        }
-
-        private function create_transaction_types_table() : void {
-            $charset_collate = $this->wpdb()->get_charset_collate();
-            $db_prefix =$this->wpdb()->prefix;
-
-            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_transaction_types
+            dbDelta( $sql );
+        }
+
+        /**
+         * Creates the Viva transaction types table in the WordPress database.
+         *
+         * @return void
+         */
+        private function create_transaction_types_table(): void {
+            $charset_collate = $this->wpdb()->get_charset_collate();
+            $db_prefix       = $this->wpdb()->prefix;
+
+            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_transaction_types
                     (
                         id int(11) NOT NULL AUTO_INCREMENT,
@@ -332 +398 @@
                         UNIQUE(name)
                     ) $charset_collate;";
-            dbDelta( $sql );
-        }
-
-        private function create_transactions_table() : void {
-            $charset_collate = $this->wpdb()->get_charset_collate();
-            $db_prefix =$this->wpdb()->prefix;
-
-            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_transactions
+            dbDelta( $sql );
+        }
+
+        /**
+         * Creates the Viva transactions table in the WordPress database.
+         *
+         * @return void
+         */
+        private function create_transactions_table(): void {
+            $charset_collate = $this->wpdb()->get_charset_collate();
+            $db_prefix       = $this->wpdb()->prefix;
+
+            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_transactions
                     (
                         id int(11) NOT NULL AUTO_INCREMENT,
@@ -354 +425 @@
                         FOREIGN KEY(transaction_type_id) REFERENCES {$db_prefix}viva_com_smart_wc_checkout_transaction_types (id)
                     ) $charset_collate;";
-            dbDelta( $sql );
-        }
-
-        private function create_recurring_table() : void {
-            $charset_collate = $this->wpdb()->get_charset_collate();
-            $db_prefix =$this->wpdb()->prefix;
-
-            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_recurring
+            dbDelta( $sql );
+        }
+
+        /**
+         * Creates the Viva recurring table in the WordPress database.
+         *
+         * @return void
+         */
+        private function create_recurring_table(): void {
+            $charset_collate = $this->wpdb()->get_charset_collate();
+            $db_prefix       = $this->wpdb()->prefix;
+
+            $sql = "CREATE TABLE IF NOT EXISTS {$db_prefix}viva_com_smart_wc_checkout_recurring
                     (
                         id int(11) NOT NULL AUTO_INCREMENT,
@@ -375 +451 @@
                         FOREIGN KEY(transaction_id) REFERENCES {$db_prefix}viva_com_smart_wc_checkout_transactions (id)
                     ) $charset_collate;";
-            dbDelta( $sql );
-        }
-
-        private function insert_transaction_types() : void {
-            $db_prefix =$this->wpdb()->prefix;
-
-            $transaction_types = $this->wpdb()->get_results(
-                "SELECT name FROM {$db_prefix}viva_com_smart_wc_checkout_transaction_types",
-                ARRAY_A
-            );
-            $missing_types = array_diff(['payment', 'refund', 'preauthorization', 'capture', 'void'], array_column($transaction_types, 'name'));
-            $insert_types = array_map(function ($value) {
-                return ['name' => $value];
-            }, $missing_types);
-            foreach ($insert_types as $insert_type) {
-                $result = $this->wpdb()->insert(
-                    "{$db_prefix}viva_com_smart_wc_checkout_transaction_types",
-                    $insert_type
-                );
-                if ( false === $result ) {
-                    WC_Vivacom_Smart_Logger::log( 'Failed to insert transaction types to db.' );
-                }
-            }
-        }
-
-        private function wpdb() {
-            global $wpdb;
-            return $wpdb;
-        }
-
-        public function activate() : void {
-            require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-            $this->create_orders_table();
-            $this->create_transaction_types_table();
-            $this->create_transactions_table();
-            $this->create_recurring_table();
-            $this->insert_transaction_types();
-        }
-
-        public function deactivate() : void {
-
-        }
-
-        public static function uninstall() : void {
-//            global $wpdb;
-//            // Delete all options
-//            delete_option('woocommerce_vivacom_smart_settings');
-//            delete_transient('viva_com_smart_wc_admin_notice');
-//
-//            // Delete all tables
-//            $db_prefix = $wpdb->prefix;
-//            $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_transaction_types");
-//            $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_recurring");
-//            $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_transactions");
-//            $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_orders");
-        }
-    }
+            dbDelta( $sql );
+        }
+
+        /**
+         * Inserts missing transaction types into the database.
+         *
+         * @return void
+         */
+        private function insert_transaction_types(): void {
+            $db_prefix = $this->wpdb()->prefix;
+
+            $transaction_types = $this->wpdb()->get_results(
+                "SELECT name FROM {$db_prefix}viva_com_smart_wc_checkout_transaction_types",
+                ARRAY_A
+            );
+            $missing_types     = array_diff( array( 'payment', 'refund', 'preauthorization', 'capture', 'void' ), array_column( $transaction_types, 'name' ) );
+            $insert_types      = array_map(
+                function ( $value ) {
+                    return array( 'name' => $value );
+                },
+                $missing_types
+            );
+            foreach ( $insert_types as $insert_type ) {
+                $result = $this->wpdb()->insert(
+                    "{$db_prefix}viva_com_smart_wc_checkout_transaction_types",
+                    $insert_type
+                );
+                if ( false === $result ) {
+                    WC_Vivacom_Smart_Logger::log( 'Failed to insert transaction types to db.' );
+                }
+            }
+        }
+
+        /**
+         * Retrieves the global WordPress database object.
+         *
+         * @return wpdb The global WordPress database object.
+         */
+        private function wpdb() {
+            global $wpdb;
+            return $wpdb;
+        }
+
+        /**
+         * Activates the plugin and sets up the necessary database tables.
+         *
+         * @return void
+         */
+        public function activate(): void {
+            require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+            $this->create_orders_table();
+            $this->create_transaction_types_table();
+            $this->create_transactions_table();
+            $this->create_recurring_table();
+            $this->insert_transaction_types();
+        }
+
+        /**
+         * Deactivates the plugin.
+         *
+         * @return void
+         */
+        public function deactivate(): void {
+        }
+
+        /**
+         * Unistall the plugin.
+         *
+         * @return void
+         */
+        public static function uninstall(): void {
+            // global $wpdb;
+            // Delete all options
+            // delete_option('woocommerce_vivacom_smart_settings');
+            // delete_transient('viva_com_smart_wc_admin_notice');
+            //
+            // Delete all tables
+            // $db_prefix = $wpdb->prefix;
+            // $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_transaction_types");
+            // $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_recurring");
+            // $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_transactions");
+            // $wpdb->query("DROP TABLE IF EXISTS {$db_prefix}viva_com_smart_wc_checkout_orders");
+        }
+    }
 }
 
 $vivacom = WC_Vivacom_Smart::get_instance();
 
-register_activation_hook(__FILE__, [ $vivacom, 'activate' ]);
-
-register_deactivation_hook(__FILE__, [ $vivacom, 'deactivate' ]);
-
-//register_uninstall_hook(__FILE__, [ WC_Vivacom_Smart::class, 'uninstall' ]);
+register_activation_hook( __FILE__, array( $vivacom, 'activate' ) );
+
+register_deactivation_hook( __FILE__, array( $vivacom, 'deactivate' ) );
+
+// register_uninstall_hook(__FILE__, [ WC_Vivacom_Smart::class, 'uninstall' ]);