payment: use correct payment method id across transactions

This is the second part of a087f68425f55af28eb12cf14425db8a01a9f345.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
payment: fix compilation warnings

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>