Takeaway wine from restaurants to be made a permanent rule