Add yearly/per.. graphs + fix chartkick

app/helpers/metrics_helper.rb

@@ -1,4 +1,12 @@
 module MetricsHelper
+  def revenue_per_partial_for(charge_type)
+    if charge_type.blank?
+      "metrics/revenue_per"
+    else
+      "metrics/#{charge_type}/revenue_per"
+    end
+  end
+
   def metric_display_value(selected_chart_display, value)
     case selected_chart_display
     when :number

app/javascript/application.js

@@ -1,7 +1,7 @@
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
 import "@hotwired/turbo-rails"
-import "chartkick"
 import "./controllers"
+import "chartkick"
 
 // Polaris
 import { registerPolarisControllers } from "polaris-view-components"

app/javascript/controllers/index.js

@@ -4,9 +4,6 @@
 
 import { application } from "./application"
 
-import ChartkickController from "./chartkick_controller"
-application.register("chartkick", ChartkickController)
-
 import DatefieldController from "./datefield_controller"
 application.register("datefield", DatefieldController)
 

app/models/user.rb

@@ -76,4 +76,15 @@ def total_revenue_per_app(date:, charge_type: nil)
       metrics.where(metric_date: from_date..date)
     end.group(:app_title).sum(:revenue)
   end
+
+  def total_revenue_per_plan(date:, charge_type:, period: nil, app_title: nil)
+    per_plan_payments = payments.where(charge_type: charge_type)
+    per_plan_payments = per_plan_payments.where(app_title: app_title) if app_title.present?
+    per_plan_payments = if period.present?
+      per_plan_payments.where(payment_date: (date - period.days)..date)
+    else
+      per_plan_payments.where(payment_date: ..date)
+    end
+    per_plan_payments.group(:revenue).order("revenue DESC").count
+  end
 end

app/views/metrics/_revenue_per.html.erb

@@ -1,25 +1,27 @@
+<%= polaris_divider %>
+
 <%= polaris_layout do |layout| %>
   <% layout.with_section(one_half: true) do %>
     <%= polaris_card(title: "Revenue per app (12 Months)") do %>
-      <%= pie_chart current_user.yearly_revenue_per_product(date: filter.date) %>
+      <%= pie_chart current_user.yearly_revenue_per_product(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app" %>
     <% end %>
   <% end %>
   <% layout.with_section(one_half: true) do %>
     <%= polaris_card(title: "Revenue per country (12 Months)") do %>
-      <%= pie_chart current_user.yearly_revenue_per_country(date: filter.date) %>
+      <%= pie_chart current_user.yearly_revenue_per_country(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-country" %>
     <% end %>
   <% end %>
 <% end %>
 
 <%= polaris_layout do |layout| %>
   <% layout.with_section(one_half: true) do %>
     <%= polaris_card(title: "Revenue per charge type (12 Months)") do %>
-      <%= column_chart current_user.yearly_revenue_per_charge_type(date: filter.date) %>
+      <%= column_chart current_user.yearly_revenue_per_charge_type(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-charge-type-12-months" %>
     <% end %>
   <% end %>
   <% layout.with_section(one_half: true) do %>
     <%= polaris_card(title: "Revenue per charge type (All time)") do %>
-      <%= column_chart current_user.total_revenue_per_charge_type(date: filter.date) %>
+      <%= column_chart current_user.total_revenue_per_charge_type(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-charve-type" %>
     <% end %>
   <% end %>
 <% end %>

app/views/metrics/_tile.html.erb

@@ -1,6 +1,6 @@
 <div>
   <%= polaris_card(
-    title: tile.handle.to_s.humanize,
+    title: t("metrics.tiles.#{tile.handle}", default: tile.handle.to_s.humanize),
     actions: [{
       content: polaris_icon(name: "ViewMinor", color: :subdued),
       title: "View chart",

app/views/metrics/_tile_with_chart.html.erb

@@ -1,4 +1,4 @@
-<%= polaris_card(title: tile.handle.to_s.humanize) do |card| %>
+<%= polaris_card(title: t("metrics.tiles.#{tile.handle}", default: tile.handle.to_s.humanize)) do |card| %>
 
   <%= polaris_vertical_stack(gap: "5") do %>
 
@@ -19,11 +19,7 @@
 
     <% end %>
 
-    <div id="chart-1" style="height: 300px; width: 100%;" data-chartkick-target="chart">
-     <canvas style="box-sizing: border-box;" width="300"></canvas>
-   </div>
-    <%= tag.script  type: "application/json", data: { chartkick_target: "data"} do %><%= tile.chart_data.to_json.html_safe %><% end %>
-    <%= tag.script  type: "application/json", data: { chartkick_target: "options"} do %><%= metrics_chart_options.to_json.html_safe %><% end %>
+    <%= area_chart tile.chart_data, **metrics_chart_options %>
 
     <%= polaris_divider %>
 

app/views/metrics/affiliate_revenue/_revenue_per.html.erb

@@ -0,0 +1,18 @@
+<%= polaris_divider %>
+
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per plan (All time)") do %>
+      <%= column_chart current_user.total_revenue_per_plan(
+        date: filter.date,
+        charge_type: filter.charge_type,
+        app_title: filter.app
+        ), id: "revenue-per-plan" %>
+    <% end %>
+  <% end %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per country (12 Months)") do %>
+      <%= pie_chart current_user.yearly_revenue_per_country(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-country" %>
+    <% end %>
+  <% end %>
+<% end %>

app/views/metrics/onetime_revenue/_revenue_per.html.erb

@@ -0,0 +1,27 @@
+<%= polaris_divider %>
+
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (12 Months)") do %>
+      <%= pie_chart current_user.yearly_revenue_per_product(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app" %>
+    <% end %>
+  <% end %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per country (12 Months)") do %>
+      <%= pie_chart current_user.yearly_revenue_per_country(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-country" %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (12 Months)") do %>
+      <%= column_chart current_user.yearly_revenue_per_product(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app-column" %>
+    <% end %>
+  <% end %>
+    <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (All time)") do %>
+      <%= column_chart current_user.total_revenue_per_app(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app-total" %>
+    <% end %>
+  <% end %>
+<% end %>

app/views/metrics/recurring_revenue/_revenue_per.html.erb

@@ -0,0 +1,49 @@
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Users per plan and app (#{filter.period} days)") do %>
+      <%= column_chart current_user.total_revenue_per_plan(
+        date: filter.date,
+        charge_type: filter.charge_type,
+        period: filter.period,
+        app_title: filter.app
+        ), id: "revenue-per-plan-last-x-days" %>
+    <% end %>
+  <% end %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Users per plan and app (All time)") do %>
+      <%= pie_chart current_user.total_revenue_per_plan(
+        date: filter.date,
+        charge_type: filter.charge_type,
+        app_title: filter.app
+        ), id: "revenue-per-plan" %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= polaris_divider %>
+
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (12 Months)") do %>
+      <%= pie_chart current_user.yearly_revenue_per_product(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app" %>
+    <% end %>
+  <% end %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per country (12 Months)") do %>
+      <%= pie_chart current_user.yearly_revenue_per_country(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-country" %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= polaris_layout do |layout| %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (12 Months)") do %>
+      <%= column_chart current_user.yearly_revenue_per_product(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app-column" %>
+    <% end %>
+  <% end %>
+  <% layout.with_section(one_half: true) do %>
+    <%= polaris_card(title: "Revenue per app (All time)") do %>
+      <%= column_chart current_user.total_revenue_per_app(charge_type: filter.charge_type, date: filter.date), id: "revenue-per-app-total" %>
+    <% end %>
+  <% end %>
+<% end %>

app/views/metrics/show.html.erb

@@ -6,12 +6,14 @@
   <%= render "shared/page_actions", page: page %>
 
   <%= turbo_frame_tag :metrics, data: {
-    controller: "chartkick",
-    action: "turbo:load@window->chartkick#createChart turbo:frame-load->chartkick#createChart",
+    #controller: "chartkick",
+    #action: "turbo:frame-load->chartkick#createChart",
   } do %>
 
     <%= polaris_vertical_stack(gap: "5") do %>
 
+      <%= @filter.charge_type %>
+
       <%= polaris_stack(alignment: :center) do |stack| %>
 
         <% stack.with_item(fill:true) do %>
@@ -36,7 +38,7 @@
             <% end %>
           <% end %>
 
-          <%= render "#{params[:controller]}/revenue_per", filter: @filter %>
+          <%= render revenue_per_partial_for(@filter.charge_type), filter: @filter %>
 
       <% else %>