chore(release): merge in release v4.1.2

Automattic · Sep 17, 2024 · 51551e6 · 51551e6
2 parents c4e35c7 + 84396d7
commit 51551e6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [4.1.2](https://github.com/Automattic/newspack-blocks/compare/v4.1.1...v4.1.2) (2024-09-17)
+
+
+### Bug Fixes
+
+* **modal-checkout:** tweak HTML to satisfy Woo Payments field validation ([#1883](https://github.com/Automattic/newspack-blocks/issues/1883)) ([16b5e9d](https://github.com/Automattic/newspack-blocks/commit/16b5e9db840d7dfccd064776285221c66d92e7f2))
+
 ## [4.1.1](https://github.com/Automattic/newspack-blocks/compare/v4.1.0...v4.1.1) (2024-09-16)
 
 

diff --git a/newspack-blocks.php b/newspack-blocks.php
@@ -7,15 +7,15 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.1.1
+ * Version:         4.1.2
  *
  * @package         Newspack_Blocks
  */
 
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.1.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.1.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.1.1",
+	"version": "4.1.2",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",

diff --git a/src/modal-checkout/templates/checkout-form.php b/src/modal-checkout/templates/checkout-form.php
@@ -128,7 +128,10 @@
 					</select>
 					<span id="select2-billing_state-container" style="display:none;"></span>
 				<?php else : ?>
-					<input type="hidden" id="<?php echo esc_attr( 'billing_' . $key ); ?>" name="<?php echo esc_attr( 'billing_' . $key ); ?>" value="<?php echo esc_attr( $value ); ?>" />
+					<?php // Satisfy HTML structure for Woo Payments field validation. ?>
+					<span class="form-row" style="display:none;">
+						<input type="hidden" id="<?php echo esc_attr( 'billing_' . $key ); ?>" name="<?php echo esc_attr( 'billing_' . $key ); ?>" value="<?php echo esc_attr( $value ); ?>" />
+					</span>
 				<?php endif; ?>
 			<?php endforeach; ?>