Skip to content

Commit

Permalink
Merge pull request #6007 from solidusio/backport/v4.3/pr-5596
Browse files Browse the repository at this point in the history
[v4.3] Use Order#email to show the order's email in new admin
  • Loading branch information
tvdeyen authored Dec 4, 2024
2 parents 2eb1fc1 + 14d57ac commit bbceaab
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 @@ -138,7 +138,7 @@ def customer_column
col: { class: "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 bbceaab

Please sign in to comment.