Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alpha release Oct 16 #1556

Merged
merged 19 commits into from
Oct 16, 2023
Merged

Alpha release Oct 16 #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4ac1df9
build(deps-dev): bump phpunit/phpunit from 9.6.11 to 9.6.12
dependabot[bot] Sep 18, 2023
f915842
chore(release): merge in release v1.74.1
matticbot Sep 18, 2023
b028b14
chore(release): merge in release v1.74.2
matticbot Sep 19, 2023
0d80e80
chore(release): merge in release v1.75.0
matticbot Sep 25, 2023
55e4be3
build(deps-dev): bump phpunit/phpunit from 9.6.12 to 9.6.13
dependabot[bot] Sep 25, 2023
814932e
chore(release): merge in release v1.75.1
matticbot Sep 28, 2023
ad7268a
fix(donate): allow "once" in tiers-based layout
adekbadek Sep 29, 2023
9755e40
fix(homepage-posts): check existing "specific posts" recursively for …
miguelpeixe Oct 2, 2023
bdfb3c2
feat: add option for a button after checkout (#1521)
leogermani Oct 3, 2023
02a7f5e
chore(release): merge in release v1.75.2
matticbot Oct 4, 2023
6acc719
feat(homepage-posts): support deduplication toggling (#1543)
miguelpeixe Oct 4, 2023
27ecf88
feat: remove AMP compatibility
adekbadek Oct 4, 2023
75ebe92
chore(release): merge in release v1.75.3
matticbot Oct 10, 2023
ad45179
Merge branch 'release'
miguelpeixe Oct 10, 2023
343b80b
fix: newspack.pub > newspack.com (#1552)
dkoo Oct 11, 2023
257c63f
chore(release): merge in release v1.75.4
matticbot Oct 11, 2023
814b062
chore(release): merge in release v1.75.5
matticbot Oct 12, 2023
02c2f12
build(deps): bump swiper from 9.3.2 to 10.3.1
dependabot[bot] Oct 2, 2023
f36f829
build(deps): bump @stripe/stripe-js from 1.54.2 to 2.1.7
dependabot[bot] Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 0 additions & 87 deletions amp/homepage-articles/view.js
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 49 additions & 7 deletions includes/class-modal-checkout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,21 @@ public static function init() {
add_filter( 'woocommerce_checkout_get_value', [ __CLASS__, 'woocommerce_checkout_get_value' ], 10, 2 );
add_filter( 'woocommerce_checkout_fields', [ __CLASS__, 'woocommerce_checkout_fields' ] );
add_filter( 'woocommerce_update_order_review_fragments', [ __CLASS__, 'order_review_fragments' ] );
add_action( 'woocommerce_thankyou', [ __CLASS__, 'woocommerce_thankyou' ] ); // Core Woo, not present in Newspack theme custom template.
add_action( 'newspack_woocommerce_thankyou', [ __CLASS__, 'woocommerce_thankyou' ] ); // Newspack Theme.
}

/**
* Process checkout request for modal.
*/
public static function process_checkout_request() {
$is_newspack_checkout = filter_input( INPUT_GET, 'newspack_checkout', FILTER_SANITIZE_NUMBER_INT );
$product_id = filter_input( INPUT_GET, 'product_id', FILTER_SANITIZE_NUMBER_INT );
$variation_id = filter_input( INPUT_GET, 'variation_id', FILTER_SANITIZE_NUMBER_INT );
$is_newspack_checkout = filter_input( INPUT_GET, 'newspack_checkout', FILTER_SANITIZE_NUMBER_INT );
$product_id = filter_input( INPUT_GET, 'product_id', FILTER_SANITIZE_NUMBER_INT );
$variation_id = filter_input( INPUT_GET, 'variation_id', FILTER_SANITIZE_NUMBER_INT );
$after_success_behavior = filter_input( INPUT_GET, 'after_success_behavior', FILTER_SANITIZE_STRING );
$after_success_url = filter_input( INPUT_GET, 'after_success_url', FILTER_SANITIZE_STRING );
$after_success_button_label = filter_input( INPUT_GET, 'after_success_button_label', FILTER_SANITIZE_STRING );

if ( ! $is_newspack_checkout || ! $product_id ) {
return;
}
Expand All @@ -70,6 +76,8 @@ public static function process_checkout_request() {
wp_parse_str( $parsed_url['query'], $params );
}

$params = array_merge( $params, compact( 'after_success_behavior', 'after_success_url', 'after_success_button_label' ) );

if ( function_exists( 'wpcom_vip_url_to_postid' ) ) {
$referer_post_id = wpcom_vip_url_to_postid( $referer );
} else {
Expand Down Expand Up @@ -134,9 +142,9 @@ function ( $item ) {
}
$query_args['modal_checkout'] = 1;

// Pass through UTM params so they can be forwarded to the WooCommerce checkout flow.
// Pass through UTM and after_success params so they can be forwarded to the WooCommerce checkout flow.
foreach ( $params as $param => $value ) {
if ( 'utm' === substr( $param, 0, 3 ) ) {
if ( 'utm' === substr( $param, 0, 3 ) || 'after_success' === substr( $param, 0, 13 ) ) {
$param = sanitize_text_field( $param );
$query_args[ $param ] = sanitize_text_field( $value );
}
Expand Down Expand Up @@ -320,9 +328,13 @@ public static function woocommerce_get_return_url( $url, $order ) {
if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
return $url;
}

$args = [
'modal_checkout' => '1',
'email' => isset( $_REQUEST['billing_email'] ) ? rawurlencode( \sanitize_email( \wp_unslash( $_REQUEST['billing_email'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
'modal_checkout' => '1',
'email' => isset( $_REQUEST['billing_email'] ) ? rawurlencode( \sanitize_email( \wp_unslash( $_REQUEST['billing_email'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
'after_success_behavior' => isset( $_REQUEST['after_success_behavior'] ) ? rawurlencode( sanitize_text_field( wp_unslash( $_REQUEST['after_success_behavior'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
'after_success_url' => isset( $_REQUEST['after_success_url'] ) ? rawurlencode( sanitize_text_field( wp_unslash( $_REQUEST['after_success_url'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
'after_success_button_label' => isset( $_REQUEST['after_success_button_label'] ) ? rawurlencode( sanitize_text_field( wp_unslash( $_REQUEST['after_success_button_label'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
];

// Pass order ID for modal checkout templates.
Expand Down Expand Up @@ -547,5 +559,35 @@ public static function order_review_fragments( $fragments ) {
}
return $fragments;
}

/**
* Adds an additional button to the Thank you page
*
* @return void
*/
public static function woocommerce_thankyou() {
// phpcs:disable WordPress.Security.NonceVerification.Recommended
if (
empty( $_REQUEST['modal_checkout'] ) ||
empty( $_REQUEST['after_success_behavior'] ) ||
empty( $_REQUEST['after_success_url'] )
) {
return;
}

$button_label = ! empty( $_REQUEST['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_button_label'] ) ) : __( 'Continue browsing', 'newspack-blocks' );

?>
<a
class="button"
href="<?php echo esc_url( sanitize_text_field( wp_unslash( $_REQUEST['after_success_url'] ) ) ); ?>"
target="_top"
style="display:block;margin:16px 0;"
>
<?php echo esc_html( $button_label ); ?>
</a>
<?php
// phpcs:enable
}
}
Modal_Checkout::init();
Loading