Fix expiresAt removing
Add order.state to store all possible states