dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-18 10:44:19 +02:00
parent 5a206e83a8 50a9e7ef99
commit c48f4f5e1b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/kpi/kpi.tpl
+4 -3
View File
@@ -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);
controllers/admin/AdminStatsController.php
+10 -11
View File
@@ -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 = '&infin;';
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;
}