move the new order email up in line

just think it's better when we are saving sooner
shorten the state just in case