spree/spree — pull request #5768 by gmacdougall (2014-12-12 21:34:52+00:00)
Title: Fix issue on checkouts controller.

This is a bug which occurs preventing orders from moving past the
payment state when promotions, or other adjustments are applied to the
order.

order.total is the amount to be paid, order.amount is the total of the
line items.

This issue was introduced in #5754