@automattic/newspack-blocks 4.12.3 → 4.13.0

package/src/modal-checkout/templates/thankyou.php

@@ -11,7 +11,7 @@
 
 namespace Newspack_Blocks;
 
-use Newspack_Blocks\Tracking\Data_Events;
+use Newspack_Blocks\Modal_Checkout\Checkout_Data;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -43,10 +43,7 @@ function newspack_blocks_replace_login_with_order_summary() {
 	$after_success_behavior = isset( $_GET['after_success_behavior'] ) ? \sanitize_text_field( \wp_unslash( $_GET['after_success_behavior'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 	$after_success_url      = isset( $_GET['after_success_url'] ) ? esc_url( \sanitize_url( \wp_unslash( $_GET['after_success_url'] ) ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 	$after_success_label    = isset( $_GET['after_success_button_label'] ) ? \sanitize_text_field( \wp_unslash( $_GET['after_success_button_label'] ) ) : \Newspack_Blocks\Modal_Checkout::get_modal_checkout_labels( 'after_success' ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-	$order_items            = $order->get_items();
-	$item                   = reset( $order_items );
-	$product_id             = $item ? $item->get_product_id() : null;
-	$data_order_details     = Data_Events::build_js_data_events( $product_id, null, $order );
+	$checkout_data          = Checkout_Data::get_checkout_data( $order );
 	?>
 	<div class="woocommerce-order">
 	<?php if ( $is_success ) : ?>
@@ -57,7 +54,7 @@ function newspack_blocks_replace_login_with_order_summary() {
 					<path d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"></path>
 				</svg>
 			</span>
-			<p id="modal-checkout-product-details" data-order-details='<?php echo wp_json_encode( $data_order_details ); ?>'>
+			<p id="modal-checkout-product-details" data-checkout='<?php echo wp_json_encode( $checkout_data ); ?>'>
 				<strong>
 					<?php
 						echo esc_html( Modal_Checkout::get_post_checkout_success_text() );

package/src/modal-checkout/utils.js

@@ -40,3 +40,129 @@ export function createHiddenInput( name, value = null ) {
 
 	return input;
 }
+
+/**
+ * Run a callback when an iframe is ready.
+ *
+ * @param {HTMLIFrameElement} iframe The iframe element.
+ * @param {Function}          cb     The callback to execute when the iframe is ready.
+ *
+ * @return {void}
+ */
+export function iframeReady( iframe, cb ) {
+	if ( iframe._readyTimer ) {
+		clearTimeout( iframe._readyTimer );
+	}
+	let fired = false;
+
+	function ready() {
+		if ( ! fired ) {
+			fired = true;
+			clearTimeout( iframe._readyTimer );
+			cb.call( this );
+		}
+	}
+	function readyState() {
+		if ( this.readyState === "complete" ) {
+			ready.call( this );
+		}
+	}
+	function checkLoaded() {
+		if ( iframe._ready ) {
+			clearTimeout( iframe._readyTimer );
+			return;
+		}
+		const doc = iframe.contentDocument || iframe.contentWindow?.document;
+		if ( doc && doc.URL.indexOf('about:') !== 0 ) {
+			if ( doc?.readyState === 'complete' ) {
+				ready.call( doc );
+			} else {
+				doc.addEventListener( 'DOMContentLoaded', ready );
+				doc.addEventListener( 'readystatechange', readyState );
+			}
+		} else {
+			iframe._readyTimer = setTimeout( checkLoaded, 10 );
+		}
+	}
+	checkLoaded();
+}
+
+/**
+ * Trigger a form submit.
+ *
+ * @param {HTMLFormElement} form The form element.
+ *
+ * @return {void}
+ */
+export function triggerFormSubmit( form ) {
+	// form.submit does not trigger submit event listener, so we use requestSubmit.
+	form.requestSubmit( form.querySelector( 'button[type="submit"]' ) );
+}
+
+/**
+ * Get checkout data from an element or its ID.
+ *
+ * @param {HTMLElement|string} element HTML element or its ID to get checkout data from.
+ *
+ * @return {Object} Checkout data.
+ */
+export function getCheckoutData( element ) {
+	const container = typeof element === 'string' ? document.getElementById( element ) : element;
+	if ( ! container ) {
+		console.warn( 'No container found for checkout data' ); // eslint-disable-line no-console
+		return {};
+	}
+
+	let data = {};
+	// If the element is a form, get the form data.
+	if ( container.tagName === 'FORM' ) {
+		const formData = new FormData( container );
+		data = Object.fromEntries( formData );
+	}
+
+	const json = container.dataset.checkout;
+	if ( ! json ) {
+		console.warn( 'No checkout data found' ); // eslint-disable-line no-console
+		return data;
+	}
+
+	try {
+		data = {
+			...data,
+			...JSON.parse( json ),
+		};
+	} catch ( error ) {
+		console.warn( 'Error parsing checkout data' ); // eslint-disable-line no-console
+	}
+
+	// Overwrite the action type with the value from the URL.
+	const url = new URL( container.ownerDocument.defaultView.location.href );
+	if ( url.searchParams.get( 'action_type' ) ) {
+		data.action_type = url.searchParams.get( 'action_type' );
+	}
+
+	// Replace 'memberships_content_gate' with 'gate_post_id'.
+	if ( data.memberships_content_gate ) {
+		data.gate_post_id = data.memberships_content_gate;
+		delete data.memberships_content_gate;
+	}
+
+	return data;
+}
+
+
+/**
+ * Get formatted amount for price summary display.
+ *
+ * @param {number} amount   The amount to format.
+ * @param {string} currency The currency to format the amount in.
+ *
+ * @return {string} The formatted amount.
+ */
+export function getFormattedAmount( amount, currency = 'USD' ) {
+	return parseFloat( amount ).toLocaleString( document.documentElement.lang, {
+		style: 'currency',
+		currency,
+		currencyDisplay: 'narrowSymbol',
+	} );
+}

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit9e2e8e314628d5030f6030b973fa296b::getLoader();
+return ComposerAutoloaderInit15a9301f3620998e3c1693d6c9682cba::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit9e2e8e314628d5030f6030b973fa296b
+class ComposerAutoloaderInit15a9301f3620998e3c1693d6c9682cba
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit9e2e8e314628d5030f6030b973fa296b
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit9e2e8e314628d5030f6030b973fa296b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit15a9301f3620998e3c1693d6c9682cba', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit9e2e8e314628d5030f6030b973fa296b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit15a9301f3620998e3c1693d6c9682cba', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit9e2e8e314628d5030f6030b973fa296b::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit15a9301f3620998e3c1693d6c9682cba::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit9e2e8e314628d5030f6030b973fa296b
+class ComposerStaticInit15a9301f3620998e3c1693d6c9682cba
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit9e2e8e314628d5030f6030b973fa296b
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit9e2e8e314628d5030f6030b973fa296b::$classMap;
+            $loader->classMap = ComposerStaticInit15a9301f3620998e3c1693d6c9682cba::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '290edd51f246a797ec47a035fbad0aa5ae086d31',
+        'reference' => '9fa339167934e8287b2ba0a9bad159c6dbdf642a',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '290edd51f246a797ec47a035fbad0aa5ae086d31',
+            'reference' => '9fa339167934e8287b2ba0a9bad159c6dbdf642a',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),