Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove visitors analytics from vendor dashboard (#12419)
Damian Kaczmarczyk49cff2f21e17
diff --git a/admin/app/controllers/spree/admin/dashboard_controller.rb b/admin/app/controllers/spree/admin/dashboard_controller.rbindex f06fa7a4e8..7d16ca5cea 100644--- a/admin/app/controllers/spree/admin/dashboard_controller.rb+++ b/admin/app/controllers/spree/admin/dashboard_controller.rb@@ -20,8 +20,8 @@ module Spree# for admins we need to counnt only the main orders (the ones that are splitted)@orders_scope = if @vendor.present?@orders_scope.with_vendor(@vendor.id)- else- @orders_scope.without_vendor if @orders_scope.respond_to?(:without_vendor)+ elsif @orders_scope.respond_to?(:without_vendor)+ @orders_scope.without_vendorendend@@ -94,6 +94,8 @@ module Spreeenddef load_analytics_data+ return if @vendor.present?+@audience_scope = Spree.user_class.where(created_at: analytics_time_range)@audience_total = @audience_scope.countprevious_audience_total = Spree.user_class.where(created_at: previous_analytics_time_range).countdiff --git a/admin/app/views/spree/admin/dashboard/analytics.html.erb b/admin/app/views/spree/admin/dashboard/analytics.html.erbindex 65b09668e0..d382ad86be 100644--- a/admin/app/views/spree/admin/dashboard/analytics.html.erb+++ b/admin/app/views/spree/admin/dashboard/analytics.html.erb@@ -3,8 +3,8 @@<% end %><%= turbo_frame_tag :analytics do %>- <div class="card mb-4"- data-controller="tabs"+ <div class="card mb-4"+ data-controller="tabs"data-tabs-active-tab-class="active"><div class="card-header d-block border-0 h-auto p-2"><div class="row">@@ -59,17 +59,19 @@</div><% end %>- <div class="col-6 col-lg-2 pl-0">- <div class="rounded cursor-pointer p-2 hover-light h-100" data-tabs-target="tab" data-action="click->tabs#change">- <div class="d-flex justify-content-center flex-column">- <span class="font-size-sm text-muted">Sign-ups</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @audience_total %></span>- <div>- <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @audience_growth_rate %>+ <% if @audience_total && @audience_growth_rate %>+ <div class="col-6 col-lg-2 pl-0">+ <div class="rounded cursor-pointer p-2 hover-light h-100" data-tabs-target="tab" data-action="click->tabs#change">+ <div class="d-flex justify-content-center flex-column">+ <span class="font-size-sm text-muted">Sign-ups</span>+ <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @audience_total %></span>+ <div>+ <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @audience_growth_rate %>+ </div></div></div></div>- </div>+ <% end %></div></div><div class="card-body p-2">@@ -102,9 +104,11 @@<%= line_chart @visits.count %></div><% end %>- <div data-tabs-target="panel" data-index="5">- <%= line_chart @audience.count %>- </div>+ <% if @audience %>+ <div data-tabs-target="panel" data-index="5">+ <%= line_chart @audience.count %>+ </div>+ <% end %></div></div></div>