Fix order & payment status