From 50a9e7ef99ea9d1759541a0d559c73820997e04a Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Wed, 18 Sep 2013 10:29:07 +0200 Subject: [PATCH] // Code cleaning --- .../default/template/helpers/kpi/kpi.tpl | 7 ++++--- controllers/admin/AdminStatsController.php | 21 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl index 7e957b7b0..9499f16a5 100644 --- a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl +++ b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl @@ -66,6 +66,7 @@ $.each(jsonObject, function (index, value) { data.push(value); }); + var data_max = d3.max(data); var chart = d3.select("#{$id|addslashes} .boxchart").append("svg") .attr("class", "data_chart") @@ -73,13 +74,13 @@ .attr("height", 45); var y = d3.scale.linear() - .domain([0, d3.max(data)]) - .range([0, d3.max(data) * 45]); + .domain([0, data_max]) + .range([0, data_max * 45]); chart.selectAll("rect") .data(data) .enter().append("rect") - .attr("y", function(d) { return 45 - d * 45 / d3.max(data); }) + .attr("y", function(d) { return 45 - d * 45 / data_max; }) .attr("x", function(d, i) { return i * 6; }) .attr("width", 4) .attr("height", y); diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 8b5caf854..43fcaf97e 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -43,9 +43,7 @@ class AdminStatsControllerCore extends AdminStatsTabController else { $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' - SELECT - LEFT(`date_add`, 10) as date, - COUNT(*) as visits + SELECT LEFT(`date_add`, 10) as date, COUNT(*) as visits FROM `'._DB_PREFIX_.'connections` WHERE `date_add` BETWEEN "'.pSQL(date('Y-m-d', strtotime('-31 day'))).' 00:00:00" AND "'.pSQL(date('Y-m-d', strtotime('-1 day'))).' 23:59:59" '.Shop::addSqlRestriction(false).' @@ -55,9 +53,7 @@ class AdminStatsControllerCore extends AdminStatsTabController } $orders = array(); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' - SELECT - LEFT(`invoice_date`, 10) as date, - COUNT(*) as orders + SELECT LEFT(`invoice_date`, 10) as date, COUNT(*) as orders FROM `'._DB_PREFIX_.'orders` WHERE `invoice_date` BETWEEN "'.pSQL(date('Y-m-d', strtotime('-31 day'))).' 00:00:00" AND "'.pSQL(date('Y-m-d', strtotime('-1 day'))).' 23:59:59" '.Shop::addSqlRestriction(Shop::SHARE_ORDER).' @@ -69,11 +65,10 @@ class AdminStatsControllerCore extends AdminStatsTabController $from = strtotime(date('Y-m-d 00:00:00', strtotime('-31 day'))); $to = strtotime(date('Y-m-d 23:59:59', strtotime('-1 day'))); for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) - { - $data[$date] = 0; if (isset($visits[$date]) && $visits[$date]) $data[$date] = round(100 * ((isset($orders[$date]) && $orders[$date]) ? $orders[$date] : 0) / $visits[$date], 2); - } + else + $data[$date] = 0; $visits_sum = array_sum($visits); $orders_sum = array_sum($orders); @@ -89,6 +84,7 @@ class AdminStatsControllerCore extends AdminStatsTabController Configuration::updateValue('PS_KPI_CONVERSION_RATE', $value); Configuration::updateValue('PS_KPI_CONVERSION_RATE_EXPIRE', strtotime(date('Y-m-d 00:00:00', strtotime('+1 day')))); break; + case 'abandoned_cart': $value = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' SELECT COUNT(*) @@ -99,6 +95,7 @@ class AdminStatsControllerCore extends AdminStatsTabController Configuration::updateValue('PS_KPI_ABANDONED_CARTS', $value); Configuration::updateValue('PS_KPI_ABANDONED_CARTS_EXPIRE', strtotime('+10 min')); break; + case 'average_order_value': $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT @@ -111,6 +108,7 @@ class AdminStatsControllerCore extends AdminStatsTabController Configuration::updateValue('PS_KPI_AVG_ORDER_VALUE', $value); Configuration::updateValue('PS_KPI_AVG_ORDER_VALUE_EXPIRE', strtotime(date('Y-m-d 00:00:00', strtotime('+1 day')))); break; + case 'netprofit_visitor': $gapi = Module::isInstalled('gapi') ? Module::getInstanceByName('gapi') : false; if (Validate::isLoadedObject($gapi) && $gapi->isConfigured()) @@ -150,7 +148,7 @@ class AdminStatsControllerCore extends AdminStatsTabController LEFT JOIN `'._DB_PREFIX_.'order_slip` os ON o.id_order = os.id_order WHERE os.`date_add` BETWEEN "'.pSQL(date('Y-m-d', strtotime('-31 day'))).' 00:00:00" AND "'.pSQL(date('Y-m-d', strtotime('-1 day'))).' 23:59:59" '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o')); - + $net_profits = 0; $net_profits += $total_product_price_tax_excl; $net_profits -= $total_discounts_tax_excl; @@ -163,10 +161,11 @@ class AdminStatsControllerCore extends AdminStatsTabController $value = '∞'; else $value = Tools::displayPrice(0, $currency); - + Configuration::updateValue('PS_KPI_NETPROFIT_VISITOR', $value); Configuration::updateValue('PS_KPI_NETPROFIT_VISITOR_EXPIRE', strtotime(date('Y-m-d 00:00:00', strtotime('+1 day')))); break; + default: $value = false; }