Merge branch 'T3MjfsEy' into dev

assets/src/js/kekspay-blocks.js

@@ -0,0 +1,20 @@
+const settings = window.wc.wcSettings.getSetting( kekspayBlocksData.kekspayID + '_data', {} );
+const label    = window.wp.htmlEntities.decodeEntities( settings.title );
+
+const Content = () => {
+	return window.wp.htmlEntities.decodeEntities( settings.description );
+};
+
+const Kekspay_Gateway = {
+	name: kekspayBlocksData.kekspayID,
+	label: label,
+	content: Object( window.wp.element.createElement )( Content, null ),
+	edit: Object( window.wp.element.createElement )( Content, null ),
+	canMakePayment: () => true,
+	ariaLabel: label,
+	supports: {
+		features: settings.supports,
+	},
+};
+
+window.wc.wcBlocksRegistry.registerPaymentMethod( Kekspay_Gateway );

assets/src/scss/kekspay.scss

@@ -51,6 +51,7 @@
 }
 
 .kekspay-logo {
+	display: block;
   width:  300px;
   height: 129px;
   margin: 0 auto;

includes/core/class-kekspay-block-checkout.php

@@ -0,0 +1,50 @@
+<?php
+use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
+
+final class Kekspay_Block_Checkout extends AbstractPaymentMethodType {
+	private $gateway;
+
+	protected $name = KEKSPAY_PLUGIN_ID;
+
+	public function initialize() {
+		$this->settings = Kekspay_Data::get_settings();
+		$this->gateway  = Kekspay_Payment_Gateway::get_instance();
+	}
+
+	public function is_active() {
+		return $this->gateway->is_available();
+	}
+
+	public function get_payment_method_script_handles() {
+		wp_register_script(
+			'kekspay-blocks-script',
+			KEKSPAY_DIR_URL . 'assets/dist/js/kekspay-blocks.js',
+			[
+				'wc-blocks-registry',
+				'wc-settings',
+				'wp-element',
+				'wp-html-entities',
+				'wp-i18n',
+			],
+			KEKSPAY_PLUGIN_VERSION,
+			true
+		);
+
+		wp_localize_script(
+			'kekspay-blocks-script',
+			'kekspayBlocksData',
+			[
+				'kekspayID' => KEKSPAY_PLUGIN_ID,
+			]
+		);
+
+		return [ 'kekspay-blocks-script' ];
+	}
+
+	public function get_payment_method_data() {
+		return [
+			'title'       => $this->gateway->method_title,
+			'description' => $this->gateway->method_description,
+		];
+	}
+}

includes/core/class-kekspay-payment-gateway.php

@@ -12,6 +12,12 @@
 	 * Kekspay_Payment_Gateway class
 	 */
 	class Kekspay_Payment_Gateway extends WC_Payment_Gateway {
+		/**
+		 * Instance of the current class, null before first usage.
+		 *
+		 * @var WC_Kekspay
+		 */
+		protected static $instance = null;
 
 		/**
 		 * App data handler.
@@ -42,14 +48,19 @@ public function __construct() {
 			$this->title = esc_attr( Kekspay_Data::get_settings( 'title' ) );
 
 			$this->add_hooks();
+
+			self::$instance = $this;
 		}
 
 		/**
 		 * Register different hooks.
 		 */
 		private function add_hooks() {
 			add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, [ $this, 'process_admin_options' ] );
-			add_action( 'woocommerce_receipt_' . $this->id, [ $this, 'do_receipt_page' ] );
+
+			if ( ! self::$instance ) {
+				add_action( 'woocommerce_receipt_' . $this->id, [ $this, 'do_receipt_page' ] );
+			}
 		}
 
 		/**
@@ -217,5 +228,17 @@ public function process_refund( $order_id, $amount = null, $reason = '' ) {
 			return Kekspay_Connector::refund( $order, $amount );
 		}
 
+		/**
+		 * Return class instance.
+		 *
+		 * @static
+		 * @return Kekspay_Payment_Gateway
+		 */
+		public static function get_instance() {
+			if ( is_null( self::$instance ) ) {
+				self::$instance = new self();
+			}
+			return self::$instance;
+		}
 	}
 }

includes/utilities/class-kekspay-data.php

@@ -105,7 +105,7 @@ public static function test_mode() {
 				self::load_settings();
 			}
 
-			return 'yes' === self::$settings['in-test-mode'];
+			return isset( self::$settings['in-test-mode'] ) && 'yes' === self::$settings['in-test-mode'];
 		}
 
 		/**

readme.txt

@@ -2,9 +2,9 @@
 Contributors: erstebank
 Tags: kekspay, woocommerce, gateway, payment
 Requires at least: 6.3
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 7.4
-Stable tag: 2.0.0
+Stable tag: 2.1.0
 License: GPL v3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -49,6 +49,9 @@ For more installation options check the [official WordPress documentation](https
 
 == Changelog ==
 
+= 2.1.0 =
+* Add WooCommerce checkout blocks support.
+
 = 2.0.0 =
 * Drop PHP 7.2 support.
 

webpack.mix.js

@@ -16,6 +16,7 @@ if (!mix.inProduction()) {
 }
 
 mix.setPublicPath("./"); // set because of this issue: https://github.com/JeffreyWay/laravel-mix/issues/1126
+mix.js("assets/src/js/kekspay-blocks.js", "assets/dist/js/kekspay-blocks.js");
 mix.js("assets/src/js/kekspay-admin.js", "assets/dist/js/kekspay-admin.js");
 mix.js("assets/src/js/kekspay.js", "assets/dist/js/kekspay.js");
 

woocommerce-gateway-kekspay.php

@@ -3,7 +3,7 @@
  * Plugin Name:       KEKS Pay for WooCommerce
  * Plugin URI:        https://www.kekspay.hr/
  * Description:       Incredibly fast and user friendly payment method created by Erste Bank Croatia.
- * Version:           2.0.0
+ * Version:           2.1.0
  * Requires at least: 6.3
  * Requires PHP:      7.4
  * Author:            Erste bank Croatia
@@ -14,7 +14,7 @@
  * Domain Path:       /languages
  *
  * WC requires at least: 8.2
- * WC tested up to: 8.8
+ * WC tested up to: 9.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -51,17 +51,19 @@ function kekspay_admin_notice_missing_woocommerce() {
 }
 
 /**
- * Declare Kekspay plugin compatible with HPOS.
+ * Declare Kekspay plugin compatibility for certain WooCommerce features:
+ *        - HPOS
+ *        - Checkout Blocks
  *
  * @return  void
  */
-function kekspay_hpos_compatible() {
+function kekspay_wc_features_compatibility() {
 	if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
 		\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+		\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
 	}
 }
-add_action( 'before_woocommerce_init', 'kekspay_hpos_compatible' );
-
+add_action( 'before_woocommerce_init', 'kekspay_wc_features_compatibility' );
 
 if ( ! class_exists( 'WC_Kekspay' ) ) {
 	/**
@@ -106,6 +108,7 @@ protected function __construct() {
 			add_action( 'admin_init', [ $this, 'check_for_other_kekspay_gateways' ], 1 );
 			add_action( 'activated_plugin', [ $this, 'set_kekspay_plugins_check_required' ] );
 			add_action( 'woocommerce_admin_field_payment_gateways', [ $this, 'set_kekspay_plugins_check_required' ] );
+			add_action( 'woocommerce_blocks_loaded', [ $this, 'register_checkout_block_gateway' ] );
 		}
 
 		/**
@@ -116,7 +119,7 @@ public static function register_constants() {
 				define( 'KEKSPAY_PLUGIN_ID', 'erste-kekspay-woocommerce' );
 			}
 			if ( ! defined( 'KEKSPAY_PLUGIN_VERSION' ) ) {
-				define( 'KEKSPAY_PLUGIN_VERSION', '2.0.0' );
+				define( 'KEKSPAY_PLUGIN_VERSION', '2.1.0' );
 			}
 			if ( ! defined( 'KEKSPAY_DIR_PATH' ) ) {
 				define( 'KEKSPAY_DIR_PATH', plugin_dir_path( __FILE__ ) );
@@ -243,6 +246,24 @@ public static function set_kekspay_plugins_check_required() {
 			update_option( 'kekspay_plugins_check_required', 'yes' );
 		}
 
+		/**
+		 * Register Kekspay method for block checkout.
+		 */
+		public function register_checkout_block_gateway() {
+			if ( ! class_exists( 'Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType' ) ) {
+				return;
+			}
+
+			require_once KEKSPAY_DIR_PATH . 'includes/core/class-kekspay-block-checkout.php';
+
+			add_action(
+				'woocommerce_blocks_payment_method_type_registration',
+				function( Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
+					$payment_method_registry->register( new Kekspay_Block_Checkout() );
+				}
+			);
+		}
+
 		/**
 		 * Deactivate plugin.
 		 */