VM3 Shipping Methods and Shipping Address

[Quintin-E]

Hi

I'm using Joomla 3.4.8 and Virtuemart 3.0.12

I have setup 3 shipping options using the standard VM Shipment option (VM Shipment – By weight, ZIP and countires):
1.   Quote for delivery
2.   Collection from Warehouse
3.   Own Courier to collect at branch

If the user selects option 1. they should be able to add the shipping address where delivery will be made to as per the default cart page - so this works.
But if they select options 2. or 3. no shipping address should be required/visible as they will collect themselves and this info is not required.

Currently no matter which option is chosen the default delivery address is always displayed in the confirmation emails and this confuses the shopper and shop owner as there is always a delivery address even if they choose to collect themselves.

Can you point me in the right direction to set this up please.

Thanks