diff options
54 files changed, 351 insertions, 18 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 4649380afa..3ad513c48e 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 @@ -28,6 +28,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>95</goalPageId> @@ -166,6 +167,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>46</goalPageId> @@ -205,6 +207,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -417,6 +420,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>45</goalPageId> @@ -563,6 +567,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -577,6 +582,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -789,6 +795,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -935,6 +942,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -974,6 +982,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1032,6 +1041,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -1214,6 +1224,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> @@ -1360,6 +1371,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>30</goalPageId> @@ -1374,6 +1386,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1586,6 +1599,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>29</goalPageId> @@ -1732,6 +1746,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>24</goalPageId> @@ -1771,6 +1786,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1983,6 +1999,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>23</goalPageId> @@ -2129,6 +2146,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>19</goalPageId> @@ -2143,6 +2161,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -2201,6 +2220,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -2375,6 +2395,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>80</goalPageId> @@ -2389,6 +2410,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -2447,6 +2469,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -2621,6 +2644,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>18</goalPageId> @@ -2775,6 +2799,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>79</goalPageId> @@ -2921,6 +2946,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>13</goalPageId> @@ -2960,6 +2986,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -3164,6 +3191,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>74</goalPageId> @@ -3203,6 +3231,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -3407,6 +3436,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>12</goalPageId> @@ -3561,6 +3591,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>73</goalPageId> @@ -3707,6 +3738,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>8</goalPageId> @@ -3721,6 +3753,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -3925,6 +3958,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>58</goalPageId> @@ -3939,6 +3973,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -4143,6 +4178,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>69</goalPageId> @@ -4157,6 +4193,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -4353,6 +4390,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>91</goalPageId> @@ -4367,6 +4405,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -4579,6 +4618,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>7</goalPageId> @@ -4733,6 +4773,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>57</goalPageId> @@ -4887,6 +4928,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>68</goalPageId> @@ -5041,6 +5083,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>90</goalPageId> @@ -5187,6 +5230,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>2</goalPageId> @@ -5226,6 +5270,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -5284,6 +5329,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -5458,6 +5504,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>52</goalPageId> @@ -5497,6 +5544,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -5555,6 +5603,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -5729,6 +5778,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>63</goalPageId> @@ -5768,6 +5818,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -5826,6 +5877,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -5992,6 +6044,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>85</goalPageId> @@ -6031,6 +6084,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -6089,6 +6143,7 @@ <revenueDiscount>0</revenueDiscount> <items>1</items> + <itemDetails> <row> <itemSKU>ABCD1234</itemSKU> @@ -6271,6 +6326,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>1</goalPageId> @@ -6425,6 +6481,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>51</goalPageId> @@ -6579,6 +6636,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>62</goalPageId> @@ -6733,6 +6791,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>84</goalPageId> diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 04d64517726ce6a77218408548fd12027a63b66 +Subproject a01244c8d9c12013024640399240fbe1d93234d diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 0b80945cd9..338f63ef02 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -34,6 +34,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>9</goalPageId> @@ -161,6 +162,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>8</goalPageId> @@ -288,6 +290,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>7</goalPageId> @@ -415,6 +418,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>6</goalPageId> @@ -542,6 +546,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>5</goalPageId> @@ -669,6 +674,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>4</goalPageId> @@ -796,6 +802,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>3</goalPageId> @@ -923,6 +930,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>2</goalPageId> @@ -1050,6 +1058,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>81</goalPageId> @@ -1177,6 +1186,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>83</goalPageId> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index bfd3070f01..c37fa9d43f 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -38,6 +38,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>70</goalPageId> @@ -406,6 +407,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>84</goalPageId> @@ -541,6 +543,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>30</goalPageId> @@ -685,6 +688,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>31</goalPageId> @@ -845,6 +849,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>28</goalPageId> @@ -976,6 +981,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>29</goalPageId> @@ -1109,6 +1115,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>26</goalPageId> @@ -1430,6 +1437,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>22</goalPageId> @@ -1561,6 +1569,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>21</goalPageId> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml index 0b80945cd9..338f63ef02 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -34,6 +34,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>9</goalPageId> @@ -161,6 +162,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>8</goalPageId> @@ -288,6 +290,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>7</goalPageId> @@ -415,6 +418,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>6</goalPageId> @@ -542,6 +546,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>5</goalPageId> @@ -669,6 +674,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>4</goalPageId> @@ -796,6 +802,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>3</goalPageId> @@ -923,6 +930,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>2</goalPageId> @@ -1050,6 +1058,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>81</goalPageId> @@ -1177,6 +1186,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>83</goalPageId> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index bfd3070f01..c37fa9d43f 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -38,6 +38,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>70</goalPageId> @@ -406,6 +407,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>84</goalPageId> @@ -541,6 +543,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>30</goalPageId> @@ -685,6 +688,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>31</goalPageId> @@ -845,6 +849,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>28</goalPageId> @@ -976,6 +981,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>29</goalPageId> @@ -1109,6 +1115,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>26</goalPageId> @@ -1430,6 +1437,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>22</goalPageId> @@ -1561,6 +1569,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>21</goalPageId> diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 856810e96e9f80f79fe1308308222c502875584 +Subproject 571a620b96de3357f8d59704bc15ea9b029a52c diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 34721e30c70c9b3183128a50a144440fa1f033d +Subproject c6197160f841aebfde26b440346453f146f5d2a diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index 8d2deca94b..6a723dbbbe 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -11,6 +11,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index f9befc351b..98d6c767b3 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -17,6 +17,7 @@ <revenueDiscount>20</revenueDiscount> <items>2</items> + <itemDetails> <row> <itemSKU>TRIPOD SKU</itemSKU> @@ -45,6 +46,7 @@ <revenueDiscount>0</revenueDiscount> <items>0</items> + <itemDetails> </itemDetails> <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> @@ -282,6 +284,7 @@ <revenue>2510.11</revenue> <items>4</items> + <itemDetails> <row> <itemSKU>SKU VERY nice indeed</itemSKU> 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 5b67fb5f04..9f274e2265 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 @@ -119,6 +119,7 @@ <revenue>2510.11</revenue> <items>4</items> + <itemDetails> <row> <itemSKU>SKU VERY nice indeed</itemSKU> @@ -371,6 +372,7 @@ <revenueDiscount>666</revenueDiscount> <items>8</items> + <itemDetails> <row> <itemSKU>SKU VERY nice indeed</itemSKU> @@ -412,6 +414,7 @@ <revenueDiscount>0</revenueDiscount> <items>2</items> + <itemDetails> <row> <itemSKU>SKU VERY nice indeed</itemSKU> @@ -551,6 +554,7 @@ <revenue>2510.11</revenue> <items>4</items> + <itemDetails> <row> <itemSKU>SKU VERY nice indeed</itemSKU> @@ -747,6 +751,7 @@ <type>goal</type> <goalName>title match, triggered ONCE</goalName> <goalId>1</goalId> + <revenue>10</revenue> <goalPageId>1</goalPageId> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index 05b475c76e..7fb22643d1 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html index 0b733a37eb..4d11f073f1 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html index f157c845a6..357bbd449e 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index e67e9c1741..f4673c6e64 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -7493,7 +7493,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index 3cdf170567..ffe663016a 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -7108,7 +7108,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject c8b18df46bb1918d43d067590c30844880f95b1 +Subproject fc4dc432e60ba30370b4e181f274b623be20738 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject a0919e3456fb19c9fd26088e86c3693e4b509b0 +Subproject b0b5d1637d9d70e35dd6c0aefe6ed9c59c06203 diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons -Subproject cd411d387a6aed04285a77c8032ed651f939d65 +Subproject d7518a5a8e6e9b4d20ddbc62c132f3a6790f07d diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml index b913bba291..730812510f 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml @@ -12,6 +12,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -381,6 +382,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -544,6 +546,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -722,6 +725,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -885,6 +889,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -1214,6 +1219,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -1388,6 +1394,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -1551,6 +1558,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -1920,6 +1928,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -2083,6 +2092,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -2261,6 +2271,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -2424,6 +2435,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -2753,6 +2765,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -2927,6 +2940,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -3090,6 +3104,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -3459,6 +3474,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -3622,6 +3638,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -3800,6 +3817,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -3963,6 +3981,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -4292,6 +4311,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -4466,6 +4486,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -4629,6 +4650,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -4771,6 +4793,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -5302,6 +5325,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -5578,6 +5602,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -5720,6 +5745,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -6251,6 +6277,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -6527,6 +6554,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -6669,6 +6697,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -7200,6 +7229,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -7979,6 +8009,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>211</itemSKU> @@ -8320,6 +8351,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>211</itemSKU> @@ -10870,6 +10902,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>205</itemSKU> @@ -11412,6 +11445,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>205</itemSKU> @@ -14056,6 +14090,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -14542,6 +14577,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -15028,6 +15064,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -15331,6 +15368,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -15494,6 +15532,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -15657,6 +15696,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -15984,6 +16024,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -16311,6 +16352,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -16638,6 +16680,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -17314,6 +17357,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -17650,6 +17694,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -17986,6 +18031,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -18301,6 +18347,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -18670,6 +18717,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -18833,6 +18881,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -19011,6 +19060,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -19174,6 +19224,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -19503,6 +19554,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -19677,6 +19729,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -19840,6 +19893,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -19982,6 +20036,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -20513,6 +20568,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -23067,6 +23123,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -23370,6 +23427,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -23697,6 +23755,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -24045,6 +24104,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -24360,6 +24420,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -24729,6 +24790,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -24892,6 +24954,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -25070,6 +25133,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -25233,6 +25297,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -25562,6 +25627,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -25736,6 +25802,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -25899,6 +25966,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -26268,6 +26336,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -26431,6 +26500,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -26609,6 +26679,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -26772,6 +26843,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -27101,6 +27173,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -27275,6 +27348,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -27438,6 +27512,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -27580,6 +27655,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -28111,6 +28187,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -28387,6 +28464,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -28529,6 +28607,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -29060,6 +29139,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -33709,6 +33789,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -34195,6 +34276,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -34498,6 +34580,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -34661,6 +34744,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -34988,6 +35072,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -35315,6 +35400,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -35827,6 +35913,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -36163,6 +36250,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>202</itemSKU> @@ -36478,6 +36566,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world200</url> @@ -36847,6 +36936,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world202</url> @@ -37010,6 +37100,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world203</url> @@ -37188,6 +37279,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world205</url> @@ -37351,6 +37443,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world206</url> @@ -37680,6 +37773,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world209</url> @@ -37854,6 +37948,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -38017,6 +38112,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world201</url> @@ -38159,6 +38255,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world204</url> @@ -38690,6 +38787,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world210</url> @@ -39156,6 +39254,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>211</itemSKU> @@ -40062,6 +40161,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>205</itemSKU> @@ -41300,6 +41400,7 @@ <items>1</items> + <itemDetails> <row> <itemSKU>208</itemSKU> @@ -41603,6 +41704,7 @@ <goalName>Goal 1</goalName> <goalId>1</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> @@ -41930,6 +42032,7 @@ <goalName>Goal 2</goalName> <goalId>2</goalId> + <goalPageId /> <url>http://www.helloworld.com/hello/world211</url> diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 3cb44ca7867dc27255085b78120c9e47b782706 +Subproject c319cfb53e05fc9c85a8d957a28a2caa318e270 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject e5994c355d0a4cb502749e2085b9ed67c9d4e28 +Subproject 06a88748649286e7fbe6f092ac676cf7fa8f0bf diff --git a/plugins/TagManager b/plugins/TagManager -Subproject 24b9abc86ee66cf7a2788392fe887c6fc4c1f07 +Subproject c63cb96842dd50a6908476fc9e223ce477362d9 diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject f3130a63d13babdb59af78715ce4a8149427440 +Subproject 9299bb8f7db822adcbbf8af1adf456becdf8b32 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject ad9c5abc1ea47c6d7f16c077680f66422c11ba9 +Subproject ef3e05f2807f188f7b36360db032f4677731885 diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 9b873abedb66fc1ad9321c216daa20537f4d866 +Subproject b4ac5f539660ccf77a6a0d411df45181cc8f6ce 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 f95b95f990..3fb722203c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -648,6 +648,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId>1</goalPageId> @@ -709,6 +710,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>8</revenue> <goalPageId>9</goalPageId> @@ -771,6 +773,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>23</revenue> <goalPageId>10</goalPageId> @@ -833,6 +836,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>0</revenue> <goalPageId>11</goalPageId> 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 a0803b43a0..63435b5db1 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -1689,6 +1689,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId>1</goalPageId> @@ -1750,6 +1751,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>8</revenue> <goalPageId>9</goalPageId> @@ -1812,6 +1814,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>23</revenue> <goalPageId>10</goalPageId> @@ -1874,6 +1877,7 @@ <type>goal</type> <goalName>event matching</goalName> <goalId>3</goalId> + <revenue>0</revenue> <goalPageId>11</goalPageId> 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 7fda562bb4..adc77bf581 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -36,6 +36,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>49</goalPageId> @@ -188,6 +189,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -346,6 +348,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>47</goalPageId> @@ -510,6 +513,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>44</goalPageId> @@ -829,6 +833,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>43</goalPageId> @@ -991,6 +996,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>42</goalPageId> @@ -1143,6 +1149,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -1287,6 +1294,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>39</goalPageId> @@ -1453,6 +1461,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -1651,6 +1660,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>36</goalPageId> @@ -1807,6 +1817,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> @@ -1965,6 +1976,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>70</goalPageId> @@ -2337,6 +2349,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>86</goalPageId> @@ -2466,6 +2479,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>99</goalPageId> @@ -2597,6 +2611,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>84</goalPageId> @@ -2759,6 +2774,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>94</goalPageId> @@ -2896,6 +2912,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>80</goalPageId> @@ -3089,6 +3106,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>82</goalPageId> @@ -3255,6 +3273,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>83</goalPageId> @@ -3392,6 +3411,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>92</goalPageId> @@ -3533,6 +3553,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>30</goalPageId> @@ -3679,6 +3700,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>31</goalPageId> @@ -3843,6 +3865,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>89</goalPageId> @@ -3974,6 +3997,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>90</goalPageId> @@ -4336,6 +4360,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>28</goalPageId> @@ -4469,6 +4494,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>29</goalPageId> @@ -4604,6 +4630,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>26</goalPageId> @@ -4929,6 +4956,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>22</goalPageId> @@ -5062,6 +5090,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>21</goalPageId> @@ -5314,6 +5343,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>20</goalPageId> @@ -5447,6 +5477,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>19</goalPageId> @@ -5580,6 +5611,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>17</goalPageId> @@ -5709,6 +5741,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>16</goalPageId> @@ -5838,6 +5871,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>15</goalPageId> @@ -5967,6 +6001,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>14</goalPageId> @@ -6096,6 +6131,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>13</goalPageId> @@ -6225,6 +6261,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>12</goalPageId> @@ -6354,6 +6391,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>11</goalPageId> @@ -6483,6 +6521,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>10</goalPageId> @@ -6612,6 +6651,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>95</goalPageId> @@ -6741,6 +6781,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>97</goalPageId> @@ -6870,6 +6911,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>9</goalPageId> @@ -6999,6 +7041,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>8</goalPageId> @@ -7128,6 +7171,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>7</goalPageId> @@ -7257,6 +7301,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>6</goalPageId> @@ -7386,6 +7431,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>5</goalPageId> @@ -7515,6 +7561,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>4</goalPageId> @@ -7644,6 +7691,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>3</goalPageId> @@ -7773,6 +7821,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>2</goalPageId> @@ -7902,6 +7951,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>96</goalPageId> @@ -8031,6 +8081,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>98</goalPageId> @@ -8160,6 +8211,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>1</goalPageId> 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 474da59fc7..b8118b6fdc 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 @@ -30,6 +30,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>46</goalPageId> @@ -69,6 +70,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -281,6 +283,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>45</goalPageId> @@ -427,6 +430,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -441,6 +445,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> 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 1fdc1d9e98..a6eb5e659f 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 @@ -38,6 +38,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -184,6 +185,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -223,6 +225,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -435,6 +438,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> 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 611f1805e5..9f28957f21 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 @@ -28,6 +28,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>95</goalPageId> @@ -166,6 +167,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>46</goalPageId> @@ -205,6 +207,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -417,6 +420,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>45</goalPageId> @@ -563,6 +567,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -577,6 +582,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -789,6 +795,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -935,6 +942,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -974,6 +982,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1186,6 +1195,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> 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 611f1805e5..9f28957f21 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 @@ -28,6 +28,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>95</goalPageId> @@ -166,6 +167,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>46</goalPageId> @@ -205,6 +207,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -417,6 +420,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>45</goalPageId> @@ -563,6 +567,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -577,6 +582,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -789,6 +795,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -935,6 +942,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -974,6 +982,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1186,6 +1195,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> 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 bb522091e4..ba4595c6ce 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -28,6 +28,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>95</goalPageId> @@ -166,6 +167,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>46</goalPageId> @@ -205,6 +207,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -417,6 +420,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>45</goalPageId> @@ -563,6 +567,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>41</goalPageId> @@ -577,6 +582,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -789,6 +795,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>40</goalPageId> @@ -935,6 +942,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>35</goalPageId> @@ -974,6 +982,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1186,6 +1195,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>34</goalPageId> @@ -1332,6 +1342,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>30</goalPageId> @@ -1346,6 +1357,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> @@ -1558,6 +1570,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>29</goalPageId> @@ -1704,6 +1717,7 @@ <type>goal</type> <goalName>all</goalName> <goalId>1</goalId> + <revenue>5</revenue> <goalPageId>24</goalPageId> @@ -1743,6 +1757,7 @@ <type>goal</type> <goalName>two</goalName> <goalId>2</goalId> + <revenue>5</revenue> <goalPageId /> 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 96a4aedd71..5329fe47a5 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 @@ -30,6 +30,7 @@ <type>goal</type> <goalName>matching purchase.htm</goalName> <goalId>2</goalId> + <revenue>1</revenue> <goalPageId>9</goalPageId> @@ -267,6 +268,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>42</revenue> <goalPageId /> 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 cf75482b78..a35e39e913 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 @@ -152,6 +152,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>42</revenue> <goalPageId /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index c800ede978..fbb64b69f4 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html index 1733510e21..0fc4d087e8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html index 2939f2198b..76af35cb44 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 888cddeeea..cecfa491d6 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -5714,7 +5714,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html index 0e76fd0bcc..771bfdb14a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -5427,7 +5427,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;text-align:center;font-size:13px; color:#666;padding-top:30px;margin-bottom:0;'> Powered by - <a style="color:#439fe0;" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> + <a style="color:#439fe0;" rel="noreferrer" href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index 4c52ca6861..6879b1166d 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -233,6 +233,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> <serverTimePretty>Mar 6, 2010 16:34:33</serverTimePretty> @@ -248,6 +249,7 @@ <revenue>10000000000</revenue> <items>1</items> <serverTimePretty>Mar 6, 2010 16:40:33</serverTimePretty> + <itemDetails> <row> <itemSKU>sku-007-PRISM</itemSKU> diff --git a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml index ab7c148fb2..f322baa549 100644 --- a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml @@ -12,6 +12,7 @@ <revenue>100</revenue> <items>1</items> + <itemDetails> <row> <itemSKU>sku �</itemSKU> 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 04a4680b73..4ee8a5696e 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 @@ -132,6 +132,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> @@ -267,6 +268,7 @@ <type>goal</type> <goalName>second goal</goalName> <goalId>2</goalId> + <revenue>0</revenue> <goalPageId /> @@ -300,6 +302,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> 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 04a4680b73..4ee8a5696e 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 @@ -132,6 +132,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> @@ -267,6 +268,7 @@ <type>goal</type> <goalName>second goal</goalName> <goalId>2</goalId> + <revenue>0</revenue> <goalPageId /> @@ -300,6 +302,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> 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 19f1b12e48..5061c289a2 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 @@ -165,6 +165,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> 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 04a4680b73..4ee8a5696e 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 @@ -132,6 +132,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> @@ -267,6 +268,7 @@ <type>goal</type> <goalName>second goal</goalName> <goalId>2</goalId> + <revenue>0</revenue> <goalPageId /> @@ -300,6 +302,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> 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 04a4680b73..4ee8a5696e 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 @@ -132,6 +132,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> @@ -267,6 +268,7 @@ <type>goal</type> <goalName>second goal</goalName> <goalId>2</goalId> + <revenue>0</revenue> <goalPageId /> @@ -300,6 +302,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>0</revenue> <goalPageId /> 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 19f1b12e48..5061c289a2 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 @@ -165,6 +165,7 @@ <type>goal</type> <goalName>triggered js</goalName> <goalId>1</goalId> + <revenue>1000</revenue> <goalPageId /> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 940eac0360..b579c90159 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc2e4b1c736b7d872d30d0dbf66679893544969968d6ea015bffe6cd826a794e -size 4273908 +oid sha256:656c048539835893783cb16f649cd45935a146b437f21c9033d943a5d3c27086 +size 4275502 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 0ef3a41769..666886997c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed3b87834ae61f375378eae1e2c54fff18480e675eb380b965e5b09c607a0fc2 -size 1057109 +oid sha256:146c6d84a9d5789668220c03f10e4b4286f17546e633c22b0212886a53b6cb1a +size 1056708 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index 50342c2078..9f3f4cd44d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bca2928a49fef1a1fc2d05eac59f35459e833abee2ed2cd48f7451f2aaad4f6 -size 1057598 +oid sha256:329c76a4ec793cd873cb1a333258ba60493438c60682bfe56679931723439189 +size 1057195 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png index 3eccb55079..d001fcf3f3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40b6e1801464b9bd979de1bd8660fac2c027a9ddad4bec0877d2f25035d2bd81 -size 141068 +oid sha256:d7ed8ed91d9e464dd646c16830abbfccf1b554204acdfe06fd4bb6ddaf497fef +size 141080 diff --git a/tests/travis b/tests/travis -Subproject b86ef968edfa61b71b2b4e0ad72a7f903330b18 +Subproject 8e68bd815e881929c9d1ef039ace4ec490affe6 |
