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
Fix displaying customer last order (#12465)
Łukasz Adamczykf77300825dcf
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rbindex 1bb32c9e93..9db7b841ec 100644--- a/admin/app/controllers/spree/admin/users_controller.rb+++ b/admin/app/controllers/spree/admin/users_controller.rb@@ -7,6 +7,7 @@ module Spreerescue_from Spree::Core::DestroyWithOrdersError, with: :user_destroy_with_orders_error+ before_action :load_last_order_data, only: :showbefore_action :remove_empty_params, only: :updatedef show; end@@ -80,6 +81,11 @@ module Spreeparams[:user][:tag_list] = params.dig(:user, :tag_list).present? ? params.dig(:user, :tag_list).reject(&:empty?) : []end++ def 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?+ endendendenddiff --git a/admin/app/views/spree/admin/users/_last_order.html.erb b/admin/app/views/spree/admin/users/_last_order.html.erbindex d153900cf2..e4df34cf7f 100644--- a/admin/app/views/spree/admin/users/_last_order.html.erb+++ b/admin/app/views/spree/admin/users/_last_order.html.erb@@ -1,5 +1,4 @@-<% if @user.completed_orders.any? %>- <% order = @user.completed_orders.last %>+<% if @last_order.present? %><div class="card mb-4"><div class="card-header"><h5 class="card-title">@@ -7,26 +6,26 @@</h5></div><div class="card-body">- <% cache spree_base_cache_scope.call(order) do %>+ <% cache spree_base_cache_scope.call(@last_order) do %><ul class="list-group"><li class="list-group-item"><div class="row"><div class="col-lg-9"><p class="mb-1">- <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bold' %>- <%= order_payment_state(order, class: 'ml-2') %>- <%= order_shipment_state(order, class: 'ml-2') %>+ <%= link_to @last_order.number, spree.edit_admin_order_path(@last_order), class: 'font-weight-bold' %>+ <%= order_payment_state(@last_order, class: 'ml-2') %>+ <%= order_shipment_state(@last_order, class: 'ml-2') %></p><span class="text-muted">- <%= local_time_ago(order.completed_at, class: 'with-tip') %>+ <%= local_time_ago(@last_order.completed_at, class: 'with-tip') %></span></div><div class="col-lg-3 text-lg-right font-weight-bold">- <%= order.display_total %>+ <%= @last_order.display_total %></div></div></li>- <%= render collection: order.all_line_items.includes(variant: :product), partial: 'spree/admin/users/last_order_line_item', as: :line_item, cached: spree_base_cache_scope %>+ <%= render collection: @last_order_line_items, partial: 'spree/admin/users/last_order_line_item', as: :line_item, cached: spree_base_cache_scope %></ul><% end %></div>diff --git a/admin/spec/controllers/spree/admin/users_controller_spec.rb b/admin/spec/controllers/spree/admin/users_controller_spec.rbindex 3cd1263d57..edda6c3402 100644--- a/admin/spec/controllers/spree/admin/users_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/users_controller_spec.rb@@ -143,6 +143,21 @@ RSpec.describe Spree::Admin::UsersController, type: :controller doendend+ describe 'GET #show' do+ let(:user) { create(:user) }+ let!(:order) { create(:completed_order_with_totals, user: user) }++ it 'renders the user page with last order data' do+ get :show, params: { id: user.id }++ expect(response).to have_http_status(:ok)+ expect(response).to render_template(:show)++ expect(assigns(:last_order)).to eq(order)+ expect(assigns(:last_order_line_items)).to eq(order.line_items)+ end+ end+describe 'GET #new' doit 'renders the new user form' doget :new