Make sure checkout payment only flow works

Fixes #3142

Conflicts:
	frontend/app/views/spree/checkout/payment/_gateway.html.erb