Updated to work with spree 2.2.1

Manually tested for credit card and cash payments.