Return empty string for payment_method instead of 'None'.
Merge pull request #768 from benkonrath/general-bug-fixes

Return empty string for payment_method instead of 'None'.