add and test feature #127
replace get/setDeliveryLocation(...) with get/setDeliveryLocationId(...)

replace get/setPickupLocation(...) with get/setPickupLocationId(...)