The FAQ's imply that the 32 and 64gb S6 and Edge are OK for open discount.
I doubt anyone can accurately know if the Edge+ will be included either way until it is launched - we can guess, but won't know for sure.
I have no affiliation whatsoever with O2 or any subsidiary companies. Comments posted are entirely of my own opinion.
This is not Customer Service so we are unable to help with account specific issues.Currently using:
Pixel 7a (O2 & Lyca), One Plus 6 (Sfr), iPhone 12 Pro Max (Vodafone)