rebase on oct-10-2023

wp/wp-content/plugins/woocommerce/templates/checkout/form-pay.php

@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 7.0.1
+ * @version 7.8.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -76,7 +76,9 @@ $totals = $order->get_order_item_totals(); // phpcs:ignore WordPress.WP.GlobalVa
 						wc_get_template( 'checkout/payment-method.php', array( 'gateway' => $gateway ) );
 					}
 				} else {
-					echo '<li class="woocommerce-notice woocommerce-notice--info woocommerce-info">' . apply_filters( 'woocommerce_no_available_payment_methods_message', esc_html__( 'Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) ) . '</li>'; // @codingStandardsIgnoreLine
+					echo '<li>';
+					wc_print_notice( apply_filters( 'woocommerce_no_available_payment_methods_message', esc_html__( 'Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) ), 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
+					echo '</li>';
 				}
 				?>
 			</ul>

wp/wp-content/plugins/woocommerce/templates/checkout/form-verify-email.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Email verification page.
+ *
+ * This displays instead of the thankyou page any time that the customer cannot be identified.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/checkout/thankyou-verify-email.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer) will need to copy
+ * the new files to your theme to maintain compatibility. We try to do this as little as possible, but it does happen.
+ * When this occurs the version of the template file will be bumped and the readme will list any important changes.
+ *
+ * @see     https://docs.woocommerce.com/document/template-structure/
+ * @package WooCommerce\Templates
+ * @version 7.9.0
+ *
+ * @var bool   $failed_submission Indicates if the last attempt to verify failed.
+ * @var string $verify_url        The URL for the email verification form.
+ */
+
+defined( 'ABSPATH' ) || exit;
+?>
+<form name="checkout" method="post" class="woocommerce-form woocommerce-verify-email" action="<?php echo esc_url( $verify_url ); ?>" enctype="multipart/form-data">
+
+	<?php
+	wp_nonce_field( 'wc_verify_email', 'check_submission' );
+
+	if ( $failed_submission ) {
+		wc_print_notice( esc_html__( 'We were unable to verify the email address you provided. Please try again.', 'woocommerce' ), 'error' );
+	}
+	?>
+	<p>
+		<?php
+		printf(
+			/* translators: 1: opening login link 2: closing login link */
+			esc_html__( 'To view this page, you must either %1$slogin%2$s or verify the email address associated with the order.', 'woocommerce' ),
+			'<a href="' . esc_url( wc_get_page_permalink( 'myaccount' ) ) . '">',
+			'</a>'
+		);
+		?>
+	</p>
+
+	<p class="form-row">
+		<label for="email"><?php esc_html_e( 'Email address', 'woocommerce' ); ?>&nbsp;<span class="required">*</span></label>
+		<input type="email" class="input-text" name="email" id="email" autocomplete="email" />
+	</p>
+
+	<p class="form-row">
+		<button type="submit" class="woocommerce-button button <?php echo esc_attr( wc_wp_theme_get_element_class_name( 'button' ) ); ?>" name="verify" value="1">
+			<?php esc_html_e( 'Verify', 'woocommerce' ); ?>
+		</button>
+	</p>
+</form>

wp/wp-content/plugins/woocommerce/templates/checkout/order-received.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * "Order received" message.
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/checkout/thankyou.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see https://docs.woocommerce.com/document/template-structure/
+ * @package WooCommerce\Templates
+ * @version 8.1.0
+ *
+ * @var WC_Order|false $order
+ */
+
+defined( 'ABSPATH' ) || exit;
+?>
+
+<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received">
+	<?php
+	/**
+	 * Filter the message shown after a checkout is complete.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @param string         $message The message.
+	 * @param WC_Order|false $order   The order created during checkout, or false if order data is not available.
+	 */
+	$message = apply_filters(
+		'woocommerce_thankyou_order_received_text',
+		__( 'Thank you. Your order has been received.', 'woocommerce' ),
+		$order
+	);
+
+	echo esc_html( $message );
+	?>
+</p>

wp/wp-content/plugins/woocommerce/templates/checkout/payment.php

@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 7.0.1
+ * @version 8.1.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -30,7 +30,9 @@ if ( ! wp_doing_ajax() ) {
 					wc_get_template( 'checkout/payment-method.php', array( 'gateway' => $gateway ) );
 				}
 			} else {
-				echo '<li class="woocommerce-notice woocommerce-notice--info woocommerce-info">' . apply_filters( 'woocommerce_no_available_payment_methods_message', WC()->customer->get_billing_country() ? esc_html__( 'Sorry, it seems that there are no available payment methods for your state. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) : esc_html__( 'Please fill in your details above to see available payment methods.', 'woocommerce' ) ) . '</li>'; // @codingStandardsIgnoreLine
+				echo '<li>';
+				wc_print_notice( apply_filters( 'woocommerce_no_available_payment_methods_message', WC()->customer->get_billing_country() ? esc_html__( 'Sorry, it seems that there are no available payment methods. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce' ) : esc_html__( 'Please fill in your details above to see available payment methods.', 'woocommerce' ) ), 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
+				echo '</li>';
 			}
 			?>
 		</ul>

wp/wp-content/plugins/woocommerce/templates/checkout/thankyou.php

@@ -12,7 +12,9 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 3.7.0
+ * @version 8.1.0
+ *
+ * @var WC_Order $order
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -39,7 +41,7 @@ defined( 'ABSPATH' ) || exit;
 
 		<?php else : ?>
 
-			<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
+			<?php wc_get_template( 'checkout/order-received.php', array( 'order' => $order ) ); ?>
 
 			<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 
@@ -81,7 +83,7 @@ defined( 'ABSPATH' ) || exit;
 
 	<?php else : ?>
 
-		<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'woocommerce' ), null ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
+		<?php wc_get_template( 'checkout/order-received.php', array( 'order' => false ) ); ?>
 
 	<?php endif; ?>