Moved foil-only checks further upstream. This fixes problems with resetting the price, prince in wishlist, etc