Initial commit

modules/dashgoals/config.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>dashgoals</name>
+	<displayName><![CDATA[Dashboard Goals]]></displayName>
+	<version><![CDATA[2.0.2]]></version>
+	<description><![CDATA[Adds a block with your store&#039;s forecast.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[dashboard]]></tab>
+	<is_configurable>0</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>

modules/dashgoals/config_fr.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+    <name>dashgoals</name>
+    <displayName><![CDATA[Tableau de bord des objectifs]]></displayName>
+    <version><![CDATA[2.0.2]]></version>
+    <description><![CDATA[Affiche un bloc avec les pr&eacute;visions de votre boutique.]]></description>
+    <author><![CDATA[PrestaShop]]></author>
+    <tab><![CDATA[dashboard]]></tab>
+    <is_configurable>0</is_configurable>
+    <need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>

modules/dashgoals/controllers/admin/AdminDashgoalsController.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * 2007-2015 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-2015 PrestaShop SA
+ *  @version  Release: $Revision: 13573 $
+ *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ *  International Registered Trademark & Property of PrestaShop SA
+ */
+
+class AdminDashgoalsController extends ModuleAdminController
+{
+    public function ajaxProcessChangeConfYear()
+    {
+        $year = (int)Tools::getValue('year');
+        Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', $year);
+        $months = $this->module->setMonths($year);
+
+        $this->context->smarty->assign(
+            array(
+                'currency' => $this->context->currency,
+                'goals_year' => $year,
+                'goals_months' => $months,
+                'link' => $this->context->link
+            )
+        );
+
+        die($this->module->display(_PS_MODULE_DIR_.$this->module->name.DIRECTORY_SEPARATOR.$this->module->name.'.php', 'config.tpl'));
+    }
+}

modules/dashgoals/controllers/admin/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/dashgoals.php

@@ -0,0 +1,548 @@
+<?php
+/**
+* 2007-2015 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-2015 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 dashgoals extends Module
+{
+    protected static $month_labels = array();
+    protected static $types = array('traffic', 'conversion', 'avg_cart_value');
+
+    protected static $real_color = array('#9E5BA1', '#00A89C', '#3AC4ED', '#F99031');
+    protected static $more_color = array('#803E84', '#008E7E', '#20B2E7', '#F66E1B');
+    protected static $less_color = array('#BC77BE', '#00C2BB', '#51D6F2', '#FBB244');
+
+    public function __construct()
+    {
+        $this->name = 'dashgoals';
+        $this->tab = 'dashboard';
+        $this->version = '2.0.2';
+        $this->author = 'PrestaShop';
+
+        parent::__construct();
+
+        $this->displayName = $this->trans('Dashboard Goals', array(), 'Modules.Dashgoals.Admin');
+        $this->description = $this->trans('Adds a block with your store\'s forecast.', array(), 'Modules.Dashgoals.Admin');
+        $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
+
+        self::$month_labels = array(
+            '01' => $this->trans('January', array(), 'Modules.Dashgoals.Admin'),
+            '02' => $this->trans('February', array(), 'Modules.Dashgoals.Admin'),
+            '03' => $this->trans('March', array(), 'Modules.Dashgoals.Admin'),
+            '04' => $this->trans('April', array(), 'Modules.Dashgoals.Admin'),
+            '05' => $this->trans('May', array(), 'Modules.Dashgoals.Admin'),
+            '06' => $this->trans('June', array(), 'Modules.Dashgoals.Admin'),
+            '07' => $this->trans('July', array(), 'Modules.Dashgoals.Admin'),
+            '08' => $this->trans('August', array(), 'Modules.Dashgoals.Admin'),
+            '09' => $this->trans('September', array(), 'Modules.Dashgoals.Admin'),
+            '10' => $this->trans('October', array(), 'Modules.Dashgoals.Admin'),
+            '11' => $this->trans('November', array(), 'Modules.Dashgoals.Admin'),
+            '12' => $this->trans('December', array(), 'Modules.Dashgoals.Admin')
+        );
+    }
+
+    public function install()
+    {
+        Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', date('Y'));
+        for ($month = '01'; $month <= 12; $month = sprintf('%02d', $month + 1)) {
+            $key = Tools::strtoupper('dashgoals_traffic_'.$month.'_'.date('Y'));
+            if (!ConfigurationKPI::get($key)) {
+                ConfigurationKPI::updateValue($key, 600);
+            }
+            $key = Tools::strtoupper('dashgoals_conversion_'.$month.'_'.date('Y'));
+            if (!ConfigurationKPI::get($key)) {
+                ConfigurationKPI::updateValue($key, 2);
+            }
+            $key = Tools::strtoupper('dashgoals_avg_cart_value_'.$month.'_'.date('Y'));
+            if (!ConfigurationKPI::get($key)) {
+                ConfigurationKPI::updateValue($key, 80);
+            }
+        }
+
+        // Prepare tab
+        $tab = new Tab();
+        $tab->active = 1;
+        $tab->class_name = 'AdminDashgoals';
+        $tab->name = array();
+        foreach (Language::getLanguages(true) as $lang) {
+            $tab->name[$lang['id_lang']] = 'Dashgoals';
+        }
+        $tab->id_parent = -1;
+        $tab->module = $this->name;
+
+        return (
+            $tab->add()
+            && parent::install()
+            && $this->registerHook('dashboardZoneTwo')
+            && $this->registerHook('dashboardData')
+            && $this->registerHook('actionAdminControllerSetMedia')
+        );
+    }
+
+    public function uninstall()
+    {
+        $id_tab = (int)Tab::getIdFromClassName('AdminDashgoals');
+        if ($id_tab) {
+            $tab = new Tab($id_tab);
+            $tab->delete();
+        }
+
+        return parent::uninstall();
+    }
+
+    public function hookActionAdminControllerSetMedia()
+    {
+        if (get_class($this->context->controller) == 'AdminDashboardController') {
+            $this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+        }
+    }
+
+    public function setMonths($year)
+    {
+        $months = array();
+        for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1)) {
+            $months[$i.'_'.$year] = array('label' => self::$month_labels[$i], 'values' => array());
+        }
+
+        foreach (self::$types as $type) {
+            foreach ($months as $month => &$month_row) {
+                $key = 'dashgoals_'.$type.'_'.$month;
+                if (Tools::isSubmit('submitDashGoals')) {
+                    ConfigurationKPI::updateValue(Tools::strtoupper($key), (float)Tools::getValue($key));
+                }
+                $month_row['values'][$type] = ConfigurationKPI::get(Tools::strtoupper($key));
+            }
+        }
+
+        return $months;
+    }
+
+    public function hookDashboardZoneTwo($params)
+    {
+        $year = Configuration::get('PS_DASHGOALS_CURRENT_YEAR');
+        $months = $this->setMonths($year);
+
+        $this->context->smarty->assign(
+            array(
+                'colors' => self::$real_color,
+                'currency' => $this->context->currency,
+                'goals_year' => $year,
+                'goals_months' => $months,
+                'dashgoals_ajax_link' => $this->context->link->getAdminLink('AdminDashgoals')
+            )
+        );
+
+        return $this->display(__FILE__, 'dashboard_zone_two.tpl');
+    }
+
+    public function hookDashboardData($params)
+    {
+        $year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : Configuration::get('PS_DASHGOALS_CURRENT_YEAR'));
+
+        return array('data_chart' => array('dash_goals_chart1' => $this->getChartData($year)));
+    }
+
+    protected function fakeConfigurationKPI_get($key)
+    {
+        $start = array(
+            'TRAFFIC' => 3000,
+            'CONVERSION' => 2,
+            'AVG_CART_VALUE' => 90
+        );
+
+        if (preg_match('/^DASHGOALS_([A-Z_]+)_([0-9]{2})/', $key, $matches)) {
+            if ($matches[1] == 'TRAFFIC') {
+                return $start[$matches[1]] * (1 + ($matches[2] - 1) / 10);
+            } else {
+                return $start[$matches[1]];
+            }
+        }
+    }
+
+    public function getChartData($year)
+    {
+        // There are stream types (different charts) and for each types there are 3 available zones (one color for the goal, one if you over perform and one if you under perfom)
+        $stream_types = array(
+            array('type' => 'traffic', 'title' => $this->trans('Traffic', array(), 'Modules.Dashgoals.Admin'), 'unit_text' => $this->trans('Visits', array(), 'Admin.Shopparameters.Feature')),
+            array('type' => 'conversion', 'title' => $this->trans('Conversion', array(), 'Modules.Dashgoals.Admin'), 'unit_text' => ''),
+            array('type' => 'avg_cart_value', 'title' => $this->trans('Average cart value', array(), 'Modules.Dashgoals.Admin'), 'unit_text' => ''),
+            array('type' => 'sales', 'title' => $this->trans('Sales', array(), 'Admin.Global'), 'unit_text' => '')
+        );
+        $stream_zones = array(
+            array('zone' => 'real', 'text' => ''),
+            array('zone' => 'more', 'text' => $this->trans('Goal exceeded', array(), 'Modules.Dashgoals.Admin')),
+            array('zone' => 'less', 'text' => $this->trans('Goal not reached', array(), 'Modules.Dashgoals.Admin'))
+        );
+
+        // We initialize all the streams types for all the zones
+        $streams = array();
+        $average_goals = array();
+
+        foreach ($stream_types as $key => $stream_type) {
+            $streams[$stream_type['type']] = array();
+            foreach ($stream_zones as $stream_zone) {
+                $streams[$stream_type['type']][$stream_zone['zone']] = array(
+                    'key' => $stream_type['type'].'_'.$stream_zone['zone'],
+                    'title' => $stream_type['title'],
+                    'unit_text' => $stream_type['unit_text'],
+                    'zone_text' => $stream_zone['text'],
+                    'color' => ($stream_zone['zone'] == 'more' ? self::$more_color[$key] : ($stream_zone['zone'] == 'less' ? self::$less_color[$key] : self::$real_color[$key])),
+                    'values' => array(),
+                    'disabled' => (isset($stream_type['type']) && $stream_type['type'] == 'sales') ? false : true
+                );
+            }
+
+            if (isset($stream_type['type'])) {
+                $average_goals[$stream_type['type']] = 0;
+            }
+        }
+
+        if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
+            $visits = $orders = $sales = array();
+            $from = strtotime(date('Y-01-01 00:00:00'));
+            $to = strtotime(date('Y-12-31 00:00:00'));
+            for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
+                $visits[$date] = round(rand(2000, 5000));
+                $orders[$date] = round(rand(40, 100));
+                $sales[$date] = round(rand(3000, 9000), 2);
+            }
+
+            // We need to calculate the average value of each goals for the year, this will be the base rate for "100%"
+            for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1)) {
+                $average_goals['traffic'] += $this->fakeConfigurationKPI_get('DASHGOALS_TRAFFIC_'.$i.'_'.$year);
+                $average_goals['conversion'] += $this->fakeConfigurationKPI_get('DASHGOALS_CONVERSION_'.$i.'_'.$year);
+                $average_goals['avg_cart_value'] += $this->fakeConfigurationKPI_get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+            }
+            foreach ($average_goals as &$average_goal) {
+                $average_goal /= 12;
+            }
+            $average_goals['sales'] = $average_goals['traffic'] * $average_goals['conversion'] / 100 * $average_goals['avg_cart_value'];
+
+            // Now we can calculate the value for every months
+            for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1)) {
+                $timestamp = strtotime($year.'-'.$i.'-01');
+
+                $month_goal = $this->fakeConfigurationKPI_get('DASHGOALS_TRAFFIC_'.$i.'_'.$year);
+                $value = (isset($visits[$timestamp]) ? $visits[$timestamp] : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['traffic'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['traffic'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['traffic'] = $value;
+                $stream_values['more']['traffic'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['traffic']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['traffic'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = $this->fakeConfigurationKPI_get('DASHGOALS_CONVERSION_'.$i.'_'.$year);
+                $value = 100 * ((isset($visits[$timestamp]) && $visits[$timestamp] && isset($orders[$timestamp]) && $orders[$timestamp]) ? ($orders[$timestamp] / $visits[$timestamp]) : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['conversion'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['conversion'] = round($value, 2);
+                $stream_values['real']['goal'] = round($month_goal, 2);
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['conversion'] = $value;
+                $stream_values['more']['conversion'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                if ($value == 0) {
+                    $streams['conversion']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['conversion'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = $this->fakeConfigurationKPI_get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+                $value = ((isset($orders[$timestamp]) && $orders[$timestamp] && isset($sales[$timestamp]) && $sales[$timestamp]) ? ($sales[$timestamp] / $orders[$timestamp]) : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['avg_cart_value'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['avg_cart_value'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['avg_cart_value'] = $value;
+                $stream_values['more']['avg_cart_value'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['avg_cart_value']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['avg_cart_value'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = $this->fakeConfigurationKPI_get('DASHGOALS_TRAFFIC_'.$i.'_'.$year) * $this->fakeConfigurationKPI_get('DASHGOALS_CONVERSION_'.$i.'_'.$year) / 100 * $this->fakeConfigurationKPI_get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+                $value = (isset($sales[$timestamp]) ? $sales[$timestamp] : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['sales'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['sales'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['sales'] = $value;
+                $stream_values['more']['sales'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['sales']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['sales'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+            }
+        } else {
+            // Retrieve gross data from AdminStatsController
+            $visits = AdminStatsController::getVisits(false, $year.date('-01-01'), $year.date('-12-31'), 'month');
+            $orders = AdminStatsController::getOrders($year.date('-01-01'), $year.date('-12-31'), 'month');
+            $sales = AdminStatsController::getTotalSales($year.date('-01-01'), $year.date('-12-31'), 'month');
+
+            // We need to calculate the average value of each goals for the year, this will be the base rate for "100%"
+            for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1)) {
+                $average_goals['traffic'] += ConfigurationKPI::get('DASHGOALS_TRAFFIC_'.$i.'_'.$year);
+                $average_goals['conversion'] += ConfigurationKPI::get('DASHGOALS_CONVERSION_'.$i.'_'.$year) / 100;
+                $average_goals['avg_cart_value'] += ConfigurationKPI::get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+            }
+            foreach ($average_goals as &$average_goal) {
+                $average_goal /= 12;
+            }
+            $average_goals['sales'] = $average_goals['traffic'] * $average_goals['conversion'] * $average_goals['avg_cart_value'];
+
+            // Now we can calculate the value for every months
+            for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1)) {
+                $timestamp = strtotime($year.'-'.$i.'-01');
+
+                $month_goal = ConfigurationKPI::get('DASHGOALS_TRAFFIC_'.$i.'_'.$year);
+                $value = (isset($visits[$timestamp]) ? $visits[$timestamp] : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['traffic'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['traffic'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['traffic'] = $value;
+                $stream_values['more']['traffic'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['traffic']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['traffic'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = ConfigurationKPI::get('DASHGOALS_CONVERSION_'.$i.'_'.$year);
+                $value = 100 * ((isset($visits[$timestamp]) && $visits[$timestamp] && isset($orders[$timestamp]) && $orders[$timestamp]) ? ($orders[$timestamp] / $visits[$timestamp]) : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['conversion'] * 100, $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['conversion'] = round($value, 2);
+                $stream_values['real']['goal'] = round($month_goal, 2);
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['conversion'] = $value;
+                $stream_values['more']['conversion'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                if ($value == 0) {
+                    $streams['conversion']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['conversion'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = ConfigurationKPI::get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+                $value = ((isset($orders[$timestamp]) && $orders[$timestamp] && isset($sales[$timestamp]) && $sales[$timestamp]) ? ($sales[$timestamp] / $orders[$timestamp]) : 0);
+                $stream_values = $this->getValuesFromGoals($average_goals['avg_cart_value'], $month_goal, $value, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['avg_cart_value'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['avg_cart_value'] = $value;
+                $stream_values['more']['avg_cart_value'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['avg_cart_value']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['avg_cart_value'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+
+                $month_goal = ConfigurationKPI::get('DASHGOALS_TRAFFIC_'.$i.'_'.$year) * ConfigurationKPI::get('DASHGOALS_CONVERSION_'.$i.'_'.$year) / 100 * ConfigurationKPI::get('DASHGOALS_AVG_CART_VALUE_'.$i.'_'.$year);
+                $value = (isset($sales[$timestamp]) && $sales[$timestamp]) ? $sales[$timestamp] : 0;
+                $stream_values = $this->getValuesFromGoals($average_goals['sales'], $month_goal, isset($sales[$timestamp]) ? $sales[$timestamp] : 0, self::$month_labels[$i]);
+                $goal_diff = $value - $month_goal;
+                $stream_values['real']['sales'] = $value;
+                $stream_values['real']['goal'] = $month_goal;
+
+                if ($value > 0) {
+                    $stream_values['real']['goal_diff'] = round(($goal_diff * 100) / ($month_goal > 0 ? $month_goal : 1), 2);
+                }
+
+                $stream_values['less']['sales'] = $value;
+                $stream_values['more']['sales'] = $value;
+
+                if ($value > 0 && $value < $month_goal) {
+                    $stream_values['less']['goal_diff'] = $goal_diff;
+                } elseif ($value > 0) {
+                    $stream_values['more']['goal_diff'] = $goal_diff;
+                }
+
+                if ($value == 0) {
+                    $streams['sales']['less']['zone_text'] = $this->trans('Goal set:', array(), 'Modules.Dashgoals.Admin');
+                    $stream_values['less']['goal'] = $month_goal;
+                }
+
+                foreach ($stream_zones as $stream_zone) {
+                    $streams['sales'][$stream_zone['zone']]['values'][] = $stream_values[$stream_zone['zone']];
+                }
+            }
+        }
+
+        // Merge all the streams before sending
+        $all_streams = array();
+        foreach ($stream_types as $stream_type) {
+            foreach ($stream_zones as $stream_zone) {
+                $all_streams[] = $streams[$stream_type['type']][$stream_zone['zone']];
+            }
+        }
+
+        return array('chart_type' => 'bar_chart_goals', 'data' => $all_streams);
+    }
+
+    protected function getValuesFromGoals($average_goal, $month_goal, $value, $label)
+    {
+        // Initialize value for each zone
+        $stream_values = array(
+            'real' => array('x' => $label, 'y' => 0),
+            'less' => array('x' => $label, 'y' => 0),
+            'more' => array('x' => $label, 'y' => 0)
+        );
+
+        // Calculate the percentage of fullfilment of the goal
+        $fullfilment = 0;
+        if ($value && $month_goal) {
+            $fullfilment = round($value / $month_goal, 2);
+        }
+
+        // Base rate is essential here : it determines the value of the goal compared to the "100%" of the chart legend
+        $base_rate = 0;
+        if ($average_goal && $month_goal) {
+            $base_rate = $month_goal / $average_goal;
+        }
+
+        // Fullfilment of 1 means that we performed exactly anticipated
+        if ($fullfilment == 1) {
+            $stream_values['real'] = array('x' => $label, 'y' => round($base_rate, 2));
+        }
+        // Fullfilment lower than 1 means that we UNDER performed
+        elseif ($fullfilment < 1) {
+            $stream_values['real'] = array('x' => $label, 'y' => round($fullfilment * $base_rate, 2));
+            $stream_values['less'] = array('x' => $label, 'y' => round($base_rate - ($fullfilment * $base_rate), 2));
+        }
+        // Fullfilment greater than 1 means that we OVER performed
+        elseif ($fullfilment > 1) {
+            $stream_values['real'] = array('x' => $label, 'y' => round($base_rate, 2));
+            $stream_values['more'] = array('x' => $label, 'y' => round(($fullfilment * $base_rate) - $base_rate, 2));
+        }
+
+        return $stream_values;
+    }
+}

modules/dashgoals/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/translations/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/views/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/views/js/dashgoals.js

@@ -0,0 +1,166 @@
+var dashgoals_data;
+var dashgoals_chart;
+
+function bar_chart_goals(widget_name, chart_details)
+{
+	nv.addGraph(function() {
+		dashgoals_data = chart_details.data;
+
+		var chart = nv.models.multiBarChart()
+			.stacked(true)
+			.showControls(false)
+			.tooltipContent(function(key, y, e, graph) {
+				if (graph.value == 0)
+					return '';
+
+				if (key == 'sales_real') {
+					var result = '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + formatCurrency(parseInt(graph.point.sales), currency_format, currency_sign, currency_blank) + '</strong><br />(' + formatCurrency(parseInt(graph.point.goal), currency_format, currency_sign, currency_blank) + ')<br/>';
+					if (graph.point.sales > graph.point.goal)
+						result += '<span class="dash_trend dash_trend_up">+';
+					else
+						result += '<span class="dash_trend dash_trend_down">';
+					result += graph.point.goal_diff + '%</span></div>';
+					return result;
+				} else if (key == 'sales_less') {
+					if (graph.point.sales > 0)
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_down">' + formatCurrency(parseInt(graph.point.goal_diff), currency_format, currency_sign, currency_blank) + '</span></div>';
+					else
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br />(' + formatCurrency(parseInt(graph.point.goal), currency_format, currency_sign, currency_blank) + ')</div>';
+				} else if (key == 'sales_more')
+					return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_up">+' + formatCurrency(parseInt(graph.point.goal_diff), currency_format, currency_sign, currency_blank) + '</span></div>';
+				else if (key == 'avg_cart_value_real') {
+					var result = '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + formatCurrency(parseInt(graph.point.avg_cart_value), currency_format, currency_sign, currency_blank) + '</strong><br />(' + formatCurrency(parseInt(graph.point.goal), currency_format, currency_sign, currency_blank) + ')<br/>';
+					if (graph.point.avg_cart_value > graph.point.goal)
+						result += '<span class="dash_trend dash_trend_up">+';
+					else
+						result += '<span class="dash_trend dash_trend_down">';
+					result += graph.point.goal_diff + '%</span></div>';
+					return result;
+				} else if (key == 'avg_cart_value_less') {
+					if (graph.point.avg_cart_value > 0)
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_down">' + formatCurrency(parseInt(graph.point.goal_diff), currency_format, currency_sign, currency_blank) + '</span></div>';
+					else
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br />(' + formatCurrency(parseInt(graph.point.goal), currency_format, currency_sign, currency_blank) + ')</div>';
+				} else if (key == 'avg_cart_value_more')
+					return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_up">+' + formatCurrency(parseInt(graph.point.goal_diff), currency_format, currency_sign, currency_blank) + '</span></div>';
+				else if (key == 'traffic_real') {
+					var result = '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.point.traffic + ' ' +graph.series.unit_text+'</strong><br />(' + graph.point.goal + ' ' +graph.series.unit_text+')<br/>';
+					if (graph.point.traffic > graph.point.goal)
+						result += '<span class="dash_trend dash_trend_up">+';
+					else
+						result += '<span class="dash_trend dash_trend_down">';
+					result += graph.point.goal_diff + '%</span></div>';
+					return result;
+				} else if (key == 'traffic_less') {
+					if (graph.point.traffic > 0)
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_down">' + graph.point.goal_diff + ' ' +graph.series.unit_text+'</span></div>';
+					else
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br />(' + graph.point.goal + ' ' +graph.series.unit_text+')</div>';
+				} else if (key == 'traffic_more')
+					return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_up">+' + graph.point.goal_diff + ' ' +graph.series.unit_text+'</span></div>';
+				else if (key == 'conversion_real') {
+					var result = '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.point.conversion + '%</strong><br />(' + graph.point.goal + '%)</strong><br/>';
+					if (graph.point.conversion  > graph.point.goal)
+						result += '<span class="dash_trend dash_trend_up">+';
+					else
+						result += '<span class="dash_trend dash_trend_down">';
+					result += graph.point.goal_diff + '%</span></div>';
+					return result;
+				} else if (key == 'conversion_less') {
+					if (graph.point.conversion > 0)
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_down">' + graph.point.goal_diff + '%</span></div>';
+					else
+						return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br />(' + graph.point.goal + '%)</div>';
+				} else if (key == 'conversion_more')
+					return '<div class="tooltip-panel"><div class="tooltip-panel-heading">' + graph.series.title + '</div><strong>' + graph.series.zone_text + '</strong><br /><span class="dash_trend dash_trend_up">+' + graph.point.goal_diff + '%</span></div>';
+
+			});
+
+		chart.yAxis.tickFormat(d3.format('.1f'));
+		dashgoals_chart = chart;
+
+		d3.select('#dash_goals_chart1 svg')
+			.datum(chart_details.data)
+			.transition()
+			.call(chart);
+
+		$('#dash_goals_chart1 .nv-legendWrap').remove();
+
+		nv.utils.windowResize(chart.update);
+
+		return chart;
+	});
+}
+
+function selectDashgoalsChart(type)
+{
+	if (type !== false)
+	{
+		$.each(dashgoals_data, function(index, value) {
+			if (value.key == type + '_real' || value.key == type + '_more' || value.key == type + '_less')
+				value.disabled = false;
+			else
+				value.disabled = true;
+		});
+	}
+	dashgoals_toggleDashConfig();
+}
+
+/* 	Refresh dashgoals chart when coming from the config panel
+	Called from /js/admin-dashboard.js: toggleDashConfig() */
+function dashgoals_toggleDashConfig()
+{
+	d3.select('#dash_goals_chart1 svg')
+		.datum(dashgoals_data)
+		.transition()
+		.call(dashgoals_chart);
+	nv.utils.windowResize(dashgoals_chart.update);
+}
+
+/* 	Calculate Sales based on the traffic, average cart value and conversion rate */
+function dashgoals_calc_sales()
+{
+	$('.dashgoals_sales').each(function() {
+		var key = $(this).attr('id').substr(16);
+		var sales = parseFloat($('#dashgoals_traffic_' + key).val()) * parseFloat($('#dashgoals_avg_cart_value_' + key).val()) * parseFloat($('#dashgoals_conversion_' + key).val()) / 100;
+		if (isNaN(sales))
+			$(this).text(formatCurrency(0, currency_format, currency_sign, currency_blank));
+		else
+			$(this).text(formatCurrency(parseInt(sales), currency_format, currency_sign, currency_blank));
+	});
+}
+
+function dashgoals_changeYear(xward)
+{
+	var new_year = dashgoals_year;
+	if (xward == 'forward')
+		new_year = dashgoals_year + 1;
+	else if (xward == 'backward')
+		new_year = dashgoals_year - 1;
+
+	$.ajax({
+		url: dashgoals_ajax_link,
+		data: {
+			ajax: true,
+			action: 'changeconfyear',
+			year: new_year
+		},
+		success : function(result){
+			$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
+			var hide_conf = $('#dashgoals_config').hasClass('hide');
+			$('#dashgoals_config').replaceWith(result);
+			dashgoals_calc_sales();
+			if (!hide_conf)
+				$('#dashgoals_config').removeClass('hide');
+			$('.dashgoals_config_input').off();
+			$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
+			dashgoals_year = new_year;
+			refreshDashboard('dashgoals', false, dashgoals_year);
+		}
+	});
+}
+
+$(document).ready(function() {
+	$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
+	dashgoals_calc_sales();
+});

modules/dashgoals/views/js/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/views/templates/hook/config.tpl

@@ -0,0 +1,74 @@
+{*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<section id="dashgoals_config" class="dash_config hide">
+	<header><i class="icon-wrench"></i> {l s='Configuration' d='Admin.Global'}</header>
+	<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')|escape:'html':'UTF-8'}">
+		<table class="table table-condensed table-striped table-bordered">
+			<thead>
+				<tr>
+					<th class="fixed-width-md">{$goals_year}</th>
+					<th class="fixed-width-md">{l s='Traffic' d='Modules.Dashgoals.Admin'}</th>
+					<th class="fixed-width-md">{l s='Conversion Rate' d='Modules.Dashgoals.Admin'}</th>
+					<th class="fixed-width-lg">{l s='Average Cart Value' d='Modules.Dashgoals.Admin'}</th>
+					<th>{l s='Sales' d='Admin.Global'}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{foreach $goals_months as $month}
+				<tr>
+					<td>
+						{$month.label}
+					</td>
+					<td>
+						<div class="input-group">
+							<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.traffic|intval}" />
+						</div>
+					</td>
+					<td>
+						<div class="input-group">
+							<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.conversion|floatval}" />
+							<span class="input-group-addon">%</span>
+						</div>
+					</td>
+					<td>
+						<div class="input-group">
+							<span class="input-group-addon">{$currency->iso_code|escape}</span>
+							<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.avg_cart_value|intval}" />
+						</div>
+					</td>
+					<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
+					</td>
+				</tr>
+				{/foreach}
+			</tbody>
+		</table>
+		<div class="panel-footer">
+			<button class="btn btn-default pull-right" name="submitDashGoals" type="submit"><i class="process-icon-save"></i> {l s='Save' d='Admin.Actions'}</button>
+		</div>
+	</form>
+</section>

modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl

@@ -0,0 +1,74 @@
+{*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<div class="clearfix"></div>
+<script>
+	var currency_format = {$currency->format|intval};
+	var currency_sign = '{$currency->sign|addslashes}';
+	var currency_blank = {$currency->blank|intval};
+	var priceDisplayPrecision = 0;
+	var dashgoals_year = {$goals_year|intval};
+	var dashgoals_ajax_link = '{$dashgoals_ajax_link|addslashes}';
+</script>
+
+<section id="dashgoals" class="panel widget">
+	<header class="panel-heading">
+		<i class="icon-bar-chart"></i>
+		{l s='Forecast' d='Modules.Dashgoals.Admin'}
+		<span id="dashgoals_title" class="badge">{$goals_year}</span>
+		<span class="btn-group">
+			<a href="javascript:void(0);" onclick="dashgoals_changeYear('backward');" class="btn btn-default btn-xs"><i class="icon-backward"></i></a>
+			<a href="javascript:void(0);" onclick="dashgoals_changeYear('forward');" class="btn btn-default btn-xs"><i class="icon-forward"></i></a>
+		</span>
+
+		<span class="panel-heading-action">
+			<a class="list-toolbar-btn" href="javascript:void(0);" onclick="toggleDashConfig('dashgoals');" title="{l s='Configure' d='Admin.Global'}">
+				<i class="process-icon-configure"></i>
+			</a>
+			<a class="list-toolbar-btn" href="javascript:void(0);" onclick="refreshDashboard('dashgoals');" title="{l s='Refresh' d='Admin.Actions'}">
+				<i class="process-icon-refresh"></i>
+			</a>
+		</span>
+	</header>
+	{include file='./config.tpl'}
+	<section class="loading">
+		<div class="btn-group" data-toggle="buttons">
+			<label class="btn btn-default">
+				<input type="radio" name="options" onchange="selectDashgoalsChart('traffic');"/><i class="icon-circle" style="color:{$colors[0]}"></i> {l s='Traffic' d='Modules.Dashgoals.Admin'}
+			</label>
+			<label class="btn btn-default">
+				<input type="radio" name="options" onchange="selectDashgoalsChart('conversion');"/><i class="icon-circle" style="color:{$colors[1]}"></i> {l s='Conversion' d='Modules.Dashgoals.Admin'}
+			</label>
+			<label class="btn btn-default">
+				<input type="radio" name="options" onchange="selectDashgoalsChart('avg_cart_value');"/><i class="icon-circle" style="color:{$colors[2]}"></i> {l s='Average Cart Value' d='Modules.Dashgoals.Admin'}
+			</label>
+			<label class="btn btn-default active">
+				<input type="radio" name="options" onchange="selectDashgoalsChart('sales');"/><i class="icon-circle" style="color:{$colors[3]}"></i> {l s='Sales' d='Admin.Global'}
+			</label>
+		</div>
+		<div id="dash_goals_chart1" class="chart with-transitions">
+			<svg></svg>
+		</div>
+	</section>
+</section>

modules/dashgoals/views/templates/hook/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;

modules/dashgoals/views/templates/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 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;