diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-04-04 15:09:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 15:09:02 +0300 |
| commit | bc8222d451337185db343486319af6782b009148 (patch) | |
| tree | 068d6b02899c989e269769a8d8109b55bfdd1298 /tests/PHPUnit/System/expected | |
| parent | ce16414530ab7f3d6d7899376c3d1465c2cd403a (diff) | |
| parent | e33674ec3acb5dc71411d84a0b388892eb182b09 (diff) | |
Merge pull request #11585 from piwik/3.x-dev3.0.3
Release Piwik 3.0.3
Diffstat (limited to 'tests/PHPUnit/System/expected')
74 files changed, 821 insertions, 870 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 1767b3b86f..1b1925d1ec 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -89,7 +89,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -107,10 +107,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -203,7 +203,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -221,10 +221,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -317,7 +317,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -335,10 +335,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -431,7 +431,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -449,10 +449,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -545,7 +545,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -563,10 +563,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -659,7 +659,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -677,10 +677,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -773,7 +773,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -791,10 +791,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -887,7 +887,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -905,10 +905,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1001,7 +1001,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -1019,10 +1019,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 9d70523384..20a0ff9335 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -280,7 +280,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -298,10 +298,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -402,7 +402,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -433,10 +433,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -529,7 +529,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -551,10 +551,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -647,7 +647,7 @@ <continentCode>asi</continentCode> <country>South Korea</country> <countryCode>kr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/kr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/kr.png</countryFlag> <region>Seoul-t'ukpyolsi</region> <regionCode>11</regionCode> <city>Seoul</city> @@ -669,10 +669,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -784,7 +784,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -806,10 +806,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -929,7 +929,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -951,10 +951,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1047,7 +1047,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -1069,10 +1069,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1165,7 +1165,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -1187,10 +1187,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1272,7 +1272,7 @@ <continentCode>oce</continentCode> <country>Australia</country> <countryCode>au</countryCode> - <countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/au.png</countryFlag> <region /> <regionCode /> <city /> @@ -1294,10 +1294,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1390,7 +1390,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -1412,10 +1412,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 2569b8da4d..acfde7e3fc 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -83,7 +83,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -268,7 +268,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -399,7 +399,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -573,7 +573,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -704,7 +704,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -897,7 +897,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -1028,7 +1028,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -1202,7 +1202,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1333,7 +1333,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1526,7 +1526,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Kent</region> <regionCode>G5</regionCode> <city>Stratford-upon-Avon</city> @@ -1657,7 +1657,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Kent</region> <regionCode>G5</regionCode> <city>Stratford-upon-Avon</city> @@ -1831,7 +1831,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>London, City of</region> <regionCode>H9</regionCode> <city>London</city> @@ -2005,7 +2005,7 @@ <continentCode>asi</continentCode> <country>Tibet</country> <countryCode>ti</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag> <region>Unknown</region> <regionCode>1</regionCode> <city>Lhasa</city> @@ -2128,7 +2128,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>London, City of</region> <regionCode>H9</regionCode> <city>London</city> @@ -2259,7 +2259,7 @@ <continentCode>asi</continentCode> <country>Tibet</country> <countryCode>ti</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag> <region>Unknown</region> <regionCode>1</regionCode> <city>Lhasa</city> @@ -2452,7 +2452,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -2645,7 +2645,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2768,7 +2768,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -2899,7 +2899,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -3073,7 +3073,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Nuneaton and Bedworth</city> @@ -3247,7 +3247,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -3421,7 +3421,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -3587,7 +3587,7 @@ <continentCode>asi</continentCode> <country>Indonesia</country> <countryCode>id</countryCode> - <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/id.png</countryFlag> <region /> <regionCode /> <city /> @@ -3718,7 +3718,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Nuneaton and Bedworth</city> @@ -3849,7 +3849,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -3980,7 +3980,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -4111,7 +4111,7 @@ <continentCode>asi</continentCode> <country>Indonesia</country> <countryCode>id</countryCode> - <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/id.png</countryFlag> <region /> <regionCode /> <city /> @@ -4304,7 +4304,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -4497,7 +4497,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -4690,7 +4690,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -4875,7 +4875,7 @@ <continentCode>eur</continentCode> <country>Italy</country> <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/it.png</countryFlag> <region /> <regionCode /> <city /> @@ -5006,7 +5006,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -5137,7 +5137,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -5268,7 +5268,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -5399,7 +5399,7 @@ <continentCode>eur</continentCode> <country>Italy</country> <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/it.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml new file mode 100644 index 0000000000..9a80fd221e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>France</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> + <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 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index f1426e40f6..f6e2c74e73 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -73,7 +73,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -106,10 +106,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -186,7 +186,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -219,10 +219,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -377,7 +377,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -410,10 +410,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -490,7 +490,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -523,10 +523,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -894,7 +894,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -927,10 +927,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1007,7 +1007,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1036,10 +1036,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1116,7 +1116,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1145,10 +1145,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1303,7 +1303,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1332,10 +1332,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1412,7 +1412,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1441,10 +1441,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1761,7 +1761,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1790,10 +1790,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 3327e3002e..6256dca24b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -73,7 +73,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -102,10 +102,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -182,7 +182,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -211,10 +211,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -369,7 +369,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -398,10 +398,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -478,7 +478,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -507,10 +507,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -827,7 +827,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -856,10 +856,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -936,7 +936,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -969,10 +969,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1049,7 +1049,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1082,10 +1082,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1240,7 +1240,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1273,10 +1273,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1353,7 +1353,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1386,10 +1386,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1757,7 +1757,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -1790,10 +1790,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index a41bee8bd7..4b2ba500d1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -91,7 +91,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>North Carolina</region> <regionCode>NC</regionCode> <city>Raleigh</city> @@ -128,10 +128,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -243,7 +243,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>Lake Forest</city> @@ -267,10 +267,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -365,7 +365,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region /> <regionCode /> <city /> @@ -414,10 +414,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -529,7 +529,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -570,10 +570,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -655,7 +655,7 @@ <continentCode>eur</continentCode> <country>Belgium</country> <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/be.png</countryFlag> <region>Limburg</region> <regionCode>05</regionCode> <city>Maaseik</city> @@ -696,10 +696,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -794,7 +794,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>San Francisco</city> @@ -843,10 +843,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -939,7 +939,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region>Kanagawa</region> <regionCode>19</regionCode> <city>Nihon'odori</city> @@ -976,10 +976,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1074,7 +1074,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region>Nordrhein-Westfalen</region> <regionCode>07</regionCode> <city>Weilerswist</city> @@ -1103,10 +1103,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1201,7 +1201,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region>Rheinland-Pfalz</region> <regionCode>08</regionCode> <city>Mainz</city> @@ -1250,10 +1250,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1388,7 +1388,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Moscow City</region> <regionCode>48</regionCode> <city>Moscow</city> @@ -1421,10 +1421,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1519,7 +1519,7 @@ <continentCode>eur</continentCode> <country>Turkey</country> <countryCode>tr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/tr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/tr.png</countryFlag> <region>Rize</region> <regionCode>53</regionCode> <city>Esentepe</city> @@ -1560,10 +1560,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1658,7 +1658,7 @@ <continentCode>eur</continentCode> <country>Belgium</country> <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/be.png</countryFlag> <region>Limburg</region> <regionCode>05</regionCode> <city>Maaseik</city> @@ -1699,10 +1699,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1986,7 +1986,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -2006,10 +2006,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2104,7 +2104,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -2124,10 +2124,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2239,7 +2239,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -2259,10 +2259,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2365,7 +2365,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2389,10 +2389,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2535,7 +2535,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2559,10 +2559,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2657,7 +2657,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2677,10 +2677,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2804,7 +2804,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2824,10 +2824,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -2928,7 +2928,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -2952,10 +2952,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3056,7 +3056,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -3089,10 +3089,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3185,7 +3185,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -3234,10 +3234,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3332,7 +3332,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>Nunavut</region> <regionCode>NU</regionCode> <city>Igloolik</city> @@ -3352,10 +3352,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3450,7 +3450,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>New Jersey</region> <regionCode>NJ</regionCode> <city>Mount Laurel</city> @@ -3470,10 +3470,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3557,7 +3557,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -3577,10 +3577,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3663,7 +3663,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -3683,10 +3683,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3779,7 +3779,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -3803,10 +3803,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -3899,7 +3899,7 @@ <continentCode>asi</continentCode> <country>South Korea</country> <countryCode>kr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/kr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/kr.png</countryFlag> <region>Seoul-t'ukpyolsi</region> <regionCode>11</regionCode> <city>Seoul</city> @@ -3923,10 +3923,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4038,7 +4038,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -4062,10 +4062,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4185,7 +4185,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -4209,10 +4209,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4305,7 +4305,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -4329,10 +4329,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4425,7 +4425,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -4449,10 +4449,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4534,7 +4534,7 @@ <continentCode>oce</continentCode> <country>Australia</country> <countryCode>au</countryCode> - <countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/au.png</countryFlag> <region /> <regionCode /> <city /> @@ -4558,10 +4558,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4654,7 +4654,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -4678,10 +4678,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4774,7 +4774,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -4798,10 +4798,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -4894,7 +4894,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -4914,10 +4914,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5010,7 +5010,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -5030,10 +5030,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5126,7 +5126,7 @@ <continentCode>ams</continentCode> <country>Brazil</country> <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/br.png</countryFlag> <region /> <regionCode /> <city /> @@ -5146,10 +5146,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5242,7 +5242,7 @@ <continentCode>ams</continentCode> <country>Brazil</country> <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/br.png</countryFlag> <region /> <regionCode /> <city /> @@ -5262,10 +5262,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5358,7 +5358,7 @@ <continentCode>ams</continentCode> <country>Brazil</country> <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/br.png</countryFlag> <region /> <regionCode /> <city /> @@ -5378,10 +5378,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5474,7 +5474,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -5494,10 +5494,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5590,7 +5590,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -5610,10 +5610,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5706,7 +5706,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -5726,10 +5726,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5822,7 +5822,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -5842,10 +5842,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -5938,7 +5938,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -5958,10 +5958,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6054,7 +6054,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -6074,10 +6074,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6170,7 +6170,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -6190,10 +6190,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6286,7 +6286,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>Virginia</region> <regionCode>VA</regionCode> <city>Ashburn</city> @@ -6306,10 +6306,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6402,7 +6402,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -6422,10 +6422,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6518,7 +6518,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -6538,10 +6538,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6634,7 +6634,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -6654,10 +6654,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -6750,7 +6750,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> @@ -6770,10 +6770,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 4f7962f12b..e7b230a210 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -25,7 +25,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Ashburn, Virginia, United States</label> @@ -53,7 +53,7 @@ <country>us</country> <country_name>United States</country_name> <region_name>Virginia</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> <row> <label>Igloolik, Nunavut, Canada</label> @@ -81,7 +81,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>Nunavut</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Mount Laurel, New Jersey, United States</label> @@ -109,7 +109,7 @@ <country>us</country> <country_name>United States</country_name> <region_name>New Jersey</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> <row> <label>Seoul, Seoul-t'ukpyolsi, South Korea</label> @@ -137,6 +137,6 @@ <country>kr</country> <country_name>South Korea</country_name> <region_name>Seoul-t'ukpyolsi</region_name> - <logo>plugins/UserCountry/images/flags/kr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/kr.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 70da83f4e9..63c3f98c5a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -19,10 +19,9 @@ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>jp</code> - <logo>plugins/UserCountry/images/flags/jp.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/jp.png</logo> <segment>countryCode==jp</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>United States</label> @@ -43,10 +42,9 @@ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> <segment>countryCode==us</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Unknown</label> @@ -68,10 +66,9 @@ <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <code>xx</code> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> <segment>countryCode==xx</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Brazil</label> @@ -92,10 +89,9 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>br</code> - <logo>plugins/UserCountry/images/flags/br.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/br.png</logo> <segment>countryCode==br</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Australia</label> @@ -108,10 +104,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>au</code> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> <segment>countryCode==au</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Canada</label> @@ -132,10 +127,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ca</code> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> <segment>countryCode==ca</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>South Korea</label> @@ -156,9 +150,8 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>kr</code> - <logo>plugins/UserCountry/images/flags/kr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/kr.png</logo> <segment>countryCode==kr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index ca4f6b23bf..0b3b63e919 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -23,7 +23,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Virginia, United States</label> @@ -48,7 +48,7 @@ <country>us</country> <country_name>United States</country_name> <region_name>Virginia</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> <row> <label>New Jersey, United States</label> @@ -73,7 +73,7 @@ <country>us</country> <country_name>United States</country_name> <region_name>New Jersey</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> <row> <label>Nunavut, Canada</label> @@ -98,7 +98,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>Nunavut</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Seoul-t'ukpyolsi, South Korea</label> @@ -123,6 +123,6 @@ <country>kr</country> <country_name>South Korea</country_name> <region_name>Seoul-t'ukpyolsi</region_name> - <logo>plugins/UserCountry/images/flags/kr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/kr.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 6e91c71915..fcc6864644 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -80,7 +80,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>North Carolina</region> <regionCode>NC</regionCode> <city>Raleigh</city> @@ -117,10 +117,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -221,7 +221,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>Lake Forest</city> @@ -245,10 +245,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -332,7 +332,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region /> <regionCode /> <city /> @@ -381,10 +381,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -485,7 +485,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region /> <regionCode /> <city /> @@ -526,10 +526,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -611,7 +611,7 @@ <continentCode>eur</continentCode> <country>Belgium</country> <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/be.png</countryFlag> <region>Limburg</region> <regionCode>05</regionCode> <city>Maaseik</city> @@ -652,10 +652,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -739,7 +739,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>San Francisco</city> @@ -788,10 +788,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -873,7 +873,7 @@ <continentCode>asi</continentCode> <country>Japan</country> <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region>Kanagawa</region> <regionCode>19</regionCode> <city>Nihon'odori</city> @@ -910,10 +910,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -997,7 +997,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region>Nordrhein-Westfalen</region> <regionCode>07</regionCode> <city>Weilerswist</city> @@ -1026,10 +1026,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1113,7 +1113,7 @@ <continentCode>eur</continentCode> <country>Germany</country> <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/de.png</countryFlag> <region>Rheinland-Pfalz</region> <regionCode>08</regionCode> <city>Mainz</city> @@ -1162,10 +1162,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1289,7 +1289,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Moscow City</region> <regionCode>48</regionCode> <city>Moscow</city> @@ -1322,10 +1322,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1409,7 +1409,7 @@ <continentCode>eur</continentCode> <country>Turkey</country> <countryCode>tr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/tr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/tr.png</countryFlag> <region>Rize</region> <regionCode>53</regionCode> <city>Esentepe</city> @@ -1450,10 +1450,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1537,7 +1537,7 @@ <continentCode>eur</continentCode> <country>Belgium</country> <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/be.png</countryFlag> <region>Limburg</region> <regionCode>05</regionCode> <city>Maaseik</city> @@ -1578,10 +1578,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1671,7 +1671,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1704,10 +1704,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1789,7 +1789,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1838,10 +1838,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1965,7 +1965,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1998,10 +1998,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 94f689d62d..da66ef187d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -155,7 +155,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -192,10 +192,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -292,7 +292,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -329,10 +329,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -472,7 +472,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -509,10 +509,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index d454b9c3db..2e513ce895 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -93,7 +93,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -130,10 +130,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -292,7 +292,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -329,10 +329,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -429,7 +429,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -466,10 +466,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 5a4b100f86..520a06bc6b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -75,7 +75,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -196,7 +196,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -317,7 +317,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -438,7 +438,7 @@ <continentCode>eur</continentCode> <country>Italy</country> <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/it.png</countryFlag> <region /> <regionCode /> <city /> @@ -590,7 +590,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -742,7 +742,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -886,7 +886,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index d7bb4bf39a..50a69b836c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -89,7 +89,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -251,7 +251,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Warwickshire</region> <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> @@ -379,7 +379,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -541,7 +541,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region>Franche-Comte</region> <regionCode>A6</regionCode> <city>Besançon</city> @@ -669,7 +669,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -831,7 +831,7 @@ <continentCode>amn</continentCode> <country>Canada</country> <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ca.png</countryFlag> <region>British Columbia</region> <regionCode>BC</regionCode> <city>Vancouver</city> @@ -951,7 +951,7 @@ <continentCode>eur</continentCode> <country>Italy</country> <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/it.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 6860c259d7..198d996bfc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -112,10 +112,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -274,7 +274,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -311,10 +311,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -411,7 +411,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -448,10 +448,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -591,7 +591,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -628,10 +628,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -728,7 +728,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -765,10 +765,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -927,7 +927,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -964,10 +964,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1064,7 +1064,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -1101,10 +1101,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 6b0807d712..f73ae2256a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -123,7 +123,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -253,7 +253,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -417,7 +417,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -563,7 +563,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -693,7 +693,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -823,7 +823,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -943,7 +943,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 6860c259d7..198d996bfc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -112,10 +112,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -274,7 +274,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -311,10 +311,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -411,7 +411,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -448,10 +448,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -591,7 +591,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -628,10 +628,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -728,7 +728,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -765,10 +765,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -927,7 +927,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -964,10 +964,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1064,7 +1064,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -1101,10 +1101,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 29a0f0d4fb..608a2b87f4 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -112,10 +112,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -274,7 +274,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -311,10 +311,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -411,7 +411,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -448,10 +448,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -591,7 +591,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -628,10 +628,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -728,7 +728,7 @@ <continentCode>eur</continentCode> <country>Macedonia</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -765,10 +765,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -927,7 +927,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -964,10 +964,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1064,7 +1064,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -1101,10 +1101,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1244,7 +1244,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1281,10 +1281,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1381,7 +1381,7 @@ <continentCode>eur</continentCode> <country>Russia</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1418,10 +1418,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -1580,7 +1580,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag> <region>Kent</region> <regionCode>G5</regionCode> <city>Stratford-upon-Avon</city> @@ -1617,10 +1617,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index f9f34d09f3..7df3efc479 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -29,7 +29,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Vancouver, British Columbia, Canada</label> @@ -62,7 +62,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> @@ -95,7 +95,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Besançon, Franche-Comte, France</label> @@ -128,7 +128,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Hluboká nad Vltavou, Saint Petersburg City, Russia</label> @@ -159,7 +159,7 @@ <country>ru</country> <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/images/flags/ru.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ru.png</logo> </row> <row> <label>Lhasa, Unknown, Tibet</label> @@ -192,7 +192,7 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> </row> <row> <label>London, London, City of, United Kingdom</label> @@ -223,7 +223,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>London, City of</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> @@ -254,7 +254,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Stratford-upon-Avon, Kent, United Kingdom</label> @@ -285,7 +285,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Kent</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Stratford-upon-Avon, Miravci, Macedonia</label> @@ -316,7 +316,7 @@ <country>mk</country> <country_name>Macedonia</country_name> <region_name>Miravci</region_name> - <logo>plugins/UserCountry/images/flags/mk.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo> </row> <row> <label>Stratford-upon-Avon, Saint Petersburg City, Russia</label> @@ -347,7 +347,7 @@ <country>ru</country> <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/images/flags/ru.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ru.png</logo> </row> <row> <label>not a city, California, United States</label> @@ -375,6 +375,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>California</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 82341bda26..3e1bd4e2cc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>gb</code> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> <segment>countryCode==gb</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Canada</label> @@ -53,10 +52,9 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ca</code> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> <segment>countryCode==ca</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Russia</label> @@ -82,10 +80,9 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ru</code> - <logo>plugins/UserCountry/images/flags/ru.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ru.png</logo> <segment>countryCode==ru</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>United States</label> @@ -111,10 +108,9 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> <segment>countryCode==us</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>France</label> @@ -140,10 +136,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Indonesia</label> @@ -169,10 +164,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>id</code> - <logo>plugins/UserCountry/images/flags/id.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/id.png</logo> <segment>countryCode==id</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Italy</label> @@ -198,10 +192,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>it</code> - <logo>plugins/UserCountry/images/flags/it.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/it.png</logo> <segment>countryCode==it</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Macedonia</label> @@ -227,10 +220,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>mk</code> - <logo>plugins/UserCountry/images/flags/mk.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo> <segment>countryCode==mk</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Tibet</label> @@ -256,10 +248,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ti</code> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> <segment>countryCode==ti</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Unknown</label> @@ -285,9 +276,8 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>xx</code> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> <segment>countryCode==xx</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 8d74035038..8e963544ee 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -27,7 +27,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>British Columbia, Canada</label> @@ -57,7 +57,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Warwickshire, United Kingdom</label> @@ -87,7 +87,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Saint Petersburg City, Russia</label> @@ -117,7 +117,7 @@ <country>ru</country> <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/images/flags/ru.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ru.png</logo> </row> <row> <label>Franche-Comte, France</label> @@ -147,7 +147,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Kent, United Kingdom</label> @@ -177,7 +177,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Kent</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>London, City of, United Kingdom</label> @@ -207,7 +207,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>London, City of</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Miravci, Macedonia</label> @@ -237,7 +237,7 @@ <country>mk</country> <country_name>Macedonia</country_name> <region_name>Miravci</region_name> - <logo>plugins/UserCountry/images/flags/mk.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo> </row> <row> <label>Unknown, Tibet</label> @@ -267,7 +267,7 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> </row> <row> <label>California, United States</label> @@ -292,6 +292,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>California</region_name> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml index f3a9d2a67c..3281980946 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>gb</code> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> <segment>countryCode==gb</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Canada</label> @@ -53,9 +52,8 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ca</code> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> <segment>countryCode==ca</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index 312160ddd2..e170d8d501 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -31,6 +31,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 14cb04d3d7..01782fba66 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>gb</code> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> <segment>countryCode==gb</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index eb777c4f04..05f987deef 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index c8d94aac7e..48db8ab5db 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>gb</code> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> <segment>countryCode==gb</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Russia</label> @@ -53,10 +52,9 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ru</code> - <logo>plugins/UserCountry/images/flags/ru.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ru.png</logo> <segment>countryCode==ru</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>France</label> @@ -82,10 +80,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Italy</label> @@ -111,10 +108,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>it</code> - <logo>plugins/UserCountry/images/flags/it.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/it.png</logo> <segment>countryCode==it</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Macedonia</label> @@ -140,9 +136,8 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>mk</code> - <logo>plugins/UserCountry/images/flags/mk.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo> <segment>countryCode==mk</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index 092f2c0db8..cb1ce9b492 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -31,6 +31,6 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index e4b7c8e8ff..5c1e0ee7b7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ca</code> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> <segment>countryCode==ca</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index dc4bb6c0af..5b6c579fd9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index aefcded3e8..26ea4337d0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -31,7 +31,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> @@ -62,6 +62,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 69cd5479ef..4b743fcad0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>gb</code> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> <segment>countryCode==gb</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 7dc6b84073..bbe13fca3c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/images/flags/gb.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index e2562def53..c0135236f8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -28,6 +28,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index d358b9a330..01c30c1a1b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -23,7 +23,7 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index a32f142d6e..be4c941999 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -26,6 +26,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index ef0c6d4fcf..7884fcdf89 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -85,7 +85,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -114,10 +114,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -303,7 +303,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -332,10 +332,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 0c927196d9..7a36771e5e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -29,6 +29,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index c95226160c..45bb6b9f18 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -24,9 +24,8 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index 2a364cd566..d1663e0ee4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -27,6 +27,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index c75da162ca..ce7e76cd29 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -101,10 +101,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -193,7 +193,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -222,10 +222,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 00e9c1cdba..6e1b82df61 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -77,7 +77,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -97,10 +97,10 @@ <serverDatePretty>Sunday, April 7, 2013</serverDatePretty> <serverDatePrettyFirstAction>Sunday, April 7, 2013</serverDatePrettyFirstAction> <serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -181,7 +181,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -201,10 +201,10 @@ <serverDatePretty>Saturday, April 6, 2013</serverDatePretty> <serverDatePrettyFirstAction>Saturday, April 6, 2013</serverDatePrettyFirstAction> <serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -285,7 +285,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -305,10 +305,10 @@ <serverDatePretty>Friday, April 5, 2013</serverDatePretty> <serverDatePrettyFirstAction>Friday, April 5, 2013</serverDatePrettyFirstAction> <serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 0fba801755..6b911721dd 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -101,10 +101,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 95b5726131..a20f435ec9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -599,7 +599,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -624,7 +624,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -762,7 +762,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -923,7 +923,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -948,7 +948,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1018,7 +1018,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1043,7 +1043,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1068,7 +1068,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1138,7 +1138,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1163,7 +1163,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1188,7 +1188,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera 9.63 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1372,7 +1372,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1397,7 +1397,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1569,7 +1569,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1582,7 +1582,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1595,7 +1595,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1608,7 +1608,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1621,7 +1621,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1634,7 +1634,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1647,7 +1647,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1660,7 +1660,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1673,7 +1673,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1686,7 +1686,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1708,7 +1708,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1744,7 +1744,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1769,7 +1769,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/fr.png' style="border: 1px solid lightgray; "> France </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1894,7 +1894,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1930,7 +1930,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -2055,7 +2055,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAH6klEQVR4nO3dP2gUfQLH4TFoIxKCOWxceIsVsTz07ORQSX0kcIWFiCBcIWKhQeQKAxaHKHKlIFi8FlZHAlZXiLHIVV7ksEuO5S1ORXjJFcEcgpBcEd99J5tk83XfvJn98zzVzp9NfgjjfjLzm9l9a2trBQDAToaqHgAA0BtEAwAQEQ0AQEQ0AAAR0QAAREQDABARDb2tXq9vt3LLTW3eBQDtiYa+1Wg0dtykHgDIiYbe1mg0Wj746/V6m1wAgI7tr3oA7OwvT/7ZsubPV36347ua9VCuiuaaZm00t7b0h/IAoIVo6AH//s/yly9fmosHDhx4//790aNHk/e2nHgoL65XQvlSxXZ7AkDh8kSv+F9JURQfPnxobiqfIdjxkz7vAMUAQAvR0OfWkyKZ8JjvCcBgcnmi/5VnNiTnIZI9ARhAoqE3HDx4sM3W5hWKHW+zTGYq5HsCMFBEQw+YOF//8P59Z+/NP/tVAgDtiYYe8Ifff1cU33X23vY3Upa3uuUSgPb2ra2tVT0GAKAHuHsCAIiIBgAgIhoAgIhoAAAi7p6omBsW4JtsfiSJgwh2tOVh0sGxIxqq5Dui4JuUv6C1vGa7RaDY5jDp7NhxeQLoGYIAOrCLB45oAAAiogEABsUvvIRnTgMA9L9d+QZj0QAAfW635gi7PAEA/WwX7yryhVUVc4s55MrHS/HTIeMggvZaDpziFxw7ogEAiLg8AQBERAMAEBENAEBENAAAEdEAAEREAwAQEQ1dYX5+vuohQE9y7EBnOjt2RAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAET2Vz0Avnr8t39VPQToPT/++N/5H3b52PnTH3+7uz8Q+oZo6BZ//8cPVQ8BetPip939eaIBtuPyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJH9VQ+guywsLMzNzb17964oilqtdvbs2Xq9XvWgAKAriIavZmdn79y5Mzc317L+zJkzd+/ePXfuXCWjAoDu4fJEURTFo0ePxsbGNhdDURRzc3NjY2MPHz7c+1EBQFcRDcXMzMy1a9dWV1e322F1dXVycvLJkyd7OSoA6DaDHg0rKyvXr19vUwxNN27cWFpa2oMhAUB3GvRoePr06fq0x3VDQ0OTk5MvX76cnp6+dOnS0NDP/z7Ly8v37t2rYowA0BUGPRqePXtWXrx///6DBw/OnTs3MTHx/fffP378uLz1+fPnezs6AOgigx4Nb9++bb4eHh6+efNmeeuVK1eOHz/eXFxcXFxZWdm7wQFAN+nwlst6vd5oNHZ3KHtvaWnp2LFjzcXz589v3ufEiROLi4vNxY8fP3pyAwCD6edo2NwB/VEGbYyOjs7Pz7ffpzzjoSiKkZGRX3NEQLdY//Ng8/+Km1fC4Bj0yxPtzc7OvnnzprlYq9VGR0crHA+wN7b8k6nv/46CHe0cDetlXf9Jmx223K1eUt5/u9c7/ro98/r16/Hx8fKaCxcuVDUYYC9tGQeKAaI5DeW+bmnt7Tatv26zc2e/bs/Mzs6Oj48vLy8319Rqtdu3b+/9SACgS0SXJ7b72G75RA8/3ddjoiiFRcuPqjznZ2ZmxsbGysUwPDw8PT3t2gQAg6zzOQ39enlvYWHh8uXL5WdEDg8Pv3jx4vTp0xWOCgAq13k0NE8S9Jlbt261nGNQDABQlKOhJQKSEwkdd0N5usPmqQ8VajQa5cc+Dg0NKQYAWLdhImQ5Ar5pgsJ2O7dURZeUQRuvXr0qL168eFExwABqudtr/f+uLVfCQGm9e2LzYdCypnl6oM2a8mKbntjxdZu3/0paHuXUcsslMCDccglb8nCnDT59+lRerNVqVY0EALpNh9890a8OHTp08uTJ5uLhw4crHAwAdBXRsMHU1NTU1FTVowCAbiQaNlhZWfn8+XNz0dOcAKDJnIYNrl69+psS854AoEk0AAAR0QAAREQDABAxEXKD8fHxI0eONBdHRkYqHAwAdBXRsMHExMTExETVowCAbuTyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJH9VQ+Ar6b/OlH1EKD3zM/Pnzp1qupRwKBwpgEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCI7FtbW6t6DABAD3CmAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi/wdXRmOGWuCTFQAAAABJRU5ErkJggg==" height="200" width="700" margin="0 auto"/> @@ -2091,7 +2091,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 6369647644..e89f30802e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -578,7 +578,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -603,7 +603,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -727,7 +727,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -874,7 +874,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -899,7 +899,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -962,7 +962,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -987,7 +987,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1012,7 +1012,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1075,7 +1075,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1100,7 +1100,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1125,7 +1125,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera 9.63 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1295,7 +1295,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1320,7 +1320,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1478,7 +1478,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1491,7 +1491,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1504,7 +1504,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1517,7 +1517,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1530,7 +1530,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1543,7 +1543,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1556,7 +1556,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1569,7 +1569,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1582,7 +1582,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1595,7 +1595,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1646,7 +1646,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1671,7 +1671,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/fr.png' style="border: 1px solid lightgray; "> France </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1818,7 +1818,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1965,7 +1965,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex adda5aaba5..906bc48da4 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 286c0b87bf..406af740bc 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -65,10 +65,9 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 7b6386371b..8fac78a731 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -78,10 +78,9 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex a6d50f68e5..6f949c9790 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index d931369c63..65dcc1a5e3 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -98,7 +98,7 @@ <continentCode>eur</continentCode> <country>Poland</country> <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> <region /> <regionCode /> <city /> @@ -327,7 +327,7 @@ <continentCode>eur</continentCode> <country>Poland</country> <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 4a63c7e22e..8019f8be6b 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -75,17 +75,15 @@ <reportMetadata> <row> <code>pl</code> - <logo>plugins/UserCountry/images/flags/pl.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/pl.png</logo> <segment>countryCode==pl</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 8504c298e6..6b870a80fd 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -181,7 +181,7 @@ <continentCode>eur</continentCode> <country>Poland</country> <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> <region /> <regionCode /> <city /> @@ -537,7 +537,7 @@ <continentCode>eur</continentCode> <country>Poland</country> <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> <region /> <regionCode /> <city /> @@ -775,7 +775,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml index 995d52a578..1fbd1b3ea7 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml @@ -40,6 +40,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index 284c301614..c30519b3db 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -30,10 +30,9 @@ <nb_conversions>2</nb_conversions> <revenue>3111.11</revenue> <code>pl</code> - <logo>plugins/UserCountry/images/flags/pl.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/pl.png</logo> <segment>countryCode==pl</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>France</label> @@ -54,9 +53,8 @@ <nb_conversions>1</nb_conversions> <revenue>10</revenue> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml index 6f6499cc36..3d891a7b3e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml @@ -38,6 +38,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index d0e86d01ac..549a8099a7 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -767,7 +767,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -905,7 +905,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1043,7 +1043,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1113,7 +1113,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1183,7 +1183,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1321,7 +1321,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1447,7 +1447,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1460,7 +1460,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1473,7 +1473,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1486,7 +1486,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1499,7 +1499,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1512,7 +1512,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1525,7 +1525,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1538,7 +1538,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1551,7 +1551,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1564,7 +1564,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1586,7 +1586,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1622,7 +1622,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/pl.png' style="border: 1px solid lightgray; "> Poland </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1647,7 +1647,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/fr.png' style="border: 1px solid lightgray; "> France </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1749,7 +1749,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1785,7 +1785,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1910,7 +1910,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1946,7 +1946,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index e4e55f4bc1..f9f4d5404a 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -739,7 +739,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -863,7 +863,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -987,7 +987,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1050,7 +1050,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1113,7 +1113,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1237,7 +1237,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1349,7 +1349,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1362,7 +1362,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1375,7 +1375,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1388,7 +1388,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1401,7 +1401,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1414,7 +1414,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1427,7 +1427,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1440,7 +1440,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1453,7 +1453,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1466,7 +1466,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1517,7 +1517,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/pl.png' style="border: 1px solid lightgray; "> Poland </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1542,7 +1542,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/fr.png' style="border: 1px solid lightgray; "> France </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1666,7 +1666,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1813,7 +1813,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/flags/xx.png' style="border: 1px solid lightgray; "> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 8bf8259f0d..a22fba16e5 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index 1e511f6135..c807579102 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -11,9 +11,8 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index f01ce588fb..fc0189404c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -62,10 +62,9 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -109,10 +109,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -199,7 +199,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -236,10 +236,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -387,7 +387,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -428,10 +428,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -109,10 +109,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -199,7 +199,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -236,10 +236,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -387,7 +387,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -428,10 +428,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index d9f537271f..7cae27dd3a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -30,7 +30,7 @@ <row> <country>fr</country> <nb_visits>2</nb_visits> - <flag>plugins/UserCountry/images/flags/fr.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/fr.png</flag> <prettyName>France</prettyName> </row> </countries> @@ -123,7 +123,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -160,10 +160,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -250,7 +250,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -287,10 +287,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml index f01ce588fb..fc0189404c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml @@ -62,10 +62,9 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -109,10 +109,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -199,7 +199,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -236,10 +236,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -387,7 +387,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -428,10 +428,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -72,7 +72,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -109,10 +109,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -199,7 +199,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -236,10 +236,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -387,7 +387,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -428,10 +428,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index d9f537271f..7cae27dd3a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -30,7 +30,7 @@ <row> <country>fr</country> <nb_visits>2</nb_visits> - <flag>plugins/UserCountry/images/flags/fr.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/fr.png</flag> <prettyName>France</prettyName> </row> </countries> @@ -123,7 +123,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -160,10 +160,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> @@ -250,7 +250,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -287,10 +287,10 @@ - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml index 171e7338ad..57ad67177d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -16,7 +16,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> <label>Nice, Provence-Alpes-Cote d'Azur, France</label> @@ -34,7 +34,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -46,6 +46,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml index cc6727dc54..7c39516a86 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -15,7 +15,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Victoria, Australia</label> @@ -32,7 +32,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> <label>Others</label> @@ -44,6 +44,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index 2f781c0adb..e8636937d0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -14,68 +14,26 @@ </row> <row> <label>Search Engines</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>Websites</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>Search Engines</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>12</nb_visits> + <nb_actions>12</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>Search Engines</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==search</segment> </row> <row> <label>Websites</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>Websites</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==website</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml index ff7ba019b4..d260f831b8 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Melbourne, Victoria, Australia</label> @@ -28,7 +28,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> <label>Nice, Provence-Alpes-Cote d'Azur, France</label> @@ -46,6 +46,6 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml index 4680c84581..5d1560212f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Provence-Alpes-Cote d'Azur, France</label> @@ -27,7 +27,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Victoria, Australia</label> @@ -44,6 +44,6 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index 171e7338ad..57ad67177d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -16,7 +16,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> <label>Nice, Provence-Alpes-Cote d'Azur, France</label> @@ -34,7 +34,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -46,6 +46,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index cc6727dc54..7c39516a86 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -15,7 +15,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Victoria, Australia</label> @@ -32,7 +32,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/images/flags/au.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> <label>Others</label> @@ -44,6 +44,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> </result>
\ No newline at end of file |