M&S will be over the worst of cyberattack impact by August