diff --git a/plugins/API/API.php b/plugins/API/API.php index 891062cbb0f673b51382489a956f26112d31efdc..f522a9add249e1b3ee3877b015120f46918d724d 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -410,6 +410,11 @@ class API extends \Piwik\Plugin\API $this->mergeDataTables($mergedDataTable, $dataTable); } } + + if (!empty($columnsMap)) { + $mergedDataTable->queueFilter('ColumnDelete', array(false, array_keys($columnsMap))); + } + return $mergedDataTable; } diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml index 343be649b77defbccf377a0646b62342b803d65f..6e377c1d4109be99c593bcc9a2e5170c1652a834 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml @@ -5,4 +5,5 @@ <conversion_rate>66.67</conversion_rate> <revenue>5020.22</revenue> <items>8</items> + <avg_order_revenue>2510.11</avg_order_revenue> </result> \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml index a2d20e0f556c0aca351c45dc682eb0d4b6444cfe..f745e2b50a8bd4a82a7d8125fba263143937e8c8 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml @@ -5,4 +5,5 @@ <conversion_rate>60</conversion_rate> <revenue>7530.33</revenue> <items>12</items> + <avg_order_revenue>2510.11</avg_order_revenue> </result> \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml index 77c4d9cfc911ed2fdcbb486d53fefeb0984f9185..56e26922bd91ea184867493ef0c6eb92e5fa1572 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml @@ -38,7 +38,7 @@ <conversion_rate>66.67%</conversion_rate> <revenue>$ 5020.22</revenue> <items>8</items> - <avg_order_revenue>$ 0</avg_order_revenue> + <avg_order_revenue>$ 2510.11</avg_order_revenue> </reportData> <reportMetadata /> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index fe483e691dfa1ed5879d13813600e6a84cee62aa..a9d0428a7236d1b9c603f4ed452c3cd61a06ad1c 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -166,7 +166,7 @@ label,nb_conversions Abandoned Carts nb_conversions,conversion_rate,revenue,items,avg_order_revenue -3,60%,$ 7530.33,12,$ 0 +3,60%,$ 7530.33,12,$ 2510.11 Abandoned Carts - Visits to Conversion label,nb_conversions diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index aa496b987835c324dcc965427ba5ffe4afb31ab3..c2452282d244a3d5a1286aa3b040b0f3e49d3e29 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -3207,7 +3207,7 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Average Order Value </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - $ 0 + $ 2510.11 </td> </tr> </tbody>