Jeantine/ChrisS DECO-1011 - Fixed callback for no shipping