merge order content decorator into spree core