diff options
| author | Stefan Giehl <stefan@piwik.org> | 2018-06-07 01:29:46 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-06-07 01:29:46 +0300 |
| commit | 5076bd6bfdc32b969f122a5ef65c02fb1ab3c5b2 (patch) | |
| tree | b2785397e5506f8c305761025ddcd91aa2a6453c /plugins/Ecommerce | |
| parent | d8c98711edd6eebc16f1be3b87dac798d118b78c (diff) | |
Use generic device model names if device type is known (#13015)
* Use generic device model names
* updates tests
* Update screenshots
Diffstat (limited to 'plugins/Ecommerce')
6 files changed, 9 insertions, 9 deletions
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 a6afa82503..43b8c2da82 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 @@ -86,7 +86,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> @@ -329,7 +329,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> 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 81b1ac8b13..74790de1d4 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 @@ -178,7 +178,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> @@ -557,7 +557,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> @@ -812,7 +812,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index e7453c8e65..6c18b331b7 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -19,7 +19,7 @@ Desktop,5,16,$ 13361.11,3.2,00:22:49,20% Device model label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,$ 13361.11,3.2,00:22:49,20% +Generic Desktop,5,16,$ 13361.11,3.2,00:22:49,20% Device brand label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 4f85b42aec..4729fcd3b4 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -795,7 +795,7 @@ </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAFvklEQVR4nO3dsYsjVQDH8axkm22uPrZYZP4BIXbCFdfYCQf+B4J/goW9ttcLdpZiff+AnQPWSjhQdpsDCxGbLcYiOI7ZS+a3s8m9fZPPpziSzMvt45a5+WbeDDnrum4BADDmvdITAADqIBoAgIhoAAAiogEAiIgGACAiGgCAyMlFQ9M0u15866Y97wKAk3Jy0bDHer0e3aQeADhZJxcN6/V668DfNM2eXAAANpalJ3AUX3/709YrX3724ei7+noYVkX/Sl8b/dat/lAeAMzbPKPh19//vL297Z+en59fX19fXl4m79068TB8uqmE4VLFrpEAMD+zXZ74e2CxWNzc3PSbhmcIRo/0eQcoBgDmbbbRMNkmKZILHvORADAD81yeeKDhlQ3JeYhkJADUbrbRcHFxsWdrv0IxeptlcqVCPhIA6jXPaHjxvLm5vp723vzYrxIAOCnzjIZPnl0tFlfT3rv/RsrhVrdcAnBSzrquKz0HAKAC7p4AACKiAQCIiAYAICIaAIBIfXdPuGEBamFvhYoM7w3cNaayaPAdUVALeytUJNxDLU8ARyERoBZ501d2pgEAOLhwMVE0AEeUrJICxYWLiaIBOKL+vx7XNMAMuKYBAIiIBuAohkukwDzU94VV7vyGWthboRbh3lpfNAAARVieAAAiogEAiIgGACAiGgCAiGgAACKiAQCI1BoNbduWngIQsbdCLUb31lqjAQB4x0QDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJFl6QlM9833P5eeAjDuzZs/2tf2Vt6pzz/9oPQU5qniaHj14+vSUwAyv/xVegaclo8/ev/q6ZPSs5ghyxMAQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARCZGQ9M0h50HAPDILftHTdOs1+vhtruvAEAV7n64dUR7uOX4EACokEo4uPHliU2sNf/aM+Ctw5qB4fhdj0d/HABQRHSmYbhOsbVmsWvT5vGewdN+HACEhp88HUoOIoqGXf/WW0f08FfSx8TdP+/19wDALq7SO4bpt1z6BQDASZkeDZvTAwecCgDwmP0XDVsRkJxImNwNw/WIu5c+AMAD+Vh7DP+7pmEYAfe9QGHP1uHTqfMEgHtwADqGs67rSs9hirZtv/rut9KzAOAxevnF86unT0rPoj5t265Wqz0DfPcEABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEFmWnsB0P7x8UXoKwLi2bVerVelZAAfgTAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQOeu6rvQcAIAKONMAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJF/AGkffqHJRvxvAAAAAElFTkSuQmCC" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -831,7 +831,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Unknown </td> + Generic Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 5 </td> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 7c78911680..7e359a3500 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -796,7 +796,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Unknown </td> + Generic Desktop </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 5 </td> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex d95584264e..d5ab9328fe 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf |