Fix watch and order logic when store open or closed