Applying bugfix from core/app/controllers/spree/orders_controller.rb to promo decorator