update batch payment for multiple payment methods, etc., #17878 and #23741