fix uuid vs transaction_id logic

This commit is contained in:
Kevin Ngo 2013-02-04 19:59:34 -08:00
Родитель 400ddd43be
Коммит c7bdab7e10
2 изменённых файлов: 8 добавлений и 6 удалений

Просмотреть файл

@ -276,12 +276,14 @@ class TestTransactionSummary(TestCase):
def setUp(self):
self.uuid = 45
self.transaction_id = 999
self.buyer_uuid = 123
self.seller_uuid = 456
self.related_tx_uuid = 789
Contribution.objects.create(addon=addon_factory(),
transaction_id=self.uuid)
uuid=self.uuid,
transaction_id=self.transaction_id)
self.url = reverse('lookup.transaction_summary', args=[self.uuid])
self.client.login(username='support-staff@mozilla.com',
@ -318,7 +320,7 @@ class TestTransactionSummary(TestCase):
eq_(tx_data['buyer']['uuid'], self.buyer_uuid)
def lookup_tx_side_effect(self, *args, **kwargs):
if str(args[0]) == str(self.uuid):
if str(args[0]) == str(self.transaction_id):
return self.mock_transaction()
raise SolitudeError
@ -345,7 +347,7 @@ class TestTransactionRefund(TestCase):
AddonUser.objects.create(addon=self.app, user=self.user)
self.contrib = Contribution.objects.create(
addon=self.app, user=self.user, transaction_id=self.uuid,
addon=self.app, user=self.user, uuid=self.uuid,
type=amo.CONTRIB_PURCHASE)
self.req = RequestFactory().post(self.url, {'refund_reason': 'text'})

Просмотреть файл

@ -93,10 +93,10 @@ def transaction_summary(request, uuid):
def _transaction_summary(uuid):
"""Get transaction details from Solitude API."""
contrib = get_object_or_404(Contribution, transaction_id=uuid)
contrib = get_object_or_404(Contribution, uuid=uuid)
# Get tx.
try:
transaction = client.lookup_transaction(uuid)
transaction = client.lookup_transaction(contrib.transaction_id)
except (SolitudeError, ValueError):
return
@ -122,7 +122,7 @@ def _transaction_summary(uuid):
@login_required
@permission_required('Transaction', 'Refund')
def transaction_refund(request, uuid):
contrib = get_object_or_404(Contribution, transaction_id=uuid)
contrib = get_object_or_404(Contribution, uuid=uuid)
if contrib.has_refund():
raise PermissionDenied