Skip to content

Commit

Permalink
Merge pull request #43 from matomo-org/release-1.1.1
Browse files Browse the repository at this point in the history 
Release 1.1.1
  • Loading branch information
@diosmosis
diosmosis authored Dec 10, 2019
2 parents ee60437 + 1c542cc commit 1e147cd
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 399 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## Changelog

# 1.1.1

Bug fixes:
* Compatibility with Matomo for wordpress.
* Do not fail if an unmappable goal is found (in case user creates their own goal or edits a goal).

# 1.1.0

Features:
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "GoogleAnalyticsImporter",
"description": "Import reports from a Google Analytics account into Matomo.",
"version": "1.1.0",
"version": "1.1.1",
"theme": false,
"require": {
"piwik": ">=3.12.0-b1,<4.0.0-b1"
Expand Down
86 changes: 21 additions & 65 deletions tests/System/expected/test___DevicesDetection.getBrowserEngines_day.xml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<label>Chrome</label>
<nb_uniq_visitors>68</nb_uniq_visitors>
<nb_visits>86</nb_visits>
<nb_actions>277</nb_actions>
<sum_visit_length>4381</sum_visit_length>
<bounce_count>30</bounce_count>
<nb_visits_converted>31</nb_visits_converted>
<nb_conversions>58</nb_conversions>
<revenue>207603</revenue>
<label>WebKit (Safari, Chrome)</label>
<nb_uniq_visitors>93</nb_uniq_visitors>
<nb_visits>126</nb_visits>
<nb_actions>436</nb_actions>
<sum_visit_length>6907</sum_visit_length>
<bounce_count>43</bounce_count>
<nb_visits_converted>49</nb_visits_converted>
<nb_conversions>91</nb_conversions>
<revenue>357803</revenue>
<goals>
<row idgoal='1'>
<nb_conversions>16</nb_conversions>
<nb_conversions>25</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>13</nb_visits_converted>
<nb_visits_converted>22</nb_visits_converted>
</row>
<row idgoal='2'>
<nb_conversions>15</nb_conversions>
<nb_conversions>24</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>13</nb_visits_converted>
<nb_visits_converted>22</nb_visits_converted>
</row>
<row idgoal='3'>
<nb_conversions>1</nb_conversions>
Expand All @@ -37,59 +37,15 @@
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='ecommerceOrder'>
<nb_conversions>26</nb_conversions>
<revenue>207603</revenue>
<items>163</items>
</row>
</goals>
<segment>browserEngine==Chrome</segment>
</row>
<row>
<label>Android Browser</label>
<nb_uniq_visitors>25</nb_uniq_visitors>
<nb_visits>40</nb_visits>
<nb_actions>159</nb_actions>
<sum_visit_length>2526</sum_visit_length>
<bounce_count>13</bounce_count>
<nb_visits_converted>18</nb_visits_converted>
<nb_conversions>33</nb_conversions>
<revenue>150200</revenue>
<goals>
<row idgoal='1'>
<nb_conversions>9</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>9</nb_visits_converted>
</row>
<row idgoal='2'>
<nb_conversions>9</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>9</nb_visits_converted>
</row>
<row idgoal='3'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='4'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='5'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='ecommerceOrder'>
<nb_conversions>15</nb_conversions>
<revenue>150200</revenue>
<items>111</items>
<nb_conversions>41</nb_conversions>
<revenue>357803</revenue>
<items>274</items>
</row>
</goals>
<segment>browserEngine==Android+Browser</segment>
<segment>browserEngine==WebKit</segment>
</row>
<row>
<label>Internet Explorer</label>
<label>Trident (IE)</label>
<nb_uniq_visitors>27</nb_uniq_visitors>
<nb_visits>37</nb_visits>
<nb_actions>149</nb_actions>
Expand Down Expand Up @@ -130,10 +86,10 @@
<items>115</items>
</row>
</goals>
<segment>browserEngine==Internet+Explorer</segment>
<segment>browserEngine==Trident</segment>
</row>
<row>
<label>Firefox</label>
<label>Gecko (Firefox)</label>
<nb_uniq_visitors>19</nb_uniq_visitors>
<nb_visits>27</nb_visits>
<nb_actions>82</nb_actions>
Expand Down Expand Up @@ -174,7 +130,7 @@
<items>35</items>
</row>
</goals>
<segment>browserEngine==Firefox</segment>
<segment>browserEngine==Gecko</segment>
</row>
<row>
<label>Edge</label>
Expand Down
134 changes: 23 additions & 111 deletions tests/System/expected/test___DevicesDetection.getBrowserEngines_month.xml
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,29 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<label>Chrome</label>
<nb_visits>159</nb_visits>
<nb_actions>534</nb_actions>
<sum_visit_length>5837</sum_visit_length>
<bounce_count>44</bounce_count>
<nb_visits_converted>41</nb_visits_converted>
<nb_conversions>86</nb_conversions>
<revenue>414153</revenue>
<label>WebKit (Safari, Chrome)</label>
<nb_visits>266</nb_visits>
<nb_actions>958</nb_actions>
<sum_visit_length>12529</sum_visit_length>
<bounce_count>68</bounce_count>
<nb_visits_converted>65</nb_visits_converted>
<nb_conversions>148</nb_conversions>
<revenue>814281</revenue>
<goals>
<row idgoal='1'>
<nb_conversions>22</nb_conversions>
<nb_conversions>33</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>18</nb_visits_converted>
<nb_visits_converted>27</nb_visits_converted>
</row>
<row idgoal='2'>
<nb_conversions>20</nb_conversions>
<nb_conversions>33</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>17</nb_visits_converted>
<nb_visits_converted>30</nb_visits_converted>
</row>
<row idgoal='3'>
<nb_conversions>1</nb_conversions>
<nb_conversions>3</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>1</nb_visits_converted>
</row>
<row idgoal='4'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='5'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='ecommerceOrder'>
<nb_conversions>43</nb_conversions>
<revenue>414153</revenue>
<items>305</items>
</row>
</goals>
<sum_daily_nb_uniq_visitors>130</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Chrome</segment>
</row>
<row>
<label>Android Browser</label>
<nb_visits>99</nb_visits>
<nb_actions>413</nb_actions>
<sum_visit_length>3282</sum_visit_length>
<bounce_count>19</bounce_count>
<nb_visits_converted>22</nb_visits_converted>
<nb_conversions>60</nb_conversions>
<revenue>400128</revenue>
<goals>
<row idgoal='1'>
<nb_conversions>11</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>9</nb_visits_converted>
</row>
<row idgoal='2'>
<nb_conversions>13</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>13</nb_visits_converted>
</row>
<row idgoal='3'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
<nb_visits_converted>3</nb_visits_converted>
</row>
<row idgoal='4'>
<nb_conversions>0</nb_conversions>
Expand All @@ -80,16 +36,16 @@
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='ecommerceOrder'>
<nb_conversions>36</nb_conversions>
<revenue>400128</revenue>
<items>287</items>
<nb_conversions>79</nb_conversions>
<revenue>814281</revenue>
<items>592</items>
</row>
</goals>
<sum_daily_nb_uniq_visitors>55</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Android+Browser</segment>
<sum_daily_nb_uniq_visitors>193</sum_daily_nb_uniq_visitors>
<segment>browserEngine==WebKit</segment>
</row>
<row>
<label>Internet Explorer</label>
<label>Trident (IE)</label>
<nb_visits>95</nb_visits>
<nb_actions>425</nb_actions>
<sum_visit_length>2049</sum_visit_length>
Expand Down Expand Up @@ -130,10 +86,10 @@
</row>
</goals>
<sum_daily_nb_uniq_visitors>66</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Internet+Explorer</segment>
<segment>browserEngine==Trident</segment>
</row>
<row>
<label>Firefox</label>
<label>Gecko (Firefox)</label>
<nb_visits>63</nb_visits>
<nb_actions>235</nb_actions>
<sum_visit_length>1563</sum_visit_length>
Expand Down Expand Up @@ -174,7 +130,7 @@
</row>
</goals>
<sum_daily_nb_uniq_visitors>48</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Firefox</segment>
<segment>browserEngine==Gecko</segment>
</row>
<row>
<label>Android Webview</label>
Expand Down Expand Up @@ -220,50 +176,6 @@
<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Android+Webview</segment>
</row>
<row>
<label>Safari</label>
<nb_visits>8</nb_visits>
<nb_actions>11</nb_actions>
<sum_visit_length>3410</sum_visit_length>
<bounce_count>5</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<nb_conversions>2</nb_conversions>
<revenue>0</revenue>
<goals>
<row idgoal='1'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='2'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='3'>
<nb_conversions>2</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>2</nb_visits_converted>
</row>
<row idgoal='4'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='5'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row idgoal='ecommerceOrder'>
<nb_conversions>0</nb_conversions>
<revenue>0</revenue>
<items>0</items>
</row>
</goals>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<segment>browserEngine==Safari</segment>
</row>
<row>
<label>Safari (in-app)</label>
<nb_visits>6</nb_visits>
Expand Down
Loading

0 comments on commit 1e147cd

Please sign in to comment.