Safer new_order handling

core/lib/spree/core/unreturned_item_charger.rb

@@ -10,7 +10,7 @@ def initialize(message, new_order)
 
  class_attribute :failure_handler
 
- attr_reader :original_order
+ attr_reader :original_order, :new_order
 
  def initialize(shipment, return_items)
  @shipment = shipment
@@ -19,6 +19,8 @@ def initialize(shipment, return_items)
  end
 
  def charge_for_items
+ self.new_order = Spree::Order.create!(exchange_order_attributes)
+
  new_order.associate_user!(@original_order.user) if @original_order.user
 
  add_exchange_variants_to_order
@@ -53,12 +55,10 @@ def charge_for_items
 
  end
 
- def new_order
- @new_order ||= Spree::Order.create!(exchange_order_attributes)
- end
-
  private
 
+ attr_writer :new_order
+
  def add_exchange_variants_to_order
  @return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|
  variant_inventory_units = variant_return_items.map(&:exchange_inventory_unit)