diff options
| author | Stefan Giehl <stefan@piwik.org> | 2018-09-20 23:04:58 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-09-20 23:04:58 +0300 |
| commit | 177ceb2abd6013b8630bb1f2d5f323ca358c012a (patch) | |
| tree | 7f54e9c41d3e0a2516126257be30cc388bca0fc0 | |
| parent | 0fa962253f0dfa49a41840cc5cc3284085a27d46 (diff) | |
Ensure action details are sorted stable across PHP versions (#13404)
* Ensure action details are sorted stable across PHP versions
* update expected test files
* Update UI files
19 files changed, 1125 insertions, 1121 deletions
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 4294a7ca9f..db2720dd75 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>95</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's pitch black...</pageTitle> @@ -31,6 +20,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>95</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -357,17 +357,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>45</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -391,6 +380,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>45</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -703,17 +703,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>40</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -737,6 +726,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>40</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1071,17 +1071,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1105,6 +1094,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1417,17 +1417,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>29</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1451,6 +1440,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1785,17 +1785,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>23</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1819,6 +1808,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>23</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2322,17 +2322,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>18</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -2356,6 +2345,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>18</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2469,17 +2469,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>79</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -2503,6 +2492,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>79</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3050,17 +3050,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>12</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -3084,6 +3073,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>12</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3197,17 +3197,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>73</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -3231,6 +3220,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>73</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4132,17 +4132,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>7</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -4166,6 +4155,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>7</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4279,17 +4279,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>57</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -4313,6 +4302,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>57</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4426,17 +4426,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>68</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -4460,6 +4449,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>68</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4573,17 +4573,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>90</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -4607,6 +4596,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>90</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5596,17 +5596,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>1</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -5630,6 +5619,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>1</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5743,17 +5743,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>51</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -5777,6 +5766,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>51</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5890,17 +5890,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>62</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -5924,6 +5913,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>62</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6037,17 +6037,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>84</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -6071,6 +6060,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>84</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index 74a9a1df2b..3f052c4cbc 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d9e6b1852a92af96db09a70d9e250df81857eff1ef7aefcf3e174bcec180363 -size 445376 +oid sha256:6bc2633ff33b90db46e17e59402866424d130dea01b4f636e5cd4e0b7f6e328f +size 449487 diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 7e20c5ba64..72e8880448 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>9</goalPageId> - - <url>http://piwik.net/docs/manage-users/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/manage-users/</url> <pageTitle /> @@ -37,6 +26,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>9</goalPageId> + + <url>http://piwik.net/docs/manage-users/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -127,17 +127,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>8</goalPageId> - - <url>http://piwik.net/docs/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/</url> <pageTitle /> @@ -157,6 +146,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>8</goalPageId> + + <url>http://piwik.net/docs/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -247,17 +247,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>7</goalPageId> - - <url>http://piwik.net/translations/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/translations/</url> <pageTitle /> @@ -277,6 +266,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>7</goalPageId> + + <url>http://piwik.net/translations/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -367,17 +367,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>6</goalPageId> - - <url>http://piwik.net/download/counter/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/download/counter/</url> <pageTitle /> @@ -397,6 +386,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>6</goalPageId> + + <url>http://piwik.net/download/counter/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -487,17 +487,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>5</goalPageId> - - <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/</url> <pageTitle /> @@ -517,6 +506,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>5</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -607,17 +607,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>4</goalPageId> - - <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/manage-websites/</url> <pageTitle /> @@ -637,6 +626,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>4</goalPageId> + + <url>http://piwik.net/docs/manage-websites/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -727,17 +727,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>3</goalPageId> - - <url>http://piwik.net/blog/category/community/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/community/</url> <pageTitle /> @@ -757,6 +746,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>3</goalPageId> + + <url>http://piwik.net/blog/category/community/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -847,17 +847,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>2</goalPageId> - - <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/faq/</url> <pageTitle /> @@ -877,6 +866,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>2</goalPageId> + + <url>http://piwik.net/faq/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -967,17 +967,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>81</goalPageId> - - <url>http://www.included4.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.included4.com/blog/category/meta/</url> <pageTitle /> @@ -997,6 +986,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>81</goalPageId> + + <url>http://www.included4.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1087,17 +1087,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>83</goalPageId> - - <url>http://www.included2.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.included2.com/blog/category/meta/</url> <pageTitle /> @@ -1117,6 +1106,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>83</goalPageId> + + <url>http://www.included2.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 023350b6bd..1b02779675 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -345,17 +345,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>84</goalPageId> - - <url>http://www.notdatefiltered.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.notdatefiltered.com/blog/category/meta/</url> <pageTitle /> @@ -375,6 +364,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>84</goalPageId> + + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -465,17 +465,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>30</goalPageId> - - <url>http://example.org/index.htm</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/index.htm</url> <pageTitle>incredible title!</pageTitle> @@ -503,6 +492,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>30</goalPageId> + + <url>http://example.org/index.htm</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -610,17 +610,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>28</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -640,6 +629,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>28</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -734,17 +734,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>29</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -764,6 +753,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1161,17 +1161,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>22</goalPageId> - - <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/</url> <pageTitle /> @@ -1191,6 +1180,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>22</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1285,17 +1285,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>21</goalPageId> - - <url>http://piwik.net/to-an-error</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/to-an-error</url> <pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle> @@ -1315,6 +1304,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>21</goalPageId> + + <url>http://piwik.net/to-an-error</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index bf059f0fb2..9444dc4dcb 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -633,17 +633,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>title match, triggered ONCE</goalName> - <goalId>1</goalId> - <revenue>10</revenue> - <goalPageId>1</goalPageId> - - <url>http://example.org/index.htm</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/index.htm</url> <pageTitle>incredible title!</pageTitle> @@ -678,6 +667,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> + <type>goal</type> + <goalName>title match, triggered ONCE</goalName> + <goalId>1</goalId> + <revenue>10</revenue> + <goalPageId>1</goalPageId> + + <url>http://example.org/index.htm</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>action</type> <url>http://example.org/index.htm</url> <pageTitle>Another Product page</pageTitle> diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 4e411113f9..4a2cd2dc41 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -322,6 +322,10 @@ class Visitor implements VisitorInterface } if ($ta == $tb) { + if ($a['idlink_va'] == $b['idlink_va']) { + return strcmp($a['type'], $b['type']); + } + if ($a['idlink_va'] > $b['idlink_va']) { return 1; } 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 f61e6a3e1f..2b3c79cdab 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -592,17 +592,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - <revenue>0</revenue> - <goalPageId>1</goalPageId> - - <url>http://example.org/webradio</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/webradio</url> <pageTitle>Welcome!</pageTitle> @@ -621,6 +610,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> + <type>goal</type> + <goalName>triggered js</goalName> + <goalId>1</goalId> + <revenue>0</revenue> + <goalPageId>1</goalPageId> + + <url>http://example.org/webradio</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>event</type> <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> @@ -791,17 +791,6 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> - <type>goal</type> - <goalName>event matching</goalName> - <goalId>3</goalId> - <revenue>0</revenue> - <goalPageId>9</goalPageId> - - <url /> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>event</type> <url /> <pageIdAction /> @@ -819,6 +808,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> + <type>goal</type> + <goalName>event matching</goalName> + <goalId>3</goalId> + <revenue>0</revenue> + <goalPageId>9</goalPageId> + + <url /> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> 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 fe3ffe61aa..fb26ecd352 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -1559,17 +1559,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - <revenue>0</revenue> - <goalPageId>1</goalPageId> - - <url>http://example.org/webradio</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/webradio</url> <pageTitle>Welcome!</pageTitle> @@ -1588,6 +1577,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> + <type>goal</type> + <goalName>triggered js</goalName> + <goalId>1</goalId> + <revenue>0</revenue> + <goalPageId>1</goalPageId> + + <url>http://example.org/webradio</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>event</type> <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> @@ -1758,17 +1758,6 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> - <type>goal</type> - <goalName>event matching</goalName> - <goalId>3</goalId> - <revenue>0</revenue> - <goalPageId>9</goalPageId> - - <url /> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>event</type> <url /> <pageIdAction /> @@ -1786,6 +1775,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> + <type>goal</type> + <goalName>event matching</goalName> + <goalId>3</goalId> + <revenue>0</revenue> + <goalPageId>9</goalPageId> + + <url /> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> 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 eaa21835e1..5feb57989f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>49</goalPageId> - - <url>http://piwik.org/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/</url> <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> @@ -39,6 +28,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>49</goalPageId> + + <url>http://piwik.org/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -300,17 +300,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>47</goalPageId> - - <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> <pageTitle>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</pageTitle> @@ -332,6 +321,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>47</goalPageId> + + <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -762,17 +762,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>43</goalPageId> - - <url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url> <pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle> @@ -794,6 +783,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>43</goalPageId> + + <url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -919,17 +919,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>42</goalPageId> - - <url>https://piwik.org/log-analytics/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/log-analytics/</url> <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> @@ -949,6 +938,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>42</goalPageId> + + <url>https://piwik.org/log-analytics/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1062,17 +1062,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>41</goalPageId> - - <url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url> <pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle> @@ -1094,6 +1083,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>41</goalPageId> + + <url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1199,17 +1199,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>39</goalPageId> - - <url>http://piwik.org/log-analytics/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/log-analytics/</url> <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> @@ -1231,6 +1220,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>39</goalPageId> + + <url>http://piwik.org/log-analytics/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1543,17 +1543,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>36</goalPageId> - - <url>http://piwik.org/docs/installation/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/docs/installation/</url> <pageTitle>Hello Installing Piwik - Analytics - Piwik</pageTitle> @@ -1575,6 +1564,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>36</goalPageId> + + <url>http://piwik.org/docs/installation/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1692,17 +1692,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.org/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.org/</url> <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> @@ -1724,6 +1713,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.org/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2181,17 +2181,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>86</goalPageId> - - <url>http://piwik.net/view/my/file.html</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/view/my/file.html</url> <pageTitle /> @@ -2213,6 +2202,17 @@ </customVariables> <bandwidth_pretty>182 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>86</goalPageId> + + <url>http://piwik.net/view/my/file.html</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2305,17 +2305,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>99</goalPageId> - - <url>http://www.notdatefiltered.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.notdatefiltered.com/blog/category/meta/</url> <pageTitle /> @@ -2335,6 +2324,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>99</goalPageId> + + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2571,17 +2571,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>94</goalPageId> - - <url>http://hello.example.com/hello/from/another/world/6,681965</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://hello.example.com/hello/from/another/world/6,681965</url> <pageTitle /> @@ -2611,6 +2600,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>94</goalPageId> + + <url>http://hello.example.com/hello/from/another/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -2889,17 +2889,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>82</goalPageId> - - <url>http://hello.example.com/hello/world/6,681965</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://hello.example.com/hello/world/6,681965</url> <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> @@ -2921,6 +2910,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>82</goalPageId> + + <url>http://hello.example.com/hello/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3045,17 +3045,6 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>83</goalPageId> - - <url>http://hello.example.com/hello/from/another/world/6,681965</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://hello.example.com/hello/from/another/world/6,681965</url> <pageTitle /> @@ -3077,6 +3066,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>83</goalPageId> + + <url>http://hello.example.com/hello/from/another/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3169,17 +3169,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>92</goalPageId> - - <url>http://example.hello.com/Topic/hw43061</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.hello.com/Topic/hw43061</url> <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> @@ -3207,6 +3196,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>92</goalPageId> + + <url>http://example.hello.com/Topic/hw43061</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3303,17 +3303,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>30</goalPageId> - - <url>http://example.org/index.htm</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/index.htm</url> <pageTitle>incredible title!</pageTitle> @@ -3341,6 +3330,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>30</goalPageId> + + <url>http://example.org/index.htm</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3450,17 +3450,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>31</goalPageId> - - <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> <pageTitle>Piwik Forums</pageTitle> @@ -3480,6 +3469,17 @@ </customVariables> <bandwidth_pretty>43 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>31</goalPageId> + + <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3605,17 +3605,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>89</goalPageId> - - <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/</url> <pageTitle /> @@ -3637,6 +3626,17 @@ </customVariables> <bandwidth_pretty>915 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>89</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3729,17 +3729,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>90</goalPageId> - - <url>http://piwik.net/api/fútbol-user-agent</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/api/fútbol-user-agent</url> <pageTitle /> @@ -3761,6 +3750,17 @@ </customVariables> <bandwidth_pretty>267 B</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>90</goalPageId> + + <url>http://piwik.net/api/fútbol-user-agent</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4078,17 +4078,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>28</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -4108,6 +4097,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>28</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4204,17 +4204,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>29</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -4234,6 +4223,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4637,17 +4637,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>22</goalPageId> - - <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/</url> <pageTitle /> @@ -4667,6 +4656,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>22</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -4763,17 +4763,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>21</goalPageId> - - <url>http://piwik.net/to-an-error</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/to-an-error</url> <pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle> @@ -4793,6 +4782,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>21</goalPageId> + + <url>http://piwik.net/to-an-error</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5004,17 +5004,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>20</goalPageId> - - <url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url> <pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F</pageTitle> @@ -5034,6 +5023,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>20</goalPageId> + + <url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5130,17 +5130,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>19</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -5160,6 +5149,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>19</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5256,17 +5256,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>17</goalPageId> - - <url>http://piwik.net/hosting/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/hosting/</url> <pageTitle /> @@ -5286,6 +5275,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>17</goalPageId> + + <url>http://piwik.net/hosting/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5378,17 +5378,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>16</goalPageId> - - <url>http://piwik.net/faq/how-to-install/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/faq/how-to-install/</url> <pageTitle /> @@ -5408,6 +5397,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>16</goalPageId> + + <url>http://piwik.net/faq/how-to-install/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5500,17 +5500,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>15</goalPageId> - - <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url> <pageTitle /> @@ -5530,6 +5519,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>15</goalPageId> + + <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5622,17 +5622,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>14</goalPageId> - - <url>http://piwik.net/intranet-analytics/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/intranet-analytics/</url> <pageTitle /> @@ -5652,6 +5641,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>14</goalPageId> + + <url>http://piwik.net/intranet-analytics/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5744,17 +5744,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>13</goalPageId> - - <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/manage-websites/</url> <pageTitle /> @@ -5774,6 +5763,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>13</goalPageId> + + <url>http://piwik.net/docs/manage-websites/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5866,17 +5866,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>12</goalPageId> - - <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/faq/</url> <pageTitle /> @@ -5896,6 +5885,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>12</goalPageId> + + <url>http://piwik.net/faq/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -5988,17 +5988,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>11</goalPageId> - - <url>http://piwik.net/faq/how-to/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/faq/how-to/</url> <pageTitle /> @@ -6018,6 +6007,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>11</goalPageId> + + <url>http://piwik.net/faq/how-to/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6110,17 +6110,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>10</goalPageId> - - <url>http://piwik.net/newsletter/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/newsletter/</url> <pageTitle /> @@ -6140,6 +6129,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>10</goalPageId> + + <url>http://piwik.net/newsletter/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6232,17 +6232,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>95</goalPageId> - - <url>http://included3.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://included3.com/blog/category/meta/</url> <pageTitle /> @@ -6262,6 +6251,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>95</goalPageId> + + <url>http://included3.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6354,17 +6354,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>97</goalPageId> - - <url>http://included1.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://included1.com/blog/category/meta/</url> <pageTitle /> @@ -6384,6 +6373,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>97</goalPageId> + + <url>http://included1.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6476,17 +6476,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>9</goalPageId> - - <url>http://piwik.net/docs/manage-users/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/manage-users/</url> <pageTitle /> @@ -6506,6 +6495,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>9</goalPageId> + + <url>http://piwik.net/docs/manage-users/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6598,17 +6598,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>8</goalPageId> - - <url>http://piwik.net/docs/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/</url> <pageTitle /> @@ -6628,6 +6617,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>8</goalPageId> + + <url>http://piwik.net/docs/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6720,17 +6720,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>7</goalPageId> - - <url>http://piwik.net/translations/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/translations/</url> <pageTitle /> @@ -6750,6 +6739,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>7</goalPageId> + + <url>http://piwik.net/translations/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6842,17 +6842,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>6</goalPageId> - - <url>http://piwik.net/download/counter/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/download/counter/</url> <pageTitle /> @@ -6872,6 +6861,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>6</goalPageId> + + <url>http://piwik.net/download/counter/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -6964,17 +6964,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>5</goalPageId> - - <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/</url> <pageTitle /> @@ -6994,6 +6983,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>5</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7086,17 +7086,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>4</goalPageId> - - <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/docs/manage-websites/</url> <pageTitle /> @@ -7116,6 +7105,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>4</goalPageId> + + <url>http://piwik.net/docs/manage-websites/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7208,17 +7208,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>3</goalPageId> - - <url>http://piwik.net/blog/category/community/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/community/</url> <pageTitle /> @@ -7238,6 +7227,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>3</goalPageId> + + <url>http://piwik.net/blog/category/community/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7330,17 +7330,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>2</goalPageId> - - <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/faq/</url> <pageTitle /> @@ -7360,6 +7349,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>2</goalPageId> + + <url>http://piwik.net/faq/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7452,17 +7452,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>96</goalPageId> - - <url>http://www.included4.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.included4.com/blog/category/meta/</url> <pageTitle /> @@ -7482,6 +7471,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>96</goalPageId> + + <url>http://www.included4.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7574,17 +7574,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>98</goalPageId> - - <url>http://www.included2.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://www.included2.com/blog/category/meta/</url> <pageTitle /> @@ -7604,6 +7593,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>98</goalPageId> + + <url>http://www.included2.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -7696,17 +7696,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>1</goalPageId> - - <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/blog/category/meta/</url> <pageTitle /> @@ -7726,6 +7715,17 @@ </customVariables> <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>1</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 bd886dc9b1..fba3a5e563 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 @@ -228,17 +228,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>45</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -262,6 +251,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>45</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 5ad47a0374..0985cf8788 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 @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>40</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -41,6 +30,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>40</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -375,17 +375,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -409,6 +398,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 e3681e8a9f..a1c9de2cfc 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 @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>95</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's pitch black...</pageTitle> @@ -31,6 +20,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>95</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -357,17 +357,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>45</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -391,6 +380,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>45</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -703,17 +703,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>40</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -737,6 +726,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>40</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1071,17 +1071,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1105,6 +1094,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 e3681e8a9f..a1c9de2cfc 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 @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>95</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's pitch black...</pageTitle> @@ -31,6 +20,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>95</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -357,17 +357,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>45</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -391,6 +380,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>45</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -703,17 +703,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>40</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -737,6 +726,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>40</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1071,17 +1071,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1105,6 +1094,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 639466c4cf..3a392d2628 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>95</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's pitch black...</pageTitle> @@ -31,6 +20,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>95</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -357,17 +357,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>45</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -391,6 +380,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>45</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -703,17 +703,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>40</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -737,6 +726,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>40</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1071,17 +1071,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>34</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1105,6 +1094,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>34</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -1417,17 +1417,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>29</goalPageId> - - <url>http://piwik.net/grue/lair</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://piwik.net/grue/lair</url> <pageTitle>It's <script> pitch black...</pageTitle> @@ -1451,6 +1440,17 @@ </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/grue/lair</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> 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 a62dd272f2..c730ed9aa9 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 @@ -7,17 +7,6 @@ <actionDetails> <row> - <type>goal</type> - <goalName>matching purchase.htm</goalName> - <goalId>2</goalId> - <revenue>1</revenue> - <goalPageId>9</goalPageId> - - <url>http://example.org/store/purchase.htm</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>action</type> <url>http://example.org/store/purchase.htm</url> <pageTitle>Checkout/Purchasing...</pageTitle> @@ -33,6 +22,17 @@ <bandwidth_pretty>0 M</bandwidth_pretty> </row> + <row> + <type>goal</type> + <goalName>matching purchase.htm</goalName> + <goalId>2</goalId> + <revenue>1</revenue> + <goalPageId>9</goalPageId> + + <url>http://example.org/store/purchase.htm</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index eaea363bc1..9afac42cdc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:941e663fbb49b2021aebfb78ddf5c5fbc9c1bd8eb3ad17f6ba0e587d830784ba -size 460867 +oid sha256:8242299b78af1032c1d64c98146ca45af4f8ed8e5c864c22fdbe561c9586b665 +size 473356 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index 2e4b1d6f3a..b69ae55f3f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6504cb4c017a8a6c459b24fd2885f85df6e7e2e267286086261524bbfaec1ec -size 425000 +oid sha256:779a8c2435c158e6c007aefba152a399d4d03a8895c834805509a5e461a5d380 +size 425102 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index a6143dd89f..4d8aa35243 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b4ed3d8a42e8486fb93393763ff5a9892d834eb93653eb29047658951af5167 -size 442537 +oid sha256:fe787028f37cc8366fc6d67f9a75ae865f35eab2a9a095ede0b38a7c24f51f47 +size 455047 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index c331c85193..ed7075db87 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbecdcdc33ad72d30df1e97f8cf49d156c123e449685d863e5cf4a66d2167f9f -size 343389 +oid sha256:497128d0fa4eeec8bb19c3fb7056db6069fa56c6c425df35d57936576aefd28c +size 354133 |
