diff --git a/.github/actions/tests/install-wordpress-with-plugins/action.yml b/.github/actions/tests/install-wordpress-with-plugins/action.yml index fb1bae3..f6f6df1 100644 --- a/.github/actions/tests/install-wordpress-with-plugins/action.yml +++ b/.github/actions/tests/install-wordpress-with-plugins/action.yml @@ -29,17 +29,24 @@ runs: run: | cd ${{ github.workspace }}/tests/cypress/e2e/${{ matrix.cypress-target }} plugins=$(cat ./installation-list.json | jq -r '.plugins[]') - for plugin in $plugins; do - echo "Installing $plugin plugin" - + for entry in $plugins; do + # Entries are "slug" or "slug@version" to pin a WordPress.org release. + plugin="${entry%@*}" + version="latest-stable" + if [[ "$entry" == *@* ]]; then + version="${entry#*@}" + fi + + echo "Installing $plugin plugin ($version)" + paid_plugin_path="${{ inputs.paid_plugins_dir }}/$plugin.zip" - + if [[ -f "$paid_plugin_path" ]]; then echo "Found paid plugin ZIP for $plugin in the paid plugins directory." unzip "$paid_plugin_path" -d ${{ github.workspace }}/wp-content/plugins/ else echo "No local ZIP for $plugin, downloading from WordPress repository." - curl -L -o "$plugin.zip" "https://downloads.wordpress.org/plugin/$plugin.latest-stable.zip" + curl -fL -o "$plugin.zip" "https://downloads.wordpress.org/plugin/$plugin.$version.zip" unzip "$plugin.zip" -d ${{ github.workspace }}/wp-content/plugins/ rm "$plugin.zip" fi diff --git a/assets/src/settings/statistics/components/aboutAppComponent.tsx b/assets/src/settings/statistics/components/aboutAppComponent.tsx index edf3133..0b01eca 100644 --- a/assets/src/settings/statistics/components/aboutAppComponent.tsx +++ b/assets/src/settings/statistics/components/aboutAppComponent.tsx @@ -16,7 +16,7 @@ class AboutAppComponent extends React.Component { } buttonComponentProperties={{ label: "Open the Portal", - href: "https://portal.prosopo.io", + href: "https://portal.prosopo.io/?utm_source=procaptcha-wp&utm_medium=plugin&utm_campaign=settings&utm_content=statistics-about", icon: "icon-[material-symbols--settings-account-box-outline]", }} /> diff --git a/assets/src/settings/statistics/components/trafficAnalyticsComponent.tsx b/assets/src/settings/statistics/components/trafficAnalyticsComponent.tsx index 1e47f6c..2953b56 100644 --- a/assets/src/settings/statistics/components/trafficAnalyticsComponent.tsx +++ b/assets/src/settings/statistics/components/trafficAnalyticsComponent.tsx @@ -63,7 +63,7 @@ class TrafficAnalyticsComponent extends React.Component diff --git a/prosopo-procaptcha/src/Settings/General/Upgrade_Tier/Upgrade_Tier_Banner.php b/prosopo-procaptcha/src/Settings/General/Upgrade_Tier/Upgrade_Tier_Banner.php index b453336..371c8c3 100644 --- a/prosopo-procaptcha/src/Settings/General/Upgrade_Tier/Upgrade_Tier_Banner.php +++ b/prosopo-procaptcha/src/Settings/General/Upgrade_Tier/Upgrade_Tier_Banner.php @@ -31,6 +31,6 @@ protected function setCustomDefaults(): void { ); $this->button_label = __( 'Upgrade', 'prosopo-procaptcha' ); - $this->button_url = 'https://portal.prosopo.io/'; + $this->button_url = 'https://portal.prosopo.io/?utm_source=procaptcha-wp&utm_medium=plugin&utm_campaign=settings&utm_content=upgrade-banner'; } } diff --git a/prosopo-procaptcha/src/Settings/General/settings.blade.php b/prosopo-procaptcha/src/Settings/General/settings.blade.php index c2c950d..e170146 100644 --- a/prosopo-procaptcha/src/Settings/General/settings.blade.php +++ b/prosopo-procaptcha/src/Settings/General/settings.blade.php @@ -13,7 +13,7 @@ {{ __( 'Prosopo Procaptcha', 'prosopo-procaptcha' ) }} + hover:text-black" href="https://prosopo.io/?utm_source=procaptcha-wp&utm_medium=plugin&utm_campaign=settings&utm_content=header" target="_blank"> {{ __( 'Visit Website', 'prosopo-procaptcha' ) }} {{ __( 'Visit Portal', 'prosopo-procaptcha' ) }} diff --git a/tests/cypress/e2e/form-plugins/installation-list.json b/tests/cypress/e2e/form-plugins/installation-list.json index daa345e..fa68db8 100644 --- a/tests/cypress/e2e/form-plugins/installation-list.json +++ b/tests/cypress/e2e/form-plugins/installation-list.json @@ -1,6 +1,6 @@ { "plugins": [ - "contact-form-7", + "contact-form-7@6.1.4", "everest-forms", "fluentform", "formidable",