Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2019-04-10 22:59:31 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-04-10 22:59:31 +0300
commitbeff637e0ec74154b81ca18de50f7c9d30092e8e (patch)
tree39a82c6864c6289e8cbe3dd67e38d672d5e0821c /plugins/Ecommerce
parentff1c579f1faa003e461db2534f2606bd4ac4ddaa (diff)
Readable segment values for browser, os and country segments (#13929)
* Use readable segment value for browser and os segments instead of short codes * readds original segments using short codes * Adds additional segment country name to segment by (english) country name * compare browser and os names case sensitive for segments * use correct segments for reports * update tests
Diffstat (limited to 'plugins/Ecommerce')
-rw-r--r--plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml4
-rw-r--r--plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
index fed58709d5..c0fad7bd09 100644
--- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
+++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
@@ -74,15 +74,15 @@
</reportData>
<reportMetadata>
<row>
+ <segment>countryCode==pl</segment>
<code>pl</code>
<logo>plugins/Morpheus/icons/dist/flags/pl.png</logo>
- <segment>countryCode==pl</segment>
<logoHeight>16</logoHeight>
</row>
<row>
+ <segment>countryCode==fr</segment>
<code>fr</code>
<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
- <segment>countryCode==fr</segment>
<logoHeight>16</logoHeight>
</row>
</reportMetadata>
diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
index c30519b3db..44d4797c79 100644
--- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
+++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
@@ -29,9 +29,9 @@
</goals>
<nb_conversions>2</nb_conversions>
<revenue>3111.11</revenue>
+ <segment>countryCode==pl</segment>
<code>pl</code>
<logo>plugins/Morpheus/icons/dist/flags/pl.png</logo>
- <segment>countryCode==pl</segment>
<logoHeight>16</logoHeight>
</row>
<row>
@@ -52,9 +52,9 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>10</revenue>
+ <segment>countryCode==fr</segment>
<code>fr</code>
<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
- <segment>countryCode==fr</segment>
<logoHeight>16</logoHeight>
</row>
</result> \ No newline at end of file