diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index bd4594d5c..5038e47b8 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -206,7 +206,12 @@ class AdminSearchControllerCore extends AdminController */ public function searchFeatures() { + $this->_list['features'] = array(); + global $_LANGADM; + if ($_LANGADM === null) + return; + $tabs = array(); $key_match = array(); $result = Db::getInstance()->executeS(' @@ -225,6 +230,7 @@ class AdminSearchControllerCore extends AdminController $tabs[strtolower($key)] = $tabs[strtolower($value)]; $key_match[strtolower($key)] = $key; } + $this->_list['features'] = array(); foreach ($_LANGADM as $key => $value) { @@ -242,11 +248,6 @@ class AdminSearchControllerCore extends AdminController $this->_list['features'][$tabs[$key]][] = array('link' => Context::getContext()->link->getAdminLink($key_match[$key]), 'value' => Tools::safeOutput($value)); } } - - if (!count($this->_list['features'])) - $this->_list['features'] = false; - else - $this->_list['features']; } protected function initOrderList() diff --git a/modules/dashgoals/dashgoals.php b/modules/dashgoals/dashgoals.php index 6c157c12b..cc6f79e5c 100644 --- a/modules/dashgoals/dashgoals.php +++ b/modules/dashgoals/dashgoals.php @@ -133,22 +133,21 @@ class Dashgoals extends Module $goal = ConfigurationKPI::get(strtoupper('dashgoals_traffic_'.$i.'_'.$year)); $value = 0; if ($goal && isset($visits[$timestamp])) - $value = round($visits[$timestamp] / $goal); + $value = round($visits[$timestamp] / $goal, 2); $stream1['values'][] = array('x' => Dashgoals::$month_labels[$i], 'y' => $value); $goal = ConfigurationKPI::get(strtoupper('dashgoals_conversion_'.$i.'_'.$year)); $value = 0; if ($goal && isset($visits[$timestamp]) && $visits[$timestamp] && isset($orders[$timestamp]) && $orders[$timestamp]) - $value = round((100 * $orders[$timestamp] / $visits[$timestamp]) / $goal); + $value = round((100 * $orders[$timestamp] / $visits[$timestamp]) / $goal, 2); $stream2['values'][] = array('x' => Dashgoals::$month_labels[$i], 'y' => $value); $goal = ConfigurationKPI::get(strtoupper('dashgoals_avg_cart_value_'.$i.'_'.$year)); $value = 0; if ($goal && isset($orders[$timestamp]) && $orders[$timestamp] && isset($sales[$timestamp]) && $sales[$timestamp]) - $value = round(($sales[$timestamp] / $orders[$timestamp]) / $goal); + $value = round(($sales[$timestamp] / $orders[$timestamp]) / $goal, 2); $stream3['values'][] = array('x' => Dashgoals::$month_labels[$i], 'y' => $value); } - return array('chart_type' => 'bar_chart_goals', 'data' => array($stream1, $stream2, $stream3)); } } \ No newline at end of file