Fix payment state logic

Conflicts:
	core/spec/models/spree/order_updater_spec.rb