Validate product type and delivery mode #6013