Don't use the self.merchant
Fixes for PaymentMethod
Use from_db