From 55fad199549d836628c6e37c23d7eb7f88709420 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 15 Oct 2013 11:17:14 +0200
Subject: [PATCH] // Updated dashactivity

---
 js/admin-dashboard.js                         |  2 +-
 modules/dashactivity/dashactivity.php         | 11 +---
 .../templates/hook/dashboard_zone_one.tpl     | 61 ++++++++-----------
 modules/dashtrends/dashtrends.php             |  1 -
 4 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/js/admin-dashboard.js b/js/admin-dashboard.js
index 7b4da5273..c4d351f70 100644
--- a/js/admin-dashboard.js
+++ b/js/admin-dashboard.js
@@ -68,7 +68,7 @@ function refreshDashboard(module_name, use_push)
 				action:'refreshDashboard',
 				module:module_list[module_id],
 				dashboard_use_push:Number(use_push)
-				},
+			},
 			dataType: 'json',
 			success : function(widgets){
 				for (var widget_name in widgets)
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 9955efdcb..ed193e9a3 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -115,13 +115,7 @@ class Dashactivity extends Module
 						'.($maintenance_ips ? 'AND ip_address NOT IN ('.preg_replace('/[^,0-9]/', '', $maintenance_ips).')' : '');
 			$online_visitor = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
 		}
-		
-		$order_nbr = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-		SELECT COUNT(*)
-		FROM `'._DB_PREFIX_.'orders`
-		WHERE `invoice_date` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
-		'.Shop::addSqlRestriction(Shop::SHARE_ORDER));
-		
+
 		$pending_orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 		SELECT COUNT(*)
 		FROM `'._DB_PREFIX_.'orders` o
@@ -210,7 +204,6 @@ class Dashactivity extends Module
 
 		return array(
 			'data_value' => array(
-				'order_nbr' => $order_nbr,
 				'pending_orders' => $pending_orders,
 				'return_exchanges' => $return_exchanges,
 				'abandoned_cart' => $abandoned_cart,
@@ -352,6 +345,8 @@ class Dashactivity extends Module
 	public function getConfigFieldsValues()
 	{
 		return array(
+			'DASHACTIVITY_SHOW_STOCK' => Configuration::get('PS_STOCK_MANAGEMENT'),
+			'DASHACTIVITY_SHOW_RETURNS' => Configuration::get('PS_ORDER_RETURN'),
 			'DASHACTIVITY_SHOW_PENDING' => Tools::getValue('DASHACTIVITY_SHOW_PENDING', Configuration::get('DASHACTIVITY_SHOW_PENDING')),
 			'DASHACTIVITY_SHOW_NOTIFICATION' => Tools::getValue('DASHACTIVITY_SHOW_NOTIFICATION', Configuration::get('DASHACTIVITY_SHOW_NOTIFICATION')),
 			'DASHACTIVITY_SHOW_CUSTOMERS' => Tools::getValue('DASHACTIVITY_SHOW_CUSTOMERS', Configuration::get('DASHACTIVITY_SHOW_CUSTOMERS')),
diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
index 39e3fa0b2..dff99310d 100644
--- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
@@ -24,7 +24,7 @@
 *}
 <section id="dashactivity" class="panel widget{if $allow_push} allow_push{/if}">
 	<div class="panel-heading">
-		<i class="icon-time"></i> {l s='Recent Activity'}
+		<i class="icon-time"></i> {l s="Activity overview" mod="dashactivity"}
 		<span class="panel-heading-action">
 			<a class="list-toolbar-btn" href="#" onclick="toggleDashConfig('dashactivity'); return false;" title="configure">
 				<i class="process-icon-configure"></i>
@@ -38,49 +38,64 @@
 		<header><i class="icon-wrench"></i> {l s='Configuration'}</header>
 		{$dashactivity_config_form}
 	</section>
-	<section id="dash_orders" class="loading">
+	<section id="dash_live" class="loading">
 		<ul class="data_list_large">
 			<li>
 				<span class="data_label size_l">
-					{l s='Orders'}<br/>
-					<small class="text-muted">{l s='Within the last seven days'}</small>
+					{l s='Online Visitor'}
+					<small class="text-muted"><br/>
+						{l s='In the last 30 minutes'}
+					</small>
 				</span>
 				<span class="data_value size_xxl">
-					<span id="order_nbr">
-					</span><br/>
-					<small class="dash_trend dash_trend_up"><span id="orders_trends"></span>%</small>
+					<span id="online_visitor"></span>
+				</span>
+			</li>
+			<li>
+				<span class="data_label size_l">
+					{l s='Active Shopping Carts'}
+					<small class="text-muted"><br/>
+						{l s='In the last 30 minutes'}
+					</small>
+				</span>
+				<span class="data_value size_xxl">
+					<span id="active_shopping_cart"></span>
 				</span>
 			</li>
 		</ul>			
 	</section>
 	{if $DASHACTIVITY_SHOW_PENDING}
 	<section id="dash_pending" class="loading">
-		<header><i class="icon-time"></i> {l s='Pending'}</header>
+		<header><i class="icon-time"></i> {l s='Currently Pending'}</header>
 		<ul class="data_list">
 			<li>
-				<span class="data_label">{l s='Pending Orders'}</span>
+				<span class="data_label">{l s='Orders'}</span>
 				<span class="data_value size_l">
 					<span id="pending_orders"></span>
 				</span>
 			</li>
+			{if $DASHACTIVITY_SHOW_RETURNS}
 			<li>
 				<span class="data_label">{l s='Return/Exchanges'}</span>
 				<span class="data_value size_l">
 					<span id="return_exchanges"></span>
 				</span>
 			</li>
+			{/if}
 			<li>
 				<span class="data_label">{l s='Abandoned Carts'}</span>
 				<span class="data_value size_l">
 					<span id="abandoned_cart"></span>
 				</span>
 			</li>
+			{if $DASHACTIVITY_SHOW_STOCK}
 			<li>
 				<span class="data_label">{l s='Products Out of Stock'}</span>
 				<span class="data_value size_l">
 					<span id="products_out_of_stock"></span>
 				</span>
 			</li>
+			{/if}
 		</ul>
 	</section>
 	{/if}
@@ -111,7 +126,7 @@
 	{/if}
 	{if $DASHACTIVITY_SHOW_CUSTOMERS}
 	<section id="dash_customers" class="loading">
-		<header><i class="icon-user"></i> {l s='Customers'}</header>
+		<header><i class="icon-user"></i> {l s='Customers & Newsletters'}</header>
 		<ul class="data_list">
 			<li>
 				<span class="data_label">{l s='New Customers'}</span>
@@ -120,31 +135,7 @@
 				</span>
 			</li>
 			<li>
-				<span class="data_label">{l s='Online Visitor'}</span>
-				<span class="data_value size_md">
-					<span id="online_visitor"></span>
-				</span>
-			</li>
-			<li>
-				<span class="data_label">
-					{l s='Active Shopping Carts'}
-					<small class="text-muted"><br/>
-						{l s='In the last 30 minutes'}
-					</small>
-				</span>
-				<span class="data_value size_md">
-					<span id="active_shopping_cart"></span>
-				</span>
-			</li>
-		</ul>
-	</section>
-	{/if}
-	{if $DASHACTIVITY_SHOW_NEWSLETTER}
-	<section id="dash_newsletter" class="loading">
-		<header><i class="icon-envelope"></i> {l s='Newsletter'}</header>
-		<ul class="data_list">
-			<li>
-				<span class="data_label">{l s='New Registrations'}</span>
+				<span class="data_label">{l s='New Subscriptions'}</span>
 				<span class="data_value size_md">
 					<span id="new_registrations"></span>
 				</span>
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index e7bb1356c..f276568a0 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -111,7 +111,6 @@ class Dashtrends extends Module
 				$tmp_data['visits_score'][strtotime($row['date'])] = $row['visits_score'];
 		}
 
-		// First we retrieve the 
 		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 		SELECT
 			LEFT(`invoice_date`, 10) as date,