Skip to content

Commit

Permalink
Use Order#email to show the order's email in new admin
Browse files Browse the repository at this point in the history
`spree_orders` table has the column `email` which stores the email of
guest orders or users email for non guest orders. We should use
that in the new admin to display the email so that guest orders work
as well.

(cherry picked from commit 93abf41)

# Conflicts:
#	admin/spec/features/orders/index_spec.rb
  • Loading branch information
softr8 committed Dec 4, 2024
1 parent 2b5ddb9 commit cf95b52
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def customer_column
class_name: "w-[400px]",
header: :customer,
data: ->(order) do
customer_email = order.user&.email
customer_email = order.email
content_tag :div, String(customer_email)
end
}
Expand Down
16 changes: 16 additions & 0 deletions admin/spec/features/orders/index_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# frozen_string_literal: true

require 'spec_helper'

describe "Orders", type: :feature do
before { sign_in create(:admin_user, email: '[email protected]') }

it "lists orders", :js do
create(:order, number: "R123456789", total: 19.99)

visit "/admin/orders"
click_on "In Progress"

expect(page).to have_content("[email protected]")
end
end

0 comments on commit cf95b52

Please sign in to comment.