From 85a40cae4eb95af49634bddb63d012165812f8f7 Mon Sep 17 00:00:00 2001 From: Nuwan Date: Tue, 27 Apr 2021 19:48:58 +0530 Subject: [PATCH] changes to ad campaigns report * fix record ordering * fix pagination VRFS-5166 --- admin/app/admin/ad_campaigns.rb | 8 ++++++-- admin/app/admin/subscription_cohorts.rb | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/app/admin/ad_campaigns.rb b/admin/app/admin/ad_campaigns.rb index c9294e3e5..35d0d4291 100644 --- a/admin/app/admin/ad_campaigns.rb +++ b/admin/app/admin/ad_campaigns.rb @@ -30,7 +30,11 @@ ActiveAdmin.register JamRuby::AdCampaign, as: 'AdCampaign' do menu :label => 'Ad Campaigns', :parent => 'Reports' before_filter :skip_sidebar!, :only => :index config.batch_actions = false - + config.clear_action_items! + config.sort_order = "users.origin_utm_campaign DESC" + config.per_page = 100 + config.paginate = true + index do div do render 'customer_ltv' @@ -126,7 +130,7 @@ ActiveAdmin.register JamRuby::AdCampaign, as: 'AdCampaign' do COALESCE(MAX(ad_campaigns.spend), 0) AS spend").joins(" LEFT JOIN ad_campaigns ON users.origin_utm_campaign = ad_campaigns.campaign AND users.origin_utm_medium = ad_campaigns.medium").where(" - users.origin_utm_campaign IS NOT NULL AND users.origin_utm_medium IS NOT NULL").group(" + users.origin_utm_campaign IS NOT NULL AND users.origin_utm_medium IS NOT NULL AND users.origin_utm_source = 'paid'").group(" ad_campaigns.id, users.origin_utm_campaign, users.origin_utm_medium").order(" users.origin_utm_campaign DESC") end diff --git a/admin/app/admin/subscription_cohorts.rb b/admin/app/admin/subscription_cohorts.rb index 462bca21c..67cafeb3c 100644 --- a/admin/app/admin/subscription_cohorts.rb +++ b/admin/app/admin/subscription_cohorts.rb @@ -22,7 +22,7 @@ ActiveAdmin.register_page "Subscription Cohorts" do count(first_good_music_session_at) as good_session, count(first_invited_at) as invited, count(first_friended_at) as friended, - count(recurly_subscription_id) as subscribed + count(first_subscribed_at) as subscribed }).group("date_trunc('month', created_at)").order("date_trunc('month', created_at) DESC") do |row| column "Month", Proc.new { |user| user.month.strftime('%B %Y') } column "Total", :total