diff --git a/modules/dashgoals/dashgoals.php b/modules/dashgoals/dashgoals.php index db87c1232..9d6d57c9b 100644 --- a/modules/dashgoals/dashgoals.php +++ b/modules/dashgoals/dashgoals.php @@ -90,6 +90,7 @@ class Dashgoals extends Module $month_row['values'][$type] = ConfigurationKPI::get(strtoupper($key)); } + $this->context->smarty->assign('currency_code', $this->context->currency->iso_code); $this->context->smarty->assign('goals_year', $year); $this->context->smarty->assign('goals_months', $months); return $this->display(__FILE__, 'dashboard_zone_two.tpl'); @@ -97,9 +98,7 @@ class Dashgoals extends Module public function hookDashboardData($params) { - return array( - 'data_chart' => array('dash_goals_chart1' => $this->getChartData()), - ); + return array('data_chart' => array('dash_goals_chart1' => $this->getChartData())); } public function getChartData() diff --git a/modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl b/modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl index abf4fedaf..de339dcea 100644 --- a/modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl +++ b/modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl @@ -51,11 +51,29 @@ {foreach $goals_months as $month} - {$month.label} - - - - 0 + + {$month.label} + + + + + +
+ + % +
+ + +
+ {$currency_code|escape} + +
+ + + {/foreach}