// Merge -> revision 8800
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/*
|
||||
* 2007-2011 PrestaShop
|
||||
* 2007-2011 PrestaShop
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
@@ -42,18 +42,18 @@ class StatsCarrier extends ModuleGraph
|
||||
$this->version = 1.0;
|
||||
$this->author = 'PrestaShop';
|
||||
$this->need_instance = 0;
|
||||
|
||||
|
||||
parent::__construct();
|
||||
|
||||
|
||||
$this->displayName = $this->l('Carrier distribution');
|
||||
$this->description = $this->l('Display the carriers distribution');
|
||||
}
|
||||
|
||||
|
||||
public function install()
|
||||
{
|
||||
return (parent::install() AND $this->registerHook('AdminStatsModules'));
|
||||
}
|
||||
|
||||
|
||||
public function hookAdminStatsModules($params)
|
||||
{
|
||||
$sql = 'SELECT COUNT(o.`id_order`) as total
|
||||
@@ -68,7 +68,7 @@ class StatsCarrier extends ModuleGraph
|
||||
$this->csvExport(array('type' => 'pie', 'option' => Tools::getValue('id_order_state')));
|
||||
$this->_html = '
|
||||
<fieldset class="width3"><legend><img src="../modules/'.$this->name.'/logo.gif" /> '.$this->displayName.'</legend>
|
||||
<form action="'.$_SERVER['REQUEST_URI'].'" method="post" style="float: right;">
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" style="float: right;">
|
||||
<select name="id_order_state">
|
||||
<option value="0"'.((!Tools::getValue('id_order_state')) ? ' selected="selected"' : '').'>'.$this->l('All').'</option>';
|
||||
foreach ($states AS $state)
|
||||
@@ -77,23 +77,23 @@ class StatsCarrier extends ModuleGraph
|
||||
<input type="submit" name="submitState" value="'.$this->l('Filter').'" class="button" />
|
||||
</form>
|
||||
<p><img src="../img/admin/down.gif" />'.$this->l('This graph represents the carrier distribution for your orders. You can also limit it to orders in one state.').'</p>
|
||||
'.($result['total'] ? $this->engine(array('type' => 'pie', 'option' => Tools::getValue('id_order_state'))).'<br /><br /> <a href="'.$_SERVER['REQUEST_URI'].'&export=1&exportType=language"><img src="../img/admin/asterisk.gif" />'.$this->l('CSV Export').'</a>' : $this->l('No valid orders for this period.')).'
|
||||
'.($result['total'] ? $this->engine(array('type' => 'pie', 'option' => Tools::getValue('id_order_state'))).'<br /><br /> <a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&exportType=language"><img src="../img/admin/asterisk.gif" />'.$this->l('CSV Export').'</a>' : $this->l('No valid orders for this period.')).'
|
||||
</fieldset>';
|
||||
return $this->_html;
|
||||
}
|
||||
|
||||
|
||||
public function setOption($option, $layers = 1)
|
||||
{
|
||||
$this->_option = (int)($option);
|
||||
}
|
||||
|
||||
|
||||
protected function getData($layers)
|
||||
{
|
||||
$stateQuery = '';
|
||||
if ((int)($this->_option))
|
||||
$stateQuery = 'AND (SELECT oh.id_order_state FROM `'._DB_PREFIX_.'order_history` oh WHERE o.id_order = oh.id_order ORDER BY oh.date_add DESC, oh.id_order_history DESC LIMIT 1) = '.(int)($this->_option);
|
||||
$this->_titles['main'] = $this->l('Percentage of orders by carrier');
|
||||
|
||||
|
||||
$sql = 'SELECT c.name, COUNT(DISTINCT o.`id_order`) as total
|
||||
FROM `'._DB_PREFIX_.'carrier` c
|
||||
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.id_carrier = c.id_carrier
|
||||
|
||||
Reference in New Issue
Block a user