Fix how bitcoin payins are shown on history page

gratipay · Apr 9, 2015 · 30fad5d · 30fad5d
1 parent 7e06d0e
commit 30fad5d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gratipay/utils/history.py b/gratipay/utils/history.py
@@ -69,8 +69,12 @@ def iter_payday_events(db, participant, year=None):
 
     username = participant.username
     exchanges = db.all("""
-        SELECT *
-          FROM exchanges
+        SELECT *,
+              ( SELECT r.*::exchange_routes
+                   FROM exchange_routes r
+                  WHERE r.id = e.route
+              ) AS route
+          FROM exchanges e
          WHERE participant=%(username)s
            AND extract(year from timestamp) = %(year)s
     """, locals(), back_as=dict)

diff --git a/www/%username/history/index.html.spt b/www/%username/history/index.html.spt
@@ -118,7 +118,11 @@ else:
         <td class="status">{{ translated_status[event['status']] }}</td>
         <td class="notes">
         {% if event['recorder'] == None %}
-            {{ _("Automatic Charge").lower() }}
+            {% if event['route'].network == 'balanced-cc' %}
+                {{ _("Automatic Charge").lower() }}
+            {% elif event['route'].network == 'coinbase-payin' %}
+                {{ _("Bitcoin Payin").lower() }}
+            {% endif %}
             {% if event['note'] %}&mdash;{{ event['note'] }}{% endif %}
         {% elif event['note'] %}
             &ldquo;{{ event['note'] }}&rdquo;&mdash;