Skip to content

feat(ras): helper method for ESP master list #3355

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

Merged
miguelpeixe merged 2 commits into from
Aug 26, 2024
Merged

feat(ras): helper method for ESP master list #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3037cd4
feat(ras): helper method for ESP master list
miguelpeixe Aug 21, 2024
063bc1b
fix: ensure bool return
miguelpeixe Aug 21, 2024
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
2 changes: 1 addition & 1 deletion includes/data-events/connectors/class-activecampaign.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static function register_handlers() {
* @param string $context Context of the update for logging purposes.
*/
protected static function put( $contact, $context ) {
$master_list_id = Reader_Activation::get_setting( 'active_campaign_master_list' );
$master_list_id = Reader_Activation::get_esp_master_list_id( 'active_campaign' );
if ( ! $master_list_id ) {
return;
}
Expand Down
16 changes: 1 addition & 15 deletions includes/data-events/connectors/class-mailchimp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,6 @@ public static function register_handlers() {
}
}

/**
* Get audience ID.
*
* @return string|bool Audience ID or false if not set.
*/
private static function get_audience_id() {
$audience_id = Reader_Activation::get_setting( 'mailchimp_audience_id' );
/** Attempt to use list ID from "Mailchimp for WooCommerce" */
if ( ! $audience_id && function_exists( 'mailchimp_get_list_id' ) ) {
$audience_id = \mailchimp_get_list_id();
}
return ! empty( $audience_id ) ? $audience_id : false;
}

/**
* Get default reader MailChimp status.
*
Expand All @@ -83,7 +69,7 @@ private static function get_default_reader_status() {
* @return array|WP_Error response body or error.
*/
protected static function put( $contact, $context ) {
$audience_id = self::get_audience_id();
$audience_id = Reader_Activation::get_esp_master_list_id( 'mailchimp' );
if ( ! $audience_id ) {
return;
}
Expand Down
29 changes: 29 additions & 0 deletions includes/reader-activation/class-reader-activation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,35 @@ public static function is_esp_configured() {
return false;
}

/**
* Get the master list ID for the ESP.
*
* @param string $provider Optional ESP provider. Defaults to the configured ESP.
*
* @return string|bool Master list ID or false if not set or not available.
*/
public static function get_esp_master_list_id( $provider = '' ) {
if ( ! self::is_esp_configured() ) {
return false;
}
if ( empty( $provider ) ) {
$provider = \Newspack_Newsletters::service_provider();
}
switch ( $provider ) {
case 'active_campaign':
return self::get_setting( 'active_campaign_master_list' );
case 'mailchimp':
$audience_id = self::get_setting( 'mailchimp_audience_id' );
/** Attempt to use list ID from "Mailchimp for WooCommerce" */
if ( ! $audience_id && function_exists( 'mailchimp_get_list_id' ) ) {
$audience_id = \mailchimp_get_list_id();
}
return ! empty( $audience_id ) ? $audience_id : false;
default:
return false;
}
}

/**
* Get the newsletter lists that should be rendered during registration.
*
Expand Down