Merge pull request #44 from PrestaShop/dev

Release 2.1.1

Author: Hlavtox

README.md

@@ -4,6 +4,23 @@
 
 Check in one glance what is happening on your store with a list of KPI on your dashboard.
 
+## Compatibility
+
+PrestaShop: `1.7.7.0` or later
+
+## How to test
+Link to specs: https://docs.prestashop-project.org/functional-documentation/functional-documentation/ux-ui/back-office/improve/modules/product-comments-productcomments
+
+Link to test scenario: https://build.prestashop-project.org/test-scenarios/scenarios/modules/dashactivity.html
+
+In `BO > Modules`, check that the module dashactivity is enabled.
+
+Check if specific UI blocks on the main Prestashop dashboard page exist.
+
+On dashboard page, check if Activity overview block exists.
+
+Check the different blocks: Online visitors / Active Shopping Carts / Currently pending / Notifications / Customers & Newsletters / Traffic
+
 ## Reporting issues
 
 You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. 
@@ -19,6 +36,6 @@ Just make sure to follow our [contribution guidelines][contribution-guidelines].
 This module is released under the [Academic Free License 3.0][AFL-3.0] 
 
 [report-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
-[prestashop]: https://www.prestashop.com/
+[prestashop]: https://www.prestashop-project.org/
 [contribution-guidelines]: https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/project-modules/
 [AFL-3.0]: https://opensource.org/licenses/AFL-3.0

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>dashactivity</name>
 	<displayName><![CDATA[Dashboard Activity]]></displayName>
-	<version><![CDATA[2.1.0]]></version>
+	<version><![CDATA[2.1.1]]></version>
 	<description><![CDATA[]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[dashboard]]></tab>

dashactivity.php

@@ -35,7 +35,7 @@ public function __construct()
     {
         $this->name = 'dashactivity';
         $this->tab = 'administration';
-        $this->version = '2.1.0';
+        $this->version = '2.1.1';
         $this->author = 'PrestaShop';
 
         parent::__construct();
@@ -149,7 +149,7 @@ public function hookDashboardData($params)
         extract($row);
 
         if ($maintenance_ips = Configuration::get('PS_MAINTENANCE_IP')) {
-            $maintenance_ips = implode(',', array_map('ip2long', array_map('trim', explode(',', $maintenance_ips))));
+            $maintenance_ips = implode(',', array_filter(array_map('ip2long', array_map('trim', explode(',', $maintenance_ips))), '\strlen'));
         }
         if (Configuration::get('PS_STATSDATA_CUSTOMER_PAGESVIEWS')) {
             $sql = 'SELECT c.id_guest, c.ip_address, c.date_add, c.http_referer, pt.name as page

logo.gif

@@ -40,6 +40,7 @@
 	</section>
 	<section id="dash_live" class="loading">
 		<ul class="data_list_large">
+			{if Module::isEnabled('statslive')}
 			<li>
 				<span class="data_label size_l">
 					<a href="{$link->getAdminLink('AdminStats')|escape:'html':'UTF-8'}&amp;module=statslive">{l s='Online Visitors' d='Modules.Dashactivity.Admin'}</a>
@@ -51,6 +52,7 @@
 					<span id="online_visitor"></span>
 				</span>
 			</li>
+			{/if}
 			<li>
 				<span class="data_label size_l">
 					<a href="{$link->getAdminLink('AdminCarts')|escape:'html':'UTF-8'}">{l s='Active Shopping Carts' d='Modules.Dashactivity.Admin'}</a>
@@ -104,7 +106,7 @@
 					<span id="new_messages"></span>
 				</span>
 			</li>
-			{if Module::isInstalled('productcomments')}
+			{if Module::isEnabled('productcomments')}
 				<li>
 				<span class="data_label"><a href="{$link->getAdminLink('AdminModules')|escape:'html':'UTF-8'}&amp;configure=productcomments&amp;tab_module=front_office_features&amp;module_name=productcomments">{l s='Product Reviews' d='Modules.Dashactivity.Admin'}</a></span>
 					<span class="data_value size_l">
@@ -123,37 +125,45 @@
 					<span id="new_customers"></span>
 				</span>
 			</li>
+			{if Module::isEnabled('statsnewsletter')}
 			<li>
 				<span class="data_label"><a href="{$link->getAdminLink('AdminStats')|escape:'html':'UTF-8'}&amp;module=statsnewsletter">{l s='New Subscriptions' d='Modules.Dashactivity.Admin'}</a></span>
 				<span class="data_value size_md">
 					<span id="new_registrations"></span>
 				</span>
 			</li>
+			{/if}
+			{if Module::isEnabled('ps_emailsubscription')}
 			<li>
 				<span class="data_label"><a href="{$link->getAdminLink('AdminModules')|escape:'html':'UTF-8'}&amp;configure=ps_emailsubscription&amp;module_name=ps_emailsubscription">{l s='Total Subscribers' d='Modules.Dashactivity.Admin'}</a></span>
 				<span class="data_value size_md">
 					<span id="total_suscribers"></span>
 				</span>
 			</li>
+			{/if}
 		</ul>
 	</section>
 	<section id="dash_traffic" class="loading">
 		<header>
 			<i class="icon-globe"></i> {l s='Traffic' d='Modules.Dashactivity.Admin'} <span class="subtitle small" id="traffic-subtitle"></span>
 		</header>
 		<ul class="data_list">
+			{if Module::isEnabled('statsforecast')}
 			<li>
 				<span class="data_label"><a href="{$link->getAdminLink('AdminStats')|escape:'html':'UTF-8'}&amp;module=statsforecast">{l s='Visits' d='Modules.Dashactivity.Admin'}</a></span>
 				<span class="data_value size_md">
 					<span id="visits"></span>
 				</span>
 			</li>
+			{/if}
+			{if Module::isEnabled('statsvisits')}
 			<li>
 				<span class="data_label"><a href="{$link->getAdminLink('AdminStats')|escape:'html':'UTF-8'}&amp;module=statsvisits">{l s='Unique Visitors' d='Modules.Dashactivity.Admin'}</a></span>
 				<span class="data_value size_md">
 					<span id="unique_visitors"></span>
 				</span>
 			</li>
+			{/if}
 			<li>
 				<span class="data_label">{l s='Traffic Sources' d='Modules.Dashactivity.Admin'}</span>
 				<ul class="data_list_small" id="dash_traffic_source">