From fae6b9728274896fe729a50dca12be90f3da9000 Mon Sep 17 00:00:00 2001 From: Mwindo Date: Thu, 29 Jun 2023 17:38:29 -0400 Subject: [PATCH 1/4] refactor isEnabled to adsEnabled --- src/Organic/AdConfigSyncCommand.php | 7 +- src/Organic/AdminSettings.php | 131 ++++++++++++------------ src/Organic/AdsTxtSyncCommand.php | 2 +- src/Organic/ContentIdMapSyncCommand.php | 2 +- src/Organic/ContentSyncCommand.php | 2 +- src/Organic/GraphQL.php | 2 +- src/Organic/Organic.php | 65 ++++++++---- src/Organic/PageInjection.php | 2 +- src/Organic/SDK/OrganicSdk.php | 5 +- src/Organic/SimpleConfigSyncCommand.php | 2 +- 10 files changed, 125 insertions(+), 95 deletions(-) diff --git a/src/Organic/AdConfigSyncCommand.php b/src/Organic/AdConfigSyncCommand.php index 05411e1b..943976c1 100644 --- a/src/Organic/AdConfigSyncCommand.php +++ b/src/Organic/AdConfigSyncCommand.php @@ -49,8 +49,11 @@ public function run() { * @return void */ public function __invoke( $args ) { - // Only both trying if the API key is set - if ( ! $this->organic->isEnabledAndConfigured() ) { + // Only worth trying if Ads is enabled and the API key is set + if ( ! $this->organic->adsEnabled() ) { + $this->organic->warning( 'Cannot sync AdConfig: Ads not enabled!' ); + } + if ( ! $this->organic->isConfigured() ) { $this->organic->warning( 'Cannot sync AdConfig without Organic SDK API Key and Site ID' ); return; } diff --git a/src/Organic/AdminSettings.php b/src/Organic/AdminSettings.php index 95b14d27..37b33594 100644 --- a/src/Organic/AdminSettings.php +++ b/src/Organic/AdminSettings.php @@ -77,11 +77,6 @@ protected function updateSettings() { } // Organic Settings - $this->organic->updateOption( - 'organic::enabled', - isset( $_POST['organic_enabled'] ) ? true : false, - false - ); $this->organic->updateOption( 'organic::test_mode', isset( $_POST['organic_test_mode'] ) ? true : false, @@ -136,21 +131,6 @@ protected function updateSettings() { false ); - // Organic Affiliate - $this->organic->updateOption( - 'organic::affiliate_enabled', - isset( $_POST['organic_affiliate_enabled'] ) ? true : false, - false - ); - - // Organic Campaigns - $this->organic->updateOption( - 'organic::campaigns_enabled', - isset( $_POST['organic_campaigns_enabled'] ) ? true : false, - false - ); - - // Organic Ads $this->organic->updateOption( 'organic::feed_images', isset( $_POST['organic_feed_images'] ) ? true : false, @@ -168,16 +148,36 @@ protected function updateSettings() { ); $this->organic->setPostTypes( $val ); + // Organic Ads + $this->organic->updateOption( + 'organic::ads_enabled', + isset( $_POST['organic_ads_enabled'] ) ? true : false, + false + ); + $this->organic->updateOption( 'organic::content_foreground', isset( $_POST['organic_content_foreground'] ) ? true : false, false ); + // Organic Affiliate + $this->organic->updateOption( + 'organic::affiliate_enabled', + isset( $_POST['organic_affiliate_enabled'] ) ? true : false, + false + ); + + // Organic Campaigns + $this->organic->updateOption( + 'organic::campaigns_enabled', + isset( $_POST['organic_campaigns_enabled'] ) ? true : false, + false + ); + } public function showSettings() { - $enabled = $this->organic->getOption( 'organic::enabled' ); $test_mode = $this->organic->getOption( 'organic::test_mode' ); $organic_test = $this->organic->getOption( 'organic::percent_test' ); $organic_value = $this->organic->getOption( 'organic::test_value' ); @@ -190,6 +190,8 @@ public function showSettings() { $ad_slots_prefill_enabled = $this->organic->getOption( 'organic::ad_slots_prefill_enabled' ); $log_to_sentry = $this->organic->getOption( 'organic::log_to_sentry', true ); + $ads_enabled = $this->organic->getOption( 'organic::ads_enabled' ); + $affiliate_enabled = $this->organic->getOption( 'organic::affiliate_enabled' ); $campaigns_enabled = $this->organic->getOption( 'organic::campaigns_enabled' ); @@ -217,16 +219,6 @@ public function showSettings() {

Organic Settings

-

- -

- -
-

Organic Affiliate

- -
-

Organic Campaigns

+
+

+ Which post types from your CMS should be treated as content for synchronization with + the Organic Platform and as eligible for the Organic SDK to be loaded on? +

    + injectPostTypesList(); ?> +
+

+

Organic Ads

+
+

Organic Affiliate

-
-

- Which post types from your CMS should be treated as content for synchronization with - the Organic Platform and as eligible for the Organic SDK to be loaded on? -

    - injectPostTypesList(); ?> -
-

-
+
+

Organic Campaigns

+

+ +

+