Fix gateway redirection with unsynced order and payment IDs

[blmage]

Orders and payments may have unsynchronized IDs, in which case unexpected results may happen