Merge pull request #1518 from Automattic/alpha

Release Aug 24

CHANGELOG.md

@@ -1,3 +1,19 @@
+# [1.74.0-alpha.2](https://github.com/Automattic/newspack-blocks/compare/v1.74.0-alpha.1...v1.74.0-alpha.2) (2023-08-24)
+
+
+### Bug Fixes
+
+* make sure carousels without images aren't collapsed ([#1511](https://github.com/Automattic/newspack-blocks/issues/1511)) ([ee8c1cd](https://github.com/Automattic/newspack-blocks/commit/ee8c1cd8f181b97d2795ec6c6aa69283cf4067a9))
+* reduce post carousel font size for 5-6 slides ([#1510](https://github.com/Automattic/newspack-blocks/issues/1510)) ([daabad4](https://github.com/Automattic/newspack-blocks/commit/daabad4635925bb5e1a432102b65149f3b9ec71a))
+* support account creation on modal checkout ([#1516](https://github.com/Automattic/newspack-blocks/issues/1516)) ([51ae19d](https://github.com/Automattic/newspack-blocks/commit/51ae19d30f7b60428ebc293189e18d8a4abf5b76))
+
+# [1.74.0-alpha.1](https://github.com/Automattic/newspack-blocks/compare/v1.73.0...v1.74.0-alpha.1) (2023-08-17)
+
+
+### Features
+
+* Merge pull request [#1509](https://github.com/Automattic/newspack-blocks/issues/1509) from Automattic/master ([1280d07](https://github.com/Automattic/newspack-blocks/commit/1280d073b7ff12af84c7dc9907a80918e778038a))
+
 # [1.73.0](https://github.com/Automattic/newspack-blocks/compare/v1.72.2...v1.73.0) (2023-07-17)
 
 

includes/class-modal-checkout.php

@@ -337,9 +337,17 @@ public static function woocommerce_get_return_url( $url ) {
 	 * @return string Template file.
 	 */
 	public static function wc_get_template( $located, $template_name ) {
-		if ( 'checkout/form-checkout.php' === $template_name && isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$located = NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/modal-checkout/templates/checkout-form.php';
+		$custom_templates = [
+			'checkout/form-checkout.php' => 'src/modal-checkout/templates/checkout-form.php',
+			'checkout/form-billing.php'  => 'src/modal-checkout/templates/billing-form.php',
+		];
+
+		foreach ( $custom_templates as $original_template => $custom_template ) {
+			if ( $template_name === $original_template && isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$located = NEWSPACK_BLOCKS__PLUGIN_DIR . $custom_template;
+			}
 		}
+
 		return $located;
 	}
 
@@ -488,7 +496,7 @@ function( $field ) {
 	 *
 	 * @return bool
 	 */
-	private static function should_show_order_details() {
+	public static function should_show_order_details() {
 		$cart = \WC()->cart;
 		if ( $cart->is_empty() ) {
 			return false;

newspack-blocks.php

@@ -7,15 +7,15 @@
  * Author URI:      https://newspack.blog/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         1.73.0
+ * Version:         1.74.0-alpha.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', '1.73.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '1.74.0-alpha.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';