Reuse generate_payment_values

Instead of duplicating the logic when creating a new payment.

Change-Id: I9cbee85c1b89b2a922e7512cffadc016477f46db