Freight charges were not being cleared from the order when switching from Delivery to Pickup in some scenarios. This has been fixed.