always show support for inapp and ensure already refunded transactions cant be refunded (bug 747174)

Andy McKay · Andy McKay · commit b9335c79b566 · 2012-05-25T09:42:34.000+01:00
diff --git a/apps/stats/models.py b/apps/stats/models.py
@@ -364,6 +364,17 @@ def is_instant_refund(self):
         limit = datetime.timedelta(seconds=settings.PAYPAL_REFUND_INSTANT)
         return datetime.datetime.now() < (self.created + limit)
 
+    def is_refunded(self):
+        """
+        If related has been set, then this transaction has been refunded or
+        charged back. This is a bit expensive, so refrain from using on listing
+        pages.
+        """
+        return (Contribution.objects.filter(related=self,
+                                            type__in=[amo.CONTRIB_REFUND,
+                                                      amo.CONTRIB_CHARGEBACK])
+                                    .exists())
+
 
 models.signals.post_save.connect(Contribution.post_save, sender=Contribution)
 
diff --git a/apps/stats/tests/test_models.py b/apps/stats/tests/test_models.py
@@ -64,6 +64,14 @@ def test_not_instant_refund(self):
         self.con.update(created=datetime.now() - diff)
         assert not self.con.is_instant_refund(), "Refund shouldn't be instant"
 
+    def test_refunded(self):
+        user = UserProfile.objects.create(username='foo@bar.com')
+        addon = Addon.objects.create(type=amo.ADDON_EXTENSION)
+
+        assert not self.con.is_refunded()
+        Contribution.objects.create(user=user, addon=addon, related=self.con,
+                                    type=amo.CONTRIB_REFUND)
+        assert self.con.is_refunded()
 
     def test_refund_inapp_instant(self):
         for ctype in ('CONTRIB_INAPP', 'CONTRIB_INAPP_PENDING'):
diff --git a/mkt/account/templates/account/helpers/refund_info.html b/mkt/account/templates/account/helpers/refund_info.html
@@ -22,7 +22,7 @@
                 {% endtrans %}
               {% endif %}
             </span>
-            {% if get_support %}
+            {% if get_support or contribution.type == amo.CONTRIB_INAPP %}
               <a class="request-support"
                  href="{{ url('support', contribution.pk) }}">
                 {{ _('Request Support') }}</a>
diff --git a/mkt/account/tests/test_views.py b/mkt/account/tests/test_views.py
@@ -522,6 +522,9 @@ def get_support_url(self, *args):
 
 class TestPurchases(PurchaseBase):
 
+    def get_support_url(self, pk=None, *args):
+        return reverse('support', args=[pk or self.con.pk] + list(args))
+
     def make_contribution(self, product, amt, type, day, user=None):
         c = Contribution.objects.create(user=user or self.user,
                                         addon=product, amount=amt, type=type)
@@ -629,6 +632,15 @@ def test_support_link_inapp(self):
         eq_(self.get_pq()('a.request-support').eq(0).attr('href'),
             self.get_support_url())
 
+    def test_support_link_inapp_multiple(self):
+        self.con.update(type=amo.CONTRIB_INAPP)
+        con = self.make_contribution(self.con.addon, 1, amo.CONTRIB_INAPP, 2)
+        res = self.get_pq()
+        eq_(res('a.request-support').eq(0).attr('href'),
+            self.get_support_url())
+        eq_(res('a.request-support').eq(1).attr('href'),
+            self.get_support_url(pk=con.pk))
+
     def test_support_text_inapp(self):
         self.con.update(type=amo.CONTRIB_INAPP)
         assert self.get_pq()('span.purchase').eq(0).text().startswith('In-app')
diff --git a/mkt/support/templates/support/start.html b/mkt/support/templates/support/start.html
@@ -7,7 +7,7 @@ <h1>{{ _('What do you need help with?') }}</h1>
     {{ _("I can't install my purchase") }} &raquo;</a></li>
   <li><a href="{{ url('support', contribution.pk, 'resources') }}">
     {{ _('I have billing or payment concerns') }} &raquo;</a></li>
-  {% if waffle.switch('allow-refund') %}
+  {% if waffle.switch('allow-refund') and not contribution.is_refunded() %}
     <li><a href="{{ url('support', contribution.pk, 'request') }}">
       {{ _('I want to request a refund') }} &raquo;</a></li>
   {% else %}
diff --git a/mkt/support/tests/test_views.py b/mkt/support/tests/test_views.py
@@ -31,6 +31,16 @@ def test_support_page_form(self):
         eq_(doc('#support-start').find('a').eq(0).attr('href'),
             self.get_support_url('author'))
 
+    def test_refund_link(self):
+        doc = pq(self.client.get(self.get_support_url()).content)
+        eq_(len(doc('#support-start').find('a')), 4)
+
+    @mock.patch('apps.stats.models.Contribution.is_refunded')
+    def test_no_refund_link(self, is_refunded):
+        is_refunded.return_value = True
+        doc = pq(self.client.get(self.get_support_url()).content)
+        eq_(len(doc('#support-start').find('a')), 3)
+
     def test_support_page_external_link(self):
         self.app.support_url = 'http://omg.org/yes'
         self.app.save()
@@ -122,6 +132,16 @@ def test_no_txnid_request(self):
         eq_(len(mail.outbox), 0)
         self.assertRedirects(res, reverse('account.purchases'), 302)
 
+    @mock.patch('apps.stats.models.Contribution.is_refunded')
+    def test_already_refunded_request(self, is_refunded):
+        is_refunded.return_value = True
+        self.client.post(self.get_support_url('request'), {'remove': 1})
+        res = self.client.post(self.get_support_url('reason'),
+                               {'text': 'something'})
+        assert 'refunded' in res.cookies['messages'].value
+        eq_(len(mail.outbox), 0)
+        self.assertRedirects(res, reverse('account.purchases'), 302)
+
     @mock.patch('stats.models.Contribution.is_instant_refund')
     def test_request_mails(self, is_instant_refund):
         is_instant_refund.return_value = False
diff --git a/mkt/support/views.py b/mkt/support/views.py
@@ -119,6 +119,11 @@ def refund_reason(request, contribution, wizard):
                         'transaction_id: %r' % contribution.pk)
         return redirect('account.purchases')
 
+    if contribution.is_refunded():
+        messages.error(request, _('This has already been refunded.'))
+        paypal_log.info('Already refunded: %s' % contribution.pk)
+        return redirect('account.purchases')
+
     if contribution.is_instant_refund():
         try:
             paypal.refund(contribution.paykey)
