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

// Oops

Browse Source
This commit is contained in:
Damien Metzger
2013-10-22 17:32:02 +02:00
parent 4e8ba711d9
commit 3539a779f8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatsController.php
+7 -7
View File
@@ -408,7 +408,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
$orders = Db::getInstance()->ExecuteS(' $orders = Db::getInstance()->ExecuteS('
SELECT SELECT
`invoice_date`, LEFT(`invoice_date`, 10) as date,
total_paid_tax_incl / o.conversion_rate as total_paid_tax_incl, total_paid_tax_incl / o.conversion_rate as total_paid_tax_incl,
total_shipping_tax_excl / o.conversion_rate as total_shipping_tax_excl, total_shipping_tax_excl / o.conversion_rate as total_shipping_tax_excl,
o.module, o.module,
@@ -424,21 +424,21 @@ class AdminStatsControllerCore extends AdminStatsTabController
{ {
// Add flat fees for this order // Add flat fees for this order
$flat_fees = Configuration::get('CONF_ORDER_FIXED') + ( $flat_fees = Configuration::get('CONF_ORDER_FIXED') + (
$order['id_currency'] == Configuration::get('PS_DEFAULT_CURRENCY') $order['id_currency'] == Configuration::get('PS_CURRENCY_DEFAULT')
? Configuration::get('CONF_'.strtoupper($order['module']).'_FIXED') ? Configuration::get('CONF_'.strtoupper($order['module']).'_FIXED')
: Configuration::get('CONF_'.strtoupper($order['module']).'_FIXED_FOREIGN') : Configuration::get('CONF_'.strtoupper($order['module']).'_FIXED_FOREIGN')
); );
// Add variable fees for this order // Add variable fees for this order
$var_fees = $order['total_paid_tax_incl'] * ( $var_fees = $order['total_paid_tax_incl'] * (
$order['id_currency'] == Configuration::get('PS_DEFAULT_CURRENCY') $order['id_currency'] == Configuration::get('PS_CURRENCY_DEFAULT')
? Configuration::get('CONF_'.strtoupper($order['module']).'_VAR') ? Configuration::get('CONF_'.strtoupper($order['module']).'_VAR')
: Configuration::get('CONF_'.strtoupper($order['module']).'_VAR_FOREIGN') : Configuration::get('CONF_'.strtoupper($order['module']).'_VAR_FOREIGN')
) / 100; ) / 100;
// Add shipping fees for this order // Add shipping fees for this order
$shipping_fees = $order['total_shipping_tax_excl'] * ( $shipping_fees = $order['total_shipping_tax_excl'] * (
$order['id_country'] == Configuration::get('PS_DEFAULT_COUNTRY') $order['id_country'] == Configuration::get('PS_COUNTRY_DEFAULT')
? Configuration::get('CONF_'.strtoupper($order['carrier_reference']).'_SHIP') ? Configuration::get('CONF_'.strtoupper($order['carrier_reference']).'_SHIP')
: Configuration::get('CONF_'.strtoupper($order['carrier_reference']).'_SHIP_OVERSEAS') : Configuration::get('CONF_'.strtoupper($order['carrier_reference']).'_SHIP_OVERSEAS')
) / 100; ) / 100;
@@ -446,9 +446,9 @@ class AdminStatsControllerCore extends AdminStatsTabController
// Tally up these fees // Tally up these fees
if ($granularity == 'day') if ($granularity == 'day')
{ {
if (!isset($expenses[strtotime($order['invoice_date'])])) if (!isset($expenses[strtotime($order['date'])]))
$expenses[strtotime($order['invoice_date'])] = 0; $expenses[strtotime($order['date'])] = 0;
$expenses[strtotime($order['invoice_date'])] += $flat_fees + $var_fees + $shipping_fees; $expenses[strtotime($order['date'])] += $flat_fees + $var_fees + $shipping_fees;
} }
else else
$expenses += $flat_fees + $var_fees + $shipping_fees; $expenses += $flat_fees + $var_fees + $shipping_fees;