Restrictions around takeaway food and click-and-collect services in Scotland are to be toughened.