bug fix for error order state and add the possibility to choose a valid order state after the payment