diff --git a/balanced/__init__.py b/balanced/__init__.py index c31abaa..6743c89 100644 --- a/balanced/__init__.py +++ b/balanced/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.8.2' +__version__ = '0.8.3' import contextlib diff --git a/balanced/resources.py b/balanced/resources.py index 0d03e14..d2afbe2 100644 --- a/balanced/resources.py +++ b/balanced/resources.py @@ -451,13 +451,16 @@ def create_buyer(self, email_address, card_uri, name=None, meta=None): meta=meta, ).save() - def create_merchant(self, email_address, merchant, bank_account_uri=None, - name=None, meta=None): + def create_merchant(self, email_address, merchant=None, bank_account_uri=None, + name=None, meta=None, merchant_uri=None): + if not any([merchant, merchant_uri]): + raise ResourceError('Must have merchant or merchant_uri') meta = meta or {} return Account( uri=self.accounts_uri, email_address=email_address, merchant=merchant, + merchant_uri=merchant_uri, bank_account_uri=bank_account_uri, name=name, meta=meta, @@ -521,7 +524,7 @@ class Card(Resource): def debit(self, amount=None, appears_on_statement_as=None, hold_uri=None, meta=None, description=None): if not any((amount, hold_uri)): - raise ResourceError('Must amount or hold_uri') + raise ResourceError('Must have amount or hold_uri') meta = meta or {} return Debit(