[UI]update market place wording and UI (#18527)

* update market place.

update market place.

* update language

update language

* revert language change

revert language change

* Update plugins/Marketplace/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* update screenshots

update screenshots

* update wording and array

update wording and array

* Update getPremiumFeatures.twig

remove red color

* update bundle special label

update bundle special label

* built vue files

* Update GetPremiumFeatures.php

update to fits php 8.0

* Update UserPermissionsEdit.vue

update tests error

* built vue files

* Update UserPermissionsEdit.vue

p to br

* built vue files

* Update UserPermissionsEdit.vue

revert change

Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: peterhashair <peterhashair@users.noreply.github.com>

12 files changed, 28 insertions, 18 deletions

diff --git a/core/ProfessionalServices/Advertising.php b/core/ProfessionalServices/Advertising.php
index 852a992d80..163b366e7b 100644
--- a/core/ProfessionalServices/Advertising.php
+++ b/core/ProfessionalServices/Advertising.php
@@ -93,6 +93,7 @@ class Advertising
     }
 
     /**
+     * @deprecated
      * Generates campaign URL parameters that can be used with promoting Professional Support service.
      *
      * @param string $campaignName
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 413d77aeb6..91b0283c19 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -458,7 +458,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->addForm($form);
 
         $view->showNextStep = false;
-        $view->linkToProfessionalServices = StaticContainer::get('Piwik\ProfessionalServices\Advertising')->getPromoUrlForProfessionalServices($medium = 'App_InstallationFinished');
         $output = $view->render();
 
         return $output;
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 52d7c8fd46..79d02318d1 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -20,10 +20,10 @@
     {% if areAdsForProfessionalServicesEnabled %}
         <h3>{{ 'Installation_ProfessionalServicesAdTitle'|translate }}</h3>
         <p>
-            {{ 'Installation_ProfessionalServicesfessionalServicesAdText'|translate }}
+            {{ 'Installation_ProfessionalServicesfessionalServicesAdText'|translate('<a rel="noreferrer noopener" target="_blank" href="https://plugins.matomo.org/premium?pk_campaign=App_ProfessionalServices&pk_medium=App_InstallationFinished&pk_source=Matomo_App">','</a>','<a rel="noreferrer noopener" target="_blank" href="https://matomo.org/support-plans/?pk_campaign=App_ProfessionalServices&pk_medium=App_InstallationFinished&pk_source=Matomo_App">')|raw }}
         </p>
         <p>
-            {{ 'Installation_ProfessionalServicesfessionalDiscoverHow'|translate('<a rel="noreferrer noopener" target="_blank" href="' ~ linkToProfessionalServices ~ '">','</a>')|raw }}
+            {{ 'Installation_ProfessionalServicesfessionalDiscoverHow'|translate('<a rel="noreferrer noopener" target="_blank" href="https://matomo.org/matomo-cloud/?pk_campaign=App_ProfessionalServices&pk_medium=App_InstallationFinished&pk_source=Matomo_App">','</a>')|raw }}
         </p>
     {% endif %}
 
diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
index 8f27f8745f..7569797e05 100644
--- a/plugins/Marketplace/Widgets/GetPremiumFeatures.php
+++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
@@ -45,8 +45,9 @@ class GetPremiumFeatures extends Widget
 
         $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_PAID);
 
-        $plugins = array_filter($plugins, function ($plugin) {
-            return empty($plugin['isBundle']);
+        //sort array by bundle first
+        usort($plugins, function ($item1, $item2) {
+            return $item1['isBundle'] < $item2['isBundle'] ? 1 : -1;
         });
 
         if (empty($plugins)) {
diff --git a/plugins/Marketplace/lang/en.json b/plugins/Marketplace/lang/en.json
index 84177ce76d..c139182f02 100644
--- a/plugins/Marketplace/lang/en.json
+++ b/plugins/Marketplace/lang/en.json
@@ -8,6 +8,10 @@
         "AllowedUploadFormats": "You may upload a plugin or theme in .zip format via this page.",
         "Authors": "Authors",
         "Browse": "Browse",
+        "TryFreeTrialTitle": "Try 30 days for free, then",
+        "FreeTrialLabel" : "Free Trial",
+        "SpecialOffer": "Special Offer",
+        "TrialHints": "All premium features come with a %1$sfree 30-day trial%2$s. It is risk-free and there are no strings attached.",
         "SupportMatomoThankYou": "Any purchase will help fund the future of the Matomo open-source project. Thank you for your support!",
         "LatestMarketplaceUpdates": "Latest Marketplace Updates",
         "BackToMarketplace": "Back to Marketplace",
diff --git a/plugins/Marketplace/templates/getPremiumFeatures.twig b/plugins/Marketplace/templates/getPremiumFeatures.twig
index 3663ff69c0..c0cc827478 100644
--- a/plugins/Marketplace/templates/getPremiumFeatures.twig
+++ b/plugins/Marketplace/templates/getPremiumFeatures.twig
@@ -1,14 +1,20 @@
 <div class="getNewPlugins getPremiumFeatures widgetBody">
     <div class="row">
         <div class="col s12 m12">
-            <h3 style="margin-bottom: 28px;">{{ 'Marketplace_SupportMatomoThankYou'|translate }}</h3></div>
+            <h3 style="font-weight: bold;color: #5bb75b">{{ 'Marketplace_TrialHints'|translate("<a style='color:#5bb75b;text-decoration: underline;' href='https://shop.matomo.org/free-trial/' target='_blank' rel='nofollo'>","</a>")|raw }}</h3>
+            <h3 style="margin-bottom: 28px;color: #5bb75b">{{ 'Marketplace_SupportMatomoThankYou'|translate }} <i class='icon-heart red-text'></i></h3></div>
 
         {% for plugin in plugins %}
             <div class="col s12 m4">
 
                 <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3>
+                {% if plugin.specialOffer !='' %}
+                <span class="pluginSubtitle">
+                    <span>{{ 'Marketplace_SpecialOffer'|translate }}:</span> {{ plugin.specialOffer }}
+                </span>
+                {% endif %}
                 <span class="pluginBody">
-                    {{ plugin.description }}
+                    {% if plugin.isBundle %} {{ 'Marketplace_SpecialOffer'|translate }}: {% endif %}{{ plugin.description }}
                     <br />
                     <a href="javascript:;" class="pluginMoreDetails" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ 'General_MoreDetails'|translate }}</a>
                 </span>
diff --git a/plugins/Marketplace/templates/plugin-details.twig b/plugins/Marketplace/templates/plugin-details.twig
index 1cdfc2a079..794e6fed0e 100644
--- a/plugins/Marketplace/templates/plugin-details.twig
+++ b/plugins/Marketplace/templates/plugin-details.twig
@@ -123,6 +123,7 @@
 
                                     {% if plugin.shop.variations|length %}
 
+                                        <h4 style="color:#5bb75b;font-weight: bold;font-size: 1.2em;">{{ 'Marketplace_TryFreeTrialTitle'|translate }}</h4>
                                         <div class="input-field variationPicker">
                                             <select title="{{ 'Marketplace_ShownPriceIsExclTax'|translate|e('html_attr') }} {{ 'Marketplace_CurrentNumPiwikUsers'|translate(numUsers)|e('html_attr') }}">
                                                 {% for variation in plugin.shop.variations %}
diff --git a/plugins/Marketplace/templates/plugin-list.twig b/plugins/Marketplace/templates/plugin-list.twig
index a8d13dcb87..d225ce5439 100644
--- a/plugins/Marketplace/templates/plugin-list.twig
+++ b/plugins/Marketplace/templates/plugin-list.twig
@@ -70,7 +70,7 @@
                                     {% else %}
                                         {{ 'General_MoreDetails'|translate }}
                                     {% endif %}
-
+                                    <span style="white-space: nowrap;">({{ 'Marketplace_FreeTrialLabel'|translate }})</span>
                                 </a>
                             {% endmacro %}
 
@@ -86,7 +86,6 @@
                                         </div>
 
                                     {% elseif plugin.hasExceededLicense is defined and plugin.hasExceededLicense %}
-
                                         <div class="alert alert-danger">
                                             {{ 'Marketplace_LicenseExceeded'|translate }}
 
@@ -99,7 +98,6 @@
                                             {{ 'CoreUpdater_UpdateTitle'|translate }}
                                         </a>
                                     {% elseif plugin.missingRequirements|length > 0 or not isAutoUpdatePossible %}
-
                                         {% macro downloadButton(showOr, plugin, isAutoUpdatePossible, showBrackets = false) -%}
                                             {%- if plugin.missingRequirements|length == 0 and plugin.isDownloadable and not isAutoUpdatePossible -%}
                                                 {% if showBrackets %}({% endif %}<span onclick="$(this).css('display', 'none')">
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
index 5ed4d5a73b..d1c71b935a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8f4c2eccfb82d52d1f09ac6d4af7a8968c21c79a21096c92828ce8678ef5f6f
-size 76181
+oid sha256:8c3f32581b36e9fa22316e49ffd8d3735897fea2e6124473ad120fbebe9235b9
+size 79475
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
index 47f4f73d96..177b5051aa 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1454b85549aa8618cc001515b30a712e1afd37c0783a204b3666bdcfde29f69
-size 106456
+oid sha256:27f5d4e9b7938c00ebe3c7f35664f6f3e2031fa455abf09cfd3e9ce8d7de29ab
+size 110566
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
index 5521860fab..cfc6c7c38f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46cb19680cbd6081e728cc799c2bd5a7db6b256e1b90eb0aec576522f30c6ad8
-size 90142
+oid sha256:32ed63595ca25112fc7eab52634c70eafa0d237a5057f20eeb027d4869ab95d1
+size 93697
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
index 80e34ec955..6f7adc7be4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:209cd3420c768d7189b4cbaeb2d7435ad0c3bd9a2c9ff8df2b929cb338dfb069
-size 75797
+oid sha256:fb660529f02032a8c257cd49016063b717a3680998e987b541d564bdc88ca9c7
+size 79143