diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-19 20:12:51 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-19 20:12:51 +0300 |
| commit | 1b6050626d18e966cb18f03320ead7af14525db5 (patch) | |
| tree | d6192b535e944226f3e6acf12351db70a5fc36e1 /plugins/MultiSites | |
| parent | 6a14b0ce8461e62a4a37298c370775380305d71b (diff) | |
| parent | 48ca332907257c35a7d94c1b120c9ad6cfaf320d (diff) | |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/Actions/Menu.php
plugins/CoreHome/angularjs/history/history.service.js
plugins/CoreHome/javascripts/menu.js
plugins/CoreHome/templates/_menu.twig
plugins/Dashboard/Menu.php
plugins/Ecommerce/Menu.php
plugins/ExampleUI/Menu.php
plugins/Goals/Menu.php
plugins/Referrers/Menu.php
plugins/VisitsSummary/Menu.php
tests/UI/expected-ui-screenshots
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/MultiSites')
| -rw-r--r-- | plugins/MultiSites/Dashboard.php | 9 | ||||
| -rw-r--r-- | plugins/MultiSites/tests/Integration/ControllerTest.php | 10 | ||||
| -rw-r--r-- | plugins/MultiSites/tests/Integration/DashboardTest.php | 8 |
3 files changed, 12 insertions, 15 deletions
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%', |