Fix for Bug #5 persist payment status and use it in finishAction() when saving the order