diff --git a/assets/js/dashboard/stats/behaviours/conversions.js b/assets/js/dashboard/stats/behaviours/conversions.js
index e5df7c342..9a65df9a1 100644
--- a/assets/js/dashboard/stats/behaviours/conversions.js
+++ b/assets/js/dashboard/stats/behaviours/conversions.js
@@ -9,14 +9,7 @@ import * as api from '../../api'
import * as url from '../../util/url'
import { escapeFilterValue } from '../../util/filters'
import LazyLoader from '../../components/lazy-loader'
-
-function Money({ formatted }) {
- if (formatted) {
- return {formatted.short}
- } else {
- return "-"
- }
-}
+import Money from './money'
export default class Conversions extends React.Component {
constructor(props) {
@@ -75,7 +68,7 @@ export default class Conversions extends React.Component {
{renderRevenueColumn && }
- { renderProps && !goal.total_revenue && }
+ { renderProps && }
)
}
diff --git a/assets/js/dashboard/stats/behaviours/money.js b/assets/js/dashboard/stats/behaviours/money.js
new file mode 100644
index 000000000..67c5fcb5c
--- /dev/null
+++ b/assets/js/dashboard/stats/behaviours/money.js
@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default function Money({ formatted }) {
+ if (formatted) {
+ return {formatted.short}
+ } else {
+ return "-"
+ }
+}
+
diff --git a/assets/js/dashboard/stats/behaviours/prop-breakdown.js b/assets/js/dashboard/stats/behaviours/prop-breakdown.js
index d68f8c477..9fc60a910 100644
--- a/assets/js/dashboard/stats/behaviours/prop-breakdown.js
+++ b/assets/js/dashboard/stats/behaviours/prop-breakdown.js
@@ -5,6 +5,7 @@ import * as storage from '../../util/storage'
import Bar from '../bar'
import numberFormatter from '../../util/number-formatter'
import * as api from '../../api'
+import Money from './money'
const MOBILE_UPPER_WIDTH = 767
const DEFAULT_WIDTH = 1080
@@ -71,11 +72,6 @@ export default class PropertyBreakdown extends React.Component {
this.setState({ viewport: window.innerWidth });
}
- getBarMaxWidth() {
- const { viewport } = this.state;
- return viewport > MOBILE_UPPER_WIDTH ? "16rem" : "10rem";
- }
-
fetch({concat}) {
if (!this.props.query.filters['goal']) return
@@ -135,15 +131,16 @@ export default class PropertyBreakdown extends React.Component {
return (
-
- {this.renderPropContent(value, query)}
-
+
+
+ {this.renderPropContent(value, query)}
+
+
{numberFormatter(value.unique_conversions)}
{
@@ -157,6 +154,8 @@ export default class PropertyBreakdown extends React.Component {
: null
}
{numberFormatter(value.conversion_rate)}%
+ {this.props.renderRevenueColumn && }
+ {this.props.renderRevenueColumn && }
)
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex
index b78d4a551..e2775d051 100644
--- a/lib/plausible/stats/breakdown.ex
+++ b/lib/plausible/stats/breakdown.ex
@@ -69,6 +69,7 @@ defmodule Plausible.Stats.Breakdown do
def breakdown(site, query, "event:props:" <> custom_prop = property, metrics, pagination) do
{limit, _} = pagination
+ {currency, metrics} = get_revenue_tracking_currency(site, query, metrics)
none_result =
if include_none_result?(query.filters[property]) do
@@ -90,6 +91,7 @@ defmodule Plausible.Stats.Breakdown do
results =
breakdown_events(site, query, "event:props:" <> custom_prop, metrics, pagination)
|> Kernel.++(none_result)
+ |> Enum.map(&cast_revenue_metrics_to_money(&1, currency))
|> Enum.sort_by(& &1[sorting_key(metrics)], :desc)
if Enum.find_index(results, fn value -> value[custom_prop] == "(none)" end) == limit do
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index c20f21dca..14c000b64 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -1178,18 +1178,23 @@ defmodule PlausibleWeb.Api.StatsController do
prop_name = "event:props:" <> params["prop_name"]
props =
- Stats.breakdown(site, query, prop_name, [:visitors, :events], pagination)
+ Stats.breakdown(
+ site,
+ query,
+ prop_name,
+ [:visitors, :events, :average_revenue, :total_revenue],
+ pagination
+ )
|> transform_keys(%{
params["prop_name"] => :name,
:events => :total_conversions,
:visitors => :unique_conversions
})
|> Enum.map(fn prop ->
- Map.put(
- prop,
- :conversion_rate,
- calculate_cr(unique_visitors, prop[:unique_conversions])
- )
+ prop
+ |> Map.put(:conversion_rate, calculate_cr(unique_visitors, prop[:unique_conversions]))
+ |> Enum.map(&format_revenue_metric/1)
+ |> Map.new()
end)
if params["csv"] do
diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
index f35277881..4bc1a78f5 100644
--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs
@@ -852,6 +852,64 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
]
end
+ test "returns property breakdown for revenue goal", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview, pathname: "/"),
+ build(:pageview, pathname: "/"),
+ build(:pageview, pathname: "/register"),
+ build(:event,
+ name: "Purchase",
+ revenue_reporting_amount: Decimal.new("132.21"),
+ revenue_reporting_currency: "EUR",
+ "meta.key": ["method"],
+ "meta.value": ["card"]
+ ),
+ build(:event,
+ name: "Purchase",
+ revenue_reporting_amount: Decimal.new("412.30"),
+ revenue_reporting_currency: "EUR",
+ "meta.key": ["method"],
+ "meta.value": ["cash"]
+ ),
+ build(:event,
+ name: "Purchase",
+ revenue_reporting_amount: Decimal.new("30.23"),
+ revenue_reporting_currency: "EUR",
+ "meta.key": ["method"],
+ "meta.value": ["cash"]
+ )
+ ])
+
+ insert(:goal, site: site, event_name: "Purchase", currency: "EUR")
+ filters = Jason.encode!(%{goal: "Purchase"})
+ prop_key = "method"
+
+ conn =
+ get(
+ conn,
+ "/api/stats/#{site.domain}/property/#{prop_key}?period=day&filters=#{filters}"
+ )
+
+ assert json_response(conn, 200) == [
+ %{
+ "average_revenue" => %{"long" => "€221.26", "short" => "€221.3"},
+ "conversion_rate" => 33.3,
+ "name" => "cash",
+ "total_conversions" => 2,
+ "total_revenue" => %{"long" => "€442.53", "short" => "€442.5"},
+ "unique_conversions" => 2
+ },
+ %{
+ "average_revenue" => %{"long" => "€132.21", "short" => "€132.2"},
+ "conversion_rate" => 16.7,
+ "name" => "card",
+ "total_conversions" => 1,
+ "total_revenue" => %{"long" => "€132.21", "short" => "€132.2"},
+ "unique_conversions" => 1
+ }
+ ]
+ end
+
test "returns (none) values in property breakdown for goal", %{conn: conn, site: site} do
populate_stats(site, [
build(:pageview, pathname: "/"),