No need to call order.create_proposed_shipments twice [Fixes solidu…

…sio#3181] Shipments are already destroyed and created every time order moves from address to delivery
nebulab · Jun 12, 2013 · 4c67455 · 4c67455
1 parent b504cc7
commit 4c67455
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/api/app/controllers/spree/api/checkouts_controller.rb b/api/app/controllers/spree/api/checkouts_controller.rb
@@ -91,11 +91,6 @@ def before_address
  @order.ship_address ||= Address.default
  end
 
- def before_delivery
- return if params[:order].present?
- @order.create_proposed_shipments
- end
-
  def before_payment
  @order.payments.destroy_all if request.put?
  end

diff --git a/frontend/app/controllers/spree/checkout_controller.rb b/frontend/app/controllers/spree/checkout_controller.rb
@@ -128,8 +128,6 @@ def before_address
  def before_delivery
  return if params[:order].present?
 
- @order.create_proposed_shipments
-
  packages = @order.shipments.map { |s| s.to_package }
  @differentiator = Spree::Stock::Differentiator.new(@order, packages)
  end