use a better name for the method that restarts the checkout flow,also make sure we use the checkout_steps.first instead of hardcoding it to "address".

use expect syntax

use the correct syntax

Conflicts:
	core/app/models/spree/order.rb

Fixes #3995