[MERGE] OPW 18001: do not lock-out user when payment.order is 'done', allow it to...