Replace InvoicePayer with utility methods
#2007
Merged
InvoicePayer with utility methods
#2007