Fixed issue on Order page.
Fixed issue on Order page.
ES-225 : fix for no plan indicated
ES-228 : fix for no plan indicated
fix conflicts