Merge pull request #2064 from gittip/fix-payday-regressions

Fix payday regressions

gittip/billing/payday.py

@@ -18,6 +18,7 @@
 """
 from __future__ import unicode_literals
 
+import sys
 from decimal import Decimal, ROUND_UP
 
 import balanced
@@ -625,18 +626,18 @@ def ach_credit(self, ts_start, participant, tips, total):
                 return  # not in Balanced
 
             customer = balanced.Customer.fetch(balanced_customer_href)
-            if customer.merchant_status == 'underwritten':
-                log("%s is not a merchant." % participant.username)
-                return  # not a merchant
-
             customer.bank_accounts.one()\
                                   .credit(amount=cents,
                                           description=participant.username)
 
-            error = ""
             log(msg + "succeeded.")
+            error = ""
         except balanced.exc.HTTPError as err:
-            error = err.message
+            error = err.message.message
+        except:
+            error = repr(sys.exc_info()[1])
+
+        if error:
             log(msg + "failed: %s" % error)
 
         self.record_credit(credit_amount, fee, error, participant.username)
@@ -660,6 +661,10 @@ def charge_on_balanced(self, username, balanced_customer_href, amount):
             error = ""
         except balanced.exc.HTTPError as err:
             error = err.message.message
+        except:
+            error = repr(sys.exc_info()[1])
+
+        if error:
             log(msg + "failed: %s" % error)
 
         return charge_amount, fee, error