Smoking to be banned on all bar and restaurant terraces and vaping restricted