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

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Fabio Chelly
2013-07-19 17:51:00 +02:00
parent 5825dda836 b1f380c120
commit aa276aeee6
9 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockmyaccountfooter/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blockmyaccountfooter</name>
<displayName><![CDATA[My account block for your website&#039;s footer]]></displayName>
<version><![CDATA[1.2]]></version>
<version><![CDATA[1.3]]></version>
<description><![CDATA[Displays a block with links relative to user accounts.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
modules/cheque/config.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>cheque</name>
<displayName><![CDATA[Payments by check]]></displayName>
<displayName><![CDATA[Payment by check]]></displayName>
<version><![CDATA[2.3]]></version>
<description><![CDATA[This module allows you to accept payments by check.]]></description>
<author><![CDATA[PrestaShop]]></author>
modules/statsforecast/statsforecast.php
+1 -1
View File
@@ -470,7 +470,7 @@ class StatsForecast extends Module
$where = ' AND co.id_zone = '.(int)$this->context->cookie->stats_id_zone.' ';
}
$sql = 'SELECT SUM(od.`product_price` * od.`product_quantity` / o.conversion_rate) as orderSum, COUNT(*) AS orderQty, cl.name, AVG(od.`product_price` / o.conversion_rate) as priveAvg
$sql = 'SELECT SUM(od.`product_price` * od.`product_quantity` / o.conversion_rate) as orderSum, SUM(od.product_quantity) as orderQty, cl.name, AVG(od.`product_price` / o.conversion_rate) as priveAvg
FROM `'._DB_PREFIX_.'orders` o
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.id_order = od.id_order
LEFT JOIN `'._DB_PREFIX_.'product` p ON p.id_product = od.product_id