add shipping_id/order_id to orders
remove trips_helper