Adds measuarable settings to disable visits log and visitor profile (#16561)

* Adds measuarable settings to disable visits log and visitor profile

* updates expected test files

* Adds some UI tests to check deactivating visitor log / profile works

* code improvements

* more ui tests

* Adds global system settings to disable visits log / profile

* adds UI tests for system setting

* updates expected screenshots

* code improvement

* improve tests

* reset custom logo usage after test

* updates expected screenshots

* use transient cache

3 files changed, 14 insertions, 0 deletions

diff --git a/plugins/Ecommerce/Controller.php b/plugins/Ecommerce/Controller.php
index b3e4cf84a3..67c4f1fa66 100644
--- a/plugins/Ecommerce/Controller.php
+++ b/plugins/Ecommerce/Controller.php
@@ -13,7 +13,9 @@ use Piwik\Common;
 use Piwik\FrontController;
 use Piwik\Http;
 use Piwik\Piwik;
+use Piwik\Plugin\Manager;
 use Piwik\Plugins\Goals\API as GoalsApi;
+use Piwik\Plugins\Live\Live;
 use Piwik\Translation\Translator;
 use Piwik\View;
 use Piwik\Plugins\Goals\TranslationHelper;
@@ -91,6 +93,7 @@ class Controller extends \Piwik\Plugins\Goals\Controller
 
         $dataRow = $goalMetrics->getFirstRow();
 
+        $view->visitorLogEnabled = Manager::getInstance()->isPluginActivated('Live') && Live::isVisitorLogEnabled($this->idSite);
         $view->idSite = $this->idSite;
         $view->idGoal = $idGoal;
 
diff --git a/plugins/Ecommerce/Widgets/GetEcommerceLog.php b/plugins/Ecommerce/Widgets/GetEcommerceLog.php
index b77d7bed1c..a480e7aa14 100644
--- a/plugins/Ecommerce/Widgets/GetEcommerceLog.php
+++ b/plugins/Ecommerce/Widgets/GetEcommerceLog.php
@@ -9,6 +9,9 @@
 namespace Piwik\Plugins\Ecommerce\Widgets;
 
 use Piwik\Common;
+use Piwik\Plugin\Manager;
+use Piwik\Plugins\Live\Live;
+use Piwik\Plugins\Live\MeasurableSettings;
 use Piwik\Widget\WidgetConfig;
 use Piwik\Site;
 
@@ -28,6 +31,10 @@ class GetEcommerceLog extends \Piwik\Widget\Widget
 
         $site  = new Site($idSite);
         $config->setIsEnabled($site->isEcommerceEnabled());
+
+        if (!Manager::getInstance()->isPluginActivated('Live') || !Live::isVisitorLogEnabled($idSite)) {
+            $config->disable();
+        }
     }
 
 }
diff --git a/plugins/Ecommerce/templates/conversionOverview.twig b/plugins/Ecommerce/templates/conversionOverview.twig
index 98df3f6efe..e8672a2c84 100644
--- a/plugins/Ecommerce/templates/conversionOverview.twig
+++ b/plugins/Ecommerce/templates/conversionOverview.twig
@@ -1,6 +1,7 @@
 <div piwik-content-block
      content-title="{{ 'Goals_ConversionsOverview'|translate|e('html_attr') }}">
     <ul class="ulGoalTopElements">
+        <li>
         {{ 'General_ColumnRevenue'|translate }}: {{ revenue|money(idSite)|raw -}}
         {% if revenue_subtotal is not empty %},
             {{ 'General_Subtotal'|translate }}: {{ revenue_subtotal|money(idSite)|raw -}}
@@ -14,9 +15,12 @@
         {%- if revenue_discount is not empty -%},
             {{ 'General_Discount'|translate }}: {{ revenue_discount|money(idSite)|raw -}}
         {% endif %}
+        </li>
     </ul>
+    {% if visitorLogEnabled %}
     <a href="javascript:;" class="segmentedlog" onclick="SegmentedVisitorLog.show('Goals.getMetrics', 'visitConvertedGoalId=={{ idGoal }}', {})">
         <span class="icon-visitor-profile rowActionIcon"></span> {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
     </a>
+    {% endif %}
     <br style="clear:left"/>
 </div>
\ No newline at end of file