Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion omise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _as_object(data):
if isinstance(data, list):
return [_as_object(i) for i in data]
elif isinstance(data, dict):
class_ = _get_class_for(data['object'])
class_ = _get_class_for(data.get('object'))
if not class_:
class_ = Base
return class_.from_data(data)
Expand Down
4 changes: 4 additions & 0 deletions omise/test/test_charge.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ def test_retrieve(self, api_call):
"amount": 100000,
"currency": "thb",
"description": "Order-384",
"metadata": {
"order_id": "384"
},
"capture": false,
"authorized": true,
"reversed": false,
Expand Down Expand Up @@ -314,6 +317,7 @@ def test_retrieve(self, api_call):
self.assertEqual(charge.amount, 100000)
self.assertEqual(charge.currency, 'thb')
self.assertEqual(charge.description, 'Order-384')
self.assertEqual(charge.metadata.order_id, '384')
self.assertEqual(charge.ip, '127.0.0.1')
self.assertEqual(charge.card.id, 'card_test')
self.assertEqual(charge.card.last_digits, '4242')
Expand Down
4 changes: 4 additions & 0 deletions omise/test/test_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ def test_retrieve(self, api_call):
"paid": false,
"amount": 100000,
"currency": "thb",
"metadata": {
"recipient_name": "Somchai"
},
"failure_code": null,
"failure_message": null,
"transaction": null,
Expand All @@ -87,6 +90,7 @@ def test_retrieve(self, api_call):
self.assertFalse(transfer.paid)
self.assertEqual(transfer.id, 'trsf_test')
self.assertEqual(transfer.amount, 100000)
self.assertEqual(transfer.metadata.recipient_name, 'Somchai')
self.assertEqual(transfer.transaction, None)
self.assertRequest(api_call, 'https://api.omise.co/transfers/trsf_test')

Expand Down