Sorry it took a bit to work this out, but I had to know more about what was really wrong before telling you a solution to this or risk breaking other things ...

Thanks for the update that this is now working once you updated your Payment Module ...