Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Order#order_email to show the order's email #5596

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def customer_column
col: { class: "w-[400px]" },
header: :customer,
data: ->(order) do
customer_email = order.user&.email
customer_email = order.order_email
content_tag :div, String(customer_email)
end
}
Expand Down
1 change: 1 addition & 0 deletions admin/spec/features/orders/index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
visit "/admin/orders"
click_on "In Progress"

expect(page).to have_content("admin@example.com")
expect(page).to have_content("R123456789")
expect(page).to have_content("$19.99")
expect(page).to be_axe_clean
Expand Down
4 changes: 4 additions & 0 deletions core/app/models/spree/order.rb
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,10 @@ def validate_payments_attributes(attributes)
end
end

def order_email
email.presence || user&.email
end

private

def process_payments_before_complete
Expand Down
22 changes: 22 additions & 0 deletions core/spec/models/spree/order_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1832,4 +1832,26 @@ def validate(line_item)
expect { subject }.to change { Spree::OrderPromotion.count }.from(1).to(0)
end
end

describe "order_email" do
context "when a new order is created" do
it "returns nil" do
expect(Spree::Order.new.order_email).to eq(nil)
end
end

context "when a logged in user creates an order" do
it "returns the customer's email" do
order = build(:order, user: build(:user, email: "customer@example.com"))
expect(order.order_email).to eq("customer@example.com")
end
end

context "when order email is different than user's email" do
it "gives preference to order's email" do
order = build(:order, email: "buyer@example.com", user: build(:user, email: "customer@example.com"))
expect(order.order_email).to eq("buyer@example.com")
end
end
end
end