From d09ba16411f5183305d75b1aa68420ac99db1c28 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 9 Feb 2022 13:45:52 +1100 Subject: [PATCH] Associate customers again And simplify the before_validation actions. --- app/models/spree/order.rb | 5 +++-- spec/models/spree/order_spec.rb | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 678a0fc8d1..2693ef5bb9 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -84,8 +84,7 @@ module Spree before_validation :set_currency before_validation :generate_order_number, on: :create before_validation :clone_billing_address, if: :use_billing? - before_validation :associate_customer, unless: :customer_id? - before_validation :ensure_customer, unless: :customer_is_valid? + before_validation :ensure_customer before_create :link_by_email after_create :create_tax_charge! @@ -715,6 +714,8 @@ module Spree end def create_customer + return if customer_is_valid? + Customer.create( enterprise: distributor, email: email_for_customer, diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index c3dd67e7f2..2a87a04009 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -948,8 +948,6 @@ describe Spree::Order do end it "associates an existing customer" do - pending "the last commit broke associating orders" - customer = create( :customer, user: user,