Re-include Spree::OrdersHelper into CheckoutController (for truncated_product_description)
Index shipments by order_id

Fixes #2594