Transit time calculation to include deliver to address location at Sales Order for promising

Our business flow uses pre-defined ship to's and create deliver to if customer wanted dropship to different location than their primary location when the Sales Order is placed. We use arrival mode and transit time is critical to derive arrival date and inform to customer at the time of order placement.

We had setup zones between warehouse and destination locations but EBS only considering ship to address and not deliver to address making schedule arrival date not using correct transit time.

Ex - Warehouse in Charlotte

Customer ship to - Charlotte - 1 day zone

Order placed with drop ship to/deliver to - San Diego - 3 day zone