Add a way for sponsors to pay without asking for logos etc.

readthedocs/donate/admin.py

@@ -63,11 +63,6 @@ def view_ratio(self, instance):
     def click_ratio(self, instance):
         return instance.click_ratio() * 100
 
-    def total_views(self, instance):
-        return sum(imp.views for imp in instance.impressions.all())
-
-    def total_clicks(self, instance):
-        return sum(imp.clicks for imp in instance.impressions.all())
 
 admin.site.register(Supporter, SupporterAdmin)
 admin.site.register(SupporterPromo, SupporterPromoAdmin)

readthedocs/donate/forms.py

@@ -122,11 +122,10 @@ class Meta:
     email = forms.CharField(required=True)
 
     def validate_stripe(self):
-        """Call stripe for payment (not ideal here) and clean up logo < $200"""
         stripe.Charge.create(
             amount=int(self.cleaned_data['dollars']) * 100,
             currency='usd',
             source=self.cleaned_data['stripe_token'],
-            description='Read the Docs Ethical Ads',
+            description='Read the Docs Sponsorship Payment',
             receipt_email=self.cleaned_data['email']
         )

readthedocs/donate/models.py

@@ -157,6 +157,15 @@ def views_needed_today(self):
             return 0
         return ret
 
+    def total_views(self):
+        return sum(imp.views for imp in self.impressions.all())
+
+    def total_clicks(self):
+        return sum(imp.clicks for imp in self.impressions.all())
+
+    def total_click_ratio(self):
+        return '%.4f' % (float(self.total_clicks()) / float(self.total_views()))
+
 
 class BaseImpression(models.Model):
     date = models.DateField(_('Date'))

readthedocs/donate/templates/donate/ethicalads-success.html

@@ -3,13 +3,13 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %}{% trans "Sustainability" %}{% endblock %}
+{% block title %}{% trans "Sponsorship" %}{% endblock %}
 
 {% block content %}
   <h2>Thanks for your support</h2>
 
   <p>
-    We appreciate your contribution greatly, thank you for showing your support!
-    Your help will go a long ways towards making the service more sustainable.
+    We think that our <a href="http://docs.readthedocs.io/en/latest/ethical-advertising.html">Ethical Advertising</a> campaign is a wonderful step forward for running ads on open source projects.
+    Thanks for your support.
   </p>
 {% endblock %}

readthedocs/donate/templates/donate/ethicalads.html

@@ -35,7 +35,8 @@ <h2>Pay for your Sponsorship</h2>
 
   <p>
     This form can be used to pay for your sponsorship of Read the Docs.
-    Thanks for helping make Open Source more sustainable!
+    We think that our <a href="http://docs.readthedocs.io/en/latest/ethical-advertising.html">Ethical Advertising</a> campaign is a wonderful step forward for running ads on open source projects.
+    You can pay for these ads below.
   </p>
 
   <form action="" method="post" id="donate-payment" class="payment">

readthedocs/donate/templates/donate/promo_detail.html

@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+{% load static %}
+
+{% block title %}{% trans "Promo Detail" %}{% endblock %}
+
+{% block content %}
+
+<h1> Promo Results </h1>
+
+{% for promo in promos %}
+
+<h3>
+Results for {{ promo.name }} ({{ promo.analytics_id }}) over last {{ days }} days.
+</h3>
+
+<div class="example" style="width: 30%;">
+<a href="{{ promo.link }}"><img width=120 height=90 src="{{ promo.image }}"></a>
+<br>
+{{ promo.text }}
+
+</div>
+
+<br>
+
+<table>
+  <tr>
+    <th><strong>Day (UTC)</strong></th>
+    <th><strong>Views</strong></th> 
+    <th><strong>Clicks</strong></th>
+    <th><strong>CTR</strong></th>
+  </tr>
+  {% for day in promo.impressions.all|slice:days_slice %}
+  <tr>
+    <td>{{ day.date }}</td>
+    <td><code>{{ day.views }}</code></td> 
+    <td><code>{{ day.clicks }}</code></td>
+    <td><code>{{ day.click_ratio }}%</code></td>
+  </tr>
+  {% endfor %}
+  <tr>
+    <td><strong>Total (over all time)</strong> </td>
+    <td><strong>{{ promo.total_views }}</strong></td> 
+    <td><strong>{{ promo.total_clicks }}</strong></td>
+    <td><strong>{{ promo.total_click_ratio }}%</strong></td>
+  </tr>
+</table>
+
+{% endfor %}
+
+{% endblock %}

readthedocs/donate/urls.py

@@ -1,14 +1,15 @@
 from django.conf.urls import url, include
 
 from .views import DonateCreateView, DonateListView, DonateSuccessView
-from .views import PayAdsView, PaySuccess
+from .views import PayAdsView, PaySuccess, PromoDetailView
 from .views import click_proxy, view_proxy
 
 
 urlpatterns = [
     url(r'^$', DonateListView.as_view(), name='donate'),
     url(r'^pay/$', PayAdsView.as_view(), name='pay_ads'),
     url(r'^pay/success/$', PaySuccess.as_view(), name='pay_success'),
+    url(r'^report/(?P<promo_slug>.+)/$', PromoDetailView.as_view(), name='donate_promo_detail'),
     url(r'^contribute/$', DonateCreateView.as_view(), name='donate_add'),
     url(r'^contribute/thanks$', DonateSuccessView.as_view(), name='donate_success'),
     url(r'^view/(?P<promo_id>\d+)/(?P<hash>.+)/$', view_proxy, name='donate_view_proxy'),

readthedocs/donate/views.py

@@ -23,7 +23,7 @@
 
 class PayAdsView(StripeMixin, CreateView):
 
-    """Create a donation locally and in Stripe"""
+    """Create a payment locally and in Stripe"""
 
     form_class = EthicalAdForm
     success_message = _('Your payment has been received')
@@ -77,6 +77,26 @@ def get_template_names(self):
         return [self.template_name]
 
 
+class PromoDetailView(TemplateView):
+    template_name = 'donate/promo_detail.html'
+
+    def get_context_data(self, **kwargs):
+        promo_slug = kwargs['promo_slug']
+        slugs = promo_slug.split(',')
+        days = int(self.request.GET.get('days', 90))
+
+        if promo_slug == 'live' and self.request.user.is_staff:
+            promos = SupporterPromo.objects.filter(live=True)
+        else:
+            promos = SupporterPromo.objects.filter(analytics_id__in=slugs)
+
+        return {
+            'promos': promos,
+            'days': days,
+            'days_slice': ':%s' % days,
+        }
+
+
 def click_proxy(request, promo_id, hash):
     promo = get_object_or_404(SupporterPromo, pk=promo_id)
     count = cache.get(promo.cache_key(type=CLICKS, hash=hash), None)