Initial commit

web/modules/statscarrier/CHANGELOG.txt

@@ -0,0 +1,3 @@
+2014-03-27 17:17:58 +0100	/ MO statscarrier : min ps_versions_compliancy modified (1.5.6.1 => 1.6)
+2014-03-24 15:22:43 +0100	/ MO statscarrier : ps_versions_compliancy added
+2014-03-20 14:36:21 +0100	Initial commit

web/modules/statscarrier/Readme.md

@@ -0,0 +1,37 @@
+# Carrier distribution
+
+## About
+
+Adds a graph displaying each carriers\' distribution to the Stats dashboard.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the statscarrier project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+

web/modules/statscarrier/composer.json

@@ -0,0 +1,19 @@
+{
+  "name": "prestashop/statscarrier",
+  "description": "PrestaShop module statscarrier",
+  "homepage": "https://github.com/PrestaShop/statscarrier",
+  "license": "AFL - Academic Free License (AFL 3.0)",
+  "authors": [
+    {
+      "name": "PrestaShop SA",
+      "email": "contact@prestashop.com"
+    }
+  ],
+  "require": {
+    "php": ">=5.4"
+  },
+  "config": {
+    "preferred-install": "dist"
+  },
+  "type": "prestashop-module"
+}

web/modules/statscarrier/config.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>statscarrier</name>
+	<displayName><![CDATA[Carrier distribution]]></displayName>
+	<version><![CDATA[2.0.0]]></version>
+	<description><![CDATA[Adds a graph displaying each carriers&#039; distribution to the Stats dashboard.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[analytics_stats]]></tab>
+	<is_configurable>0</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>

web/modules/statscarrier/config_fr.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+    <name>statscarrier</name>
+    <displayName><![CDATA[R&eacute;partition par transporteur]]></displayName>
+    <version><![CDATA[2.0.0]]></version>
+    <description><![CDATA[Ajoute un graphique affichant la r&eacute;partition de chaque fournisseur dans le tableau de bord des statistiques.]]></description>
+    <author><![CDATA[PrestaShop]]></author>
+    <tab><![CDATA[analytics_stats]]></tab>
+    <is_configurable>0</is_configurable>
+    <need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>

web/modules/statscarrier/index.bak

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

web/modules/statscarrier/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

web/modules/statscarrier/statscarrier.bak

@@ -0,0 +1,141 @@
+<?php
+/*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class statscarrier extends ModuleGraph
+{
+    private $html = '';
+    private $option = '';
+
+    public function __construct()
+    {
+        $this->name = 'statscarrier';
+        $this->tab = 'analytics_stats';
+        $this->version = '2.0.0';
+        $this->author = 'PrestaShop';
+        $this->need_instance = 0;
+
+        parent::__construct();
+
+        $this->displayName = $this->trans('Carrier distribution', array(), 'Modules.Statscarrier.Admin');
+        $this->description = $this->trans('Adds a graph displaying each carriers\' distribution to the Stats dashboard.', array(), 'Modules.Statscarrier.Admin');
+        $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
+    }
+
+    public function install()
+    {
+        return (parent::install() && $this->registerHook('AdminStatsModules'));
+    }
+
+    public function hookAdminStatsModules($params)
+    {
+        $sql = 'SELECT COUNT(o.`id_order`) as total
+				FROM `'._DB_PREFIX_.'orders` o
+				WHERE o.`date_add` BETWEEN '.ModuleGraph::getDateBetween().'
+					'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
+					'.((int)Tools::getValue('id_order_state') ? '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)Tools::getValue('id_order_state') : '');
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
+        $states = OrderState::getOrderStates($this->context->language->id);
+
+        if (Tools::getValue('export')) {
+            $this->csvExport(array('type' => 'pie', 'option' => Tools::getValue('id_order_state')));
+        }
+        $this->html = '
+			<div class="panel-heading">
+				'.$this->displayName.'
+			</div>
+			<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" class="form-horizontal alert">
+				<div class="row">
+					<div class="col-lg-5 col-lg-offset-6">
+						<select name="id_order_state">
+							<option value="0"'.((!Tools::getValue('id_order_state')) ? ' selected="selected"' : '').'>'.$this->trans('All', array(), 'Admin.Global').'</option>';
+        foreach ($states as $state) {
+            $this->html .= '<option value="'.$state['id_order_state'].'"'.(($state['id_order_state'] == Tools::getValue('id_order_state')) ? ' selected="selected"' : '').'>'.$state['name'].'</option>';
+        }
+        $this->html .= '</select>
+					</div>
+					<div class="col-lg-1">
+						<input type="submit" name="submitState" value="'.$this->trans('Filter', array(), 'Admin.Global').'" class="btn btn-default pull-right" />
+					</div>
+				</div>
+			</form>
+
+			<div class="alert alert-info">
+				'.$this->trans('This graph represents the carrier distribution for your orders. You can also narrow the focus of the graph to display distribution for a particular order status.', array(), 'Modules.Statscarrier.Admin').'
+			</div>
+			<div class="row row-margin-bottom">
+				<div class="col-lg-12">
+					<div class="col-lg-8">
+						'.($result['total'] ? $this->engine(array(
+                    'type' => 'pie',
+                    'option' => Tools::getValue('id_order_state')
+                )).'
+					</div>
+					<div class="col-lg-4">
+						<a href="'.Tools::safeOutput($_SERVER['REQUEST_URI'].'&export=1&exportType=language').'" class="btn btn-default">
+							<i class="icon-cloud-upload"></i> '.$this->trans('CSV Export', array(), 'Admin.Global').'
+						</a>' : $this->trans('No valid orders have been received for this period.', array(), 'Modules.Statscarrier.Admin')).'
+					</div>
+				</div>
+			</div>';
+
+        return $this->html;
+    }
+
+    public function setOption($option, $layers = 1)
+    {
+        $this->option = (int)$option;
+    }
+
+    protected function getData($layers)
+    {
+        $state_query = '';
+        if ((int)$this->option) {
+            $state_query = '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->trans('Percentage of orders listed by carrier.', array(), 'Modules.Statscarrier.Admin');
+
+        $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
+				WHERE o.`date_add` BETWEEN '.ModuleGraph::getDateBetween().'
+					'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
+					'.$state_query.'
+				GROUP BY c.`id_carrier`';
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+        foreach ($result as $row) {
+            $this->_values[] = $row['total'];
+            $this->_legend[] = $row['name'];
+        }
+    }
+}

web/modules/statscarrier/statscarrier.php

@@ -0,0 +1,141 @@
+<?php
+/*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class statscarrier extends ModuleGraph
+{
+    private $html = '';
+    private $option = '';
+
+    public function __construct()
+    {
+        $this->name = 'statscarrier';
+        $this->tab = 'analytics_stats';
+        $this->version = '2.0.0';
+        $this->author = 'PrestaShop';
+        $this->need_instance = 0;
+
+        parent::__construct();
+
+        $this->displayName = $this->trans('Carrier distribution', array(), 'Modules.Statscarrier.Admin');
+        $this->description = $this->trans('Adds a graph displaying each carriers\' distribution to the Stats dashboard.', array(), 'Modules.Statscarrier.Admin');
+        $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
+    }
+
+    public function install()
+    {
+        return (parent::install() && $this->registerHook('AdminStatsModules'));
+    }
+
+    public function hookAdminStatsModules($params)
+    {
+        $sql = 'SELECT COUNT(o.`id_order`) as total
+				FROM `'._DB_PREFIX_.'orders` o
+				WHERE o.`date_add` BETWEEN '.ModuleGraph::getDateBetween().'
+					'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
+					'.((int)Tools::getValue('id_order_state') ? '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)Tools::getValue('id_order_state') : '');
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
+        $states = OrderState::getOrderStates($this->context->language->id);
+
+        if (Tools::getValue('export')) {
+            $this->csvExport(array('type' => 'pie', 'option' => Tools::getValue('id_order_state')));
+        }
+        $this->html = '
+			<div class="panel-heading">
+				'.$this->displayName.'
+			</div>
+			<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" class="form-horizontal alert">
+				<div class="row">
+					<div class="col-lg-5 col-lg-offset-6">
+						<select name="id_order_state">
+							<option value="0"'.((!Tools::getValue('id_order_state')) ? ' selected="selected"' : '').'>'.$this->trans('All', array(), 'Admin.Global').'</option>';
+        foreach ($states as $state) {
+            $this->html .= '<option value="'.$state['id_order_state'].'"'.(($state['id_order_state'] == Tools::getValue('id_order_state')) ? ' selected="selected"' : '').'>'.$state['name'].'</option>';
+        }
+        $this->html .= '</select>
+					</div>
+					<div class="col-lg-1">
+						<input type="submit" name="submitState" value="'.$this->trans('Filter', array(), 'Admin.Global').'" class="btn btn-default pull-right" />
+					</div>
+				</div>
+			</form>
+
+			<div class="alert alert-info">
+				'.$this->trans('This graph represents the carrier distribution for your orders. You can also narrow the focus of the graph to display distribution for a particular order status.', array(), 'Modules.Statscarrier.Admin').'
+			</div>
+			<div class="row row-margin-bottom">
+				<div class="col-lg-12">
+					<div class="col-lg-8">
+						'.($result['total'] ? $this->engine(array(
+                    'type' => 'pie',
+                    'option' => Tools::getValue('id_order_state')
+                )).'
+					</div>
+					<div class="col-lg-4">
+						<a href="'.Tools::safeOutput($_SERVER['REQUEST_URI'].'&export=1&exportType=language').'" class="btn btn-default">
+							<i class="icon-cloud-upload"></i> '.$this->trans('CSV Export', array(), 'Admin.Global').'
+						</a>' : $this->trans('No valid orders have been received for this period.', array(), 'Modules.Statscarrier.Admin')).'
+					</div>
+				</div>
+			</div>';
+
+        return $this->html;
+    }
+
+    public function setOption($option, $layers = 1)
+    {
+        $this->option = (int)$option;
+    }
+
+    protected function getData($layers)
+    {
+        $state_query = '';
+        if ((int)$this->option) {
+            $state_query = '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->trans('Percentage of orders listed by carrier.', array(), 'Modules.Statscarrier.Admin');
+
+        $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
+				WHERE o.`date_add` BETWEEN '.ModuleGraph::getDateBetween().'
+					'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
+					'.$state_query.'
+				GROUP BY c.`id_carrier`';
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+        foreach ($result as $row) {
+            $this->_values[] = $row['total'];
+            $this->_legend[] = $row['name'];
+        }
+    }
+}

web/modules/statscarrier/translations/index.bak

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+                        
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+                        
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+                        
+header("Location: ../");
+exit;

web/modules/statscarrier/translations/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+                        
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+                        
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+                        
+header("Location: ../");
+exit;