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
Improve performance of Customer view in Admin
Damian Legawiec4f4ea5163c6b
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rbindex 385e6011a1..09d5727c17 100644--- a/admin/app/controllers/spree/admin/users_controller.rb+++ b/admin/app/controllers/spree/admin/users_controller.rb@@ -87,7 +87,9 @@ module Spreedef load_last_order_data@last_order = @user.completed_orders.last- @last_order_line_items = @last_order.line_items.includes(variant: :product) if @last_order.present?+ return unless @last_order.present?++ @last_order_line_items = @last_order.line_items.includes(variant: [:images, { option_values: :option_type }, { product: [:variant_images, { master: :images }, { variants: :images }] }])endendenddiff --git a/admin/app/views/spree/admin/users/_details.html.erb b/admin/app/views/spree/admin/users/_details.html.erbindex 75756c68a2..d384426741 100644--- a/admin/app/views/spree/admin/users/_details.html.erb+++ b/admin/app/views/spree/admin/users/_details.html.erb@@ -8,45 +8,47 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:email) %>- <span>- <%= @user.email %>- <%= clipboard_component(@user.email) %>- </span>- </li>- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:phone) %>- <span>- <%= @user.phone.presence || Spree.t(:not_available) %>- </span>- </li>- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:name) %>- <span>- <%= customer_full_name(@user) %>- </span>- </li>- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:email_marketing) %>- <%= active_badge(@user.accepts_email_marketing?) %>- </li>- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:tags) %>- <span>- <% @user.tag_list.each do |tag| %>- <span class="tag small"><%= tag %></span>- <% end %>- </span>- </li>- <li class="list-group-item flex justify-between items-center">- <%= Spree.t(:roles) %>- <span>- <% @user.spree_roles.each do |role| %>- <span class="tag small"><%= role.name %></span>- <% end %>- </span>- </li>+ <% cache [spree_base_cache_key, @user] do %>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:email) %>+ <span>+ <%= @user.email %>+ <%= clipboard_component(@user.email) %>+ </span>+ </li>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:phone) %>+ <span>+ <%= @user.phone.presence || Spree.t(:not_available) %>+ </span>+ </li>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:name) %>+ <span>+ <%= customer_full_name(@user) %>+ </span>+ </li>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:email_marketing) %>+ <%= active_badge(@user.accepts_email_marketing?) %>+ </li>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:tags) %>+ <span>+ <% @user.tag_list.each do |tag| %>+ <span class="badge badge-light"><%= tag %></span>+ <% end %>+ </span>+ </li>+ <li class="list-group-item flex justify-between items-center">+ <%= Spree.t(:roles) %>+ <span>+ <% @user.spree_roles.pluck(:name).each do |role_name| %>+ <span class="badge badge-light"><%= role_name %></span>+ <% end %>+ </span>+ </li>+ <% end %></ul></div><% end %>diff --git a/admin/app/views/spree/admin/users/_last_order_line_item.html.erb b/admin/app/views/spree/admin/users/_last_order_line_item.html.erbindex 2473b7a009..e4c0f2058b 100644--- a/admin/app/views/spree/admin/users/_last_order_line_item.html.erb+++ b/admin/app/views/spree/admin/users/_last_order_line_item.html.erb@@ -1,8 +1,8 @@<li class="list-group-item"><div class="grid grid-cols-12 gap-4"><div class="col-span-8">- <%= link_to spree.edit_admin_product_path(line_item.product), class: 'flex no-underline' do %>- <%= render 'spree/admin/shared/product_image', object: line_item.product %>+ <%= link_to spree.edit_admin_product_path(line_item.variant), class: 'flex no-underline' do %>+ <%= render 'spree/admin/shared/product_image', object: line_item.variant %><span class="ml-6 text-gray-900"><strong><%= line_item.name %></strong><br /><%= line_item.options_text %>diff --git a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb b/admin/app/views/spree/admin/users/_lifetime_stats.html.erbindex 48e36d780a..b575e77390 100644--- a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb+++ b/admin/app/views/spree/admin/users/_lifetime_stats.html.erb@@ -1,54 +1,56 @@-<div class="card mb-6">- <div class="card-body">- <div class="grid grid-cols-2 lg:grid-cols-3 gap-6">- <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">- <span class="text-sm text-gray-500"><%= Spree.t('admin.amount_spent') %></span>- <span class="text-lg text-gray-900 font-bold">- <%= @user.display_lifetime_value %>- </span>- </div>-- <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">- <span class="text-sm text-gray-500"><%= Spree.t(:orders) %></span>- <span class="text-lg text-gray-900 font-bold">- <%= @user.completed_orders.count %>- </span>- </div>+<% cache [spree_base_cache_key, @user, can?(:create, Spree::StoreCredit)], expires_in: 1.hour do %>+ <div class="card mb-6">+ <div class="card-body">+ <div class="grid grid-cols-2 lg:grid-cols-3 gap-6">+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t('admin.amount_spent') %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.display_lifetime_value %>+ </span>+ </div>- <div class="flex flex-col mb-6 lg:mb-0 gap-2">- <span class="text-sm text-gray-500"><%= Spree.t('admin.avg_order_value') %></span>- <span class="text-lg text-gray-900 font-bold">- <%= @user.display_average_order_value %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:orders) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.completed_orders.count %>+ </span>+ </div>- <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">- <span class="text-sm text-gray-500"><%= Spree.t(:store_credits) %></span>- <span class="text-lg text-gray-900 font-bold">- <%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency) %>- </span>- <% if can?(:create, Spree::StoreCredit) %>- <span>- <%= link_to_with_icon 'plus', Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-secondary btn-sm' %>+ <div class="flex flex-col mb-6 lg:mb-0 gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t('admin.avg_order_value') %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.display_average_order_value %></span>- <% end %>- </div>+ </div>- <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">- <span class="text-sm text-gray-500"><%= Spree.t(:created_at) %></span>- <span class="text-lg text-gray-900 font-bold">- <%= spree_time(@user.created_at) %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:store_credits) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency) %>+ </span>+ <% if can?(:create, Spree::StoreCredit) %>+ <span>+ <%= link_to_with_icon 'plus', Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-secondary btn-sm' %>+ </span>+ <% end %>+ </div>- <% if @visits_count.present? %><div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">- <span class="text-sm text-gray-500"><%= Spree.t(:visits) %></span>+ <span class="text-sm text-gray-500"><%= Spree.t(:created_at) %></span><span class="text-lg text-gray-900 font-bold">- <%= @visits_count %>+ <%= spree_time(@user.created_at) %></span></div>- <% end %>++ <% if @visits_count.present? %>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:visits) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @visits_count %>+ </span>+ </div>+ <% end %>+ </div></div></div>-</div>+<% end %>