Fixing duplicate payment creation for non paypal payment methods

Conflicts:
	app/controllers/spree/checkout_controller_decorator.rb