Refactor payment method check for gateway method as it should have been written

Refactor payment method check for gateway method as it should have been written #5492