orders_controller.rb in spree_backend-2.0.4

- old
+ new

@@ -44,14 +44,22 @@
         params[:q][:created_at_lt] = created_at_lt
       end
 
       def new
         @order = Order.create
+        @order.created_by = try_spree_current_user
+        @order.save
         redirect_to edit_admin_order_url(@order)
       end
 
       def edit
         @order.shipments.map &:refresh_rates
+        # Transition as far as we can go
+        while @order.next; end
+        # The payment step shows an error of 'No pending payments'
+        # Clearing the errors from the order object will stop this error
+        # appearing on the edit page where we don't want it to.
+        @order.errors.clear
       end
 
       def update
         return_path = nil
         if @order.update_attributes(params[:order]) && @order.line_items.present?