Fix spree bug that was setting payment and shipment state empty