Adding embedded card JS in WC block separately.

omise · Aug 6, 2024 · 3bc8d36 · 3bc8d36
1 parent 23eecfb
commit 3bc8d36
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/includes/blocks/assets/js/build/credit_card.asset.php b/includes/blocks/assets/js/build/credit_card.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '5064f6bb58dd3352c00f30554738304a');
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '9d9c940edd665b09cdd8e15ab6212835');
diff --git a/includes/blocks/assets/js/build/credit_card.js b/includes/blocks/assets/js/build/credit_card.js
diff --git a/includes/blocks/gateways/omise-block-credit-card.php b/includes/blocks/gateways/omise-block-credit-card.php
@@ -45,6 +45,14 @@ public function get_payment_method_script_handles() {
             $script_asset = require_once __DIR__ .  '/../assets/js/build/credit_card.asset.php';
 
             if (is_array($script_asset)) {
+                wp_register_script(
+                    'embedded-js',
+                    plugins_url( '../../assets/javascripts/omise-embedded-card.js', __FILE__ ),
+                    [],
+                    OMISE_WOOCOMMERCE_PLUGIN_VERSION,
+                    true
+                );
+
                 wp_register_script(
                     "{$this->name}-payments-blocks",
                     plugin_dir_url( __DIR__ ) . 'assets/js/build/credit_card.js',

diff --git a/includes/class-omise-capabilities.php b/includes/class-omise-capabilities.php
@@ -95,22 +95,6 @@ public static function shouldCallApi() {
 		return $isPaymentPage || $isOmiseSettingPage || $isFromCheckout;
 	}
 
-	/**
-	 * Checks if checkout is the current page.
-	 *
-	 * @return boolean
-	 */
-	public static function better_is_checkout() {
-		$checkout_path    = wp_parse_url(wc_get_checkout_url(), PHP_URL_PATH);
-		$current_url_path = wp_parse_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]", PHP_URL_PATH);
-
-		return (
-			$checkout_path !== null
-			&& $current_url_path !== null
-			&& trailingslashit($checkout_path) === trailingslashit($current_url_path)
-		);
-	}
-
 	/**
 	 * @param string|null $pKey
 	 * @param string|null $sKey

diff --git a/tests/unit/includes/blocks/gateways/omise-block-credit-card-test.php b/tests/unit/includes/blocks/gateways/omise-block-credit-card-test.php
@@ -90,6 +90,7 @@ public function get_payment_method_script_handles()
         Monkey\Functions\expect('wp_script_is');
         Monkey\Functions\expect('wp_register_script');
         Monkey\Functions\expect('plugin_dir_url');
+        Monkey\Functions\expect('plugin_url');
         Monkey\Functions\expect('is_checkout')->andReturn(true);
         Monkey\Functions\expect('wc_string_to_bool')->andReturn(null);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '5064f6bb58dd3352c00f30554738304a');
		<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '9d9c940edd665b09cdd8e15ab6212835');