Added display_ship_total to order api response
Merge in feature/add-display-ship-total