use number format for currency in all websites dashboard

5 files changed, 15 insertions, 18 deletions

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 6070d81aae..7fa434b21f 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -295,7 +295,7 @@ class Controller extends ControllerAdmin
         $view->idSite = Common::getRequestVar('idSite', $defaultIdSite, 'int');
 
         $view->defaultReportSiteName = Site::getNameFor($view->idSite);
-        $view->defaultSiteRevenue = \Piwik\Metrics\Formatter::getCurrencySymbol($view->idSite);
+        $view->defaultSiteRevenue = Site::getCurrencySymbolFor($view->idSite);
         $view->maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
 
         $allUrls = APISitesManager::getInstance()->getSiteUrlsFromId($view->idSite);
diff --git a/plugins/MultiSites/Dashboard.php b/plugins/MultiSites/Dashboard.php
index a9032b6fd3..75f8159220 100644
--- a/plugins/MultiSites/Dashboard.php
+++ b/plugins/MultiSites/Dashboard.php
@@ -118,11 +118,13 @@ class Dashboard
 
     private function formatMetrics(&$metrics)
     {
-        $formatter = new NumberFormatter();
+        $formatter = NumberFormatter::getInstance();
         foreach($metrics as $metricName => &$value) {
             if(in_array($metricName, $this->displayedMetricColumns)) {
 
                 if( strpos($metricName, 'revenue') !== false) {
+                    $currency = isset($metrics['idsite']) ? Site::getCurrencySymbolFor($metrics['idsite']) : '';
+                    $value  = $formatter->formatCurrency($value, $currency);
                     continue;
                 }
                 $value = $formatter->format($value);
@@ -325,16 +327,11 @@ class Dashboard
 
     private function enrichValues($sites)
     {
-        $formatter = new Formatter();
-
         foreach ($sites as &$site) {
             if (!isset($site['idsite'])) {
                 continue;
             }
 
-            if (isset($site['revenue'])) {
-                $site['revenue']  = $formatter->getPrettyMoney($site['revenue'], $site['idsite']);
-            }
             $site['main_url'] = Site::getMainUrlFor($site['idsite']);
 
             $this->formatMetrics($site);
diff --git a/plugins/MultiSites/tests/Integration/ControllerTest.php b/plugins/MultiSites/tests/Integration/ControllerTest.php
index 581c426922..6f6b1e743a 100644
--- a/plugins/MultiSites/tests/Integration/ControllerTest.php
+++ b/plugins/MultiSites/tests/Integration/ControllerTest.php
@@ -36,10 +36,10 @@ class ControllerTest extends SystemTestCase
         $this->assertSame(15, count($sites['sites']));
         $this->assertEquals(array(
             'label' => 'Site 1',
-            'nb_visits' => 2,
-            'nb_actions' => 4,
-            'nb_pageviews' => 3,
-            'revenue' => '$ 2541',
+            'nb_visits' => '2',
+            'nb_actions' => '4',
+            'nb_pageviews' => '3',
+            'revenue' => '$2,541',
             'visits_evolution' => '100%',
             'actions_evolution' => '100%',
             'pageviews_evolution' => '100%',
@@ -56,7 +56,7 @@ class ControllerTest extends SystemTestCase
                 'nb_pageviews' => 8,
                 'nb_visits' => 5,
                 'nb_actions' => 12,
-                'revenue' => 5082,
+                'revenue' => '5,082',
                 'nb_visits_lastdate' => 0,
             ),
             'lastDate' => '2013-01-22'
diff --git a/plugins/MultiSites/tests/Integration/DashboardTest.php b/plugins/MultiSites/tests/Integration/DashboardTest.php
index 7c79ce93e9..858af222ce 100644
--- a/plugins/MultiSites/tests/Integration/DashboardTest.php
+++ b/plugins/MultiSites/tests/Integration/DashboardTest.php
@@ -71,7 +71,7 @@ class DashboardTest extends IntegrationTestCase
                 'nb_visits' => 0,
                 'nb_actions' => 0,
                 'nb_pageviews' => 0,
-                'revenue' => '$ 0',
+                'revenue' => '$0',
                 'visits_evolution' => '0%',
                 'actions_evolution' => '0%',
                 'pageviews_evolution' => '0%',
@@ -85,7 +85,7 @@ class DashboardTest extends IntegrationTestCase
                 'nb_visits' => 0,
                 'nb_actions' => 0,
                 'nb_pageviews' => 0,
-                'revenue' => '$ 0',
+                'revenue' => '$0',
                 'visits_evolution' => '0%',
                 'actions_evolution' => '0%',
                 'pageviews_evolution' => '0%',
@@ -99,7 +99,7 @@ class DashboardTest extends IntegrationTestCase
                 'nb_visits' => 0,
                 'nb_actions' => 0,
                 'nb_pageviews' => 0,
-                'revenue' => '$ 0',
+                'revenue' => '$0',
                 'visits_evolution' => '0%',
                 'actions_evolution' => '0%',
                 'pageviews_evolution' => '0%',
@@ -123,7 +123,7 @@ class DashboardTest extends IntegrationTestCase
                 'nb_visits' => 0,
                 'nb_actions' => 0,
                 'nb_pageviews' => 0,
-                'revenue' => '$ 0',
+                'revenue' => '$0',
                 'visits_evolution' => '0%',
                 'actions_evolution' => '0%',
                 'pageviews_evolution' => '0%',
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 65d2784592..4a67c45c2c 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -1242,7 +1242,7 @@ class API extends \Piwik\Plugin\API
      */
     public function getCurrencyList()
     {
-        $currencies = Formatter::getCurrencyList();
+        $currencies = Site::getCurrencyList();
         return array_map(function ($a) {
             return $a[1] . " (" . $a[0] . ")";
         }, $currencies);
@@ -1255,7 +1255,7 @@ class API extends \Piwik\Plugin\API
      */
     public function getCurrencySymbols()
     {
-        $currencies = Formatter::getCurrencyList();
+        $currencies = Site::getCurrencyList();
         return array_map(function ($a) {
             return $a[0];
         }, $currencies);