Skip to content

Commit 7c520ca

Browse files
owockiowocki
committed
display voucher fundings in diff category from the regular (actually transfered) fundings
1 parent e1fd8dc commit 7c520ca

3 files changed

Lines changed: 66 additions & 51 deletions

File tree

‎app/grants/templates/grants/activity.html‎

Lines changed: 15 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% if subscriptions %}
66
<div id="active-subscriptions">
77
<p class="font-body font-weight-semibold subtitle mb-0">
8-
<i class="g-icon g-icon__dot-circle mr-2"></i>{% trans "Active Subscriptions" %}
8+
<i class="g-icon g-icon__dot-circle mr-2"></i>{% trans "Active Subscriptions" %} ({{subscriptions|length}})
99
</p>
1010
{% for subscription in subscriptions %}
1111
<div class="py-3 mx-sm-0 row transaction-history">
@@ -56,64 +56,29 @@
5656
<hr>
5757
<div id="contributions">
5858
<p class="font-body font-weight-semibold subtitle mb-0">
59-
<i class="g-icon g-icon__dot-circle mr-2"></i> {% trans "Contributions" %}
59+
<i class="g-icon g-icon__dot-circle mr-2"></i> {% trans "Contributions" %} ({{contributions|length}})
6060
</p>
6161
{% for transaction in contributions %}
62-
<div class="py-3 mx-sm-0 row transaction-history">
63-
<div class="d-none d-sm-block col-2 font-subheader text-center text-md-left my-auto">
64-
{{ transaction.created_on|date:"d M Y" }}
65-
</div>
66-
<div class="col-3 col-sm-2 col-md-1 justify-content-center special_tag">
67-
<a href="{% url 'profile' transaction.subscription.contributor_profile.handle %}">
68-
<img class="avatar rounded-circle" src="{{ transaction.subscription.contributor_profile.avatar_url }}">
69-
</a>
70-
</div>
71-
<div class="col-5 col-sm-4 my-auto">
72-
<div class="font-weight-bold font-body">
73-
<a href="{% url 'profile' transaction.subscription.contributor_profile.handle %}">
74-
{{ transaction.subscription.contributor_profile }}
75-
</a>
76-
</div>
77-
<div class="info font-caption">
78-
{{ transaction.subscription.amount_per_period|floatformat:4|intcomma }} {{ transaction.subscription.token_symbol }}
79-
{% if not transaction.tx_cleared %} (Pending) {% endif %}
80-
{% if not transaction.success %} (Failed) {% endif %}
81-
</div>
82-
</div>
83-
{% if not transaction.subscription.contributor_profile.hide_wallet_address %}
84-
<div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
85-
<a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
86-
{% if transaction.tx_id %}
87-
View Etherscan
88-
{% endif %}
89-
</a>
90-
</div>
91-
{% endif %}
92-
<div class="offset-lg-1 col-4 col-md-2 my-auto tags font-caption">
93-
<div class="tag tag-lg token">
94-
<p>
95-
{{ transaction.subscription.amount_per_period|floatformat:4|intcomma }}
96-
<span>{{ transaction.subscription.token_symbol }}</span>
97-
</p>
98-
</div>
99-
{% if transaction.value_in_usdt_now %}
100-
<div class="tag tag-lg usd">
101-
<p>
102-
{{ transaction.value_in_usdt_now }}
103-
<span>USD</span>
104-
</p>
105-
</div>
106-
{% endif %}
107-
</div>
108-
</div>
62+
{% include 'grants/transaction.html' %}
63+
{% endfor %}
64+
</div>
65+
{% endif %}
66+
{% if voucher_fundings %}
67+
<hr>
68+
<div id="contributions">
69+
<p class="font-body font-weight-semibold subtitle mb-0">
70+
<i class="g-icon g-icon__dot-circle mr-2"></i> {% trans "Voucher Fundings" %} ({{voucher_fundings|length}})
71+
</p>
72+
{% for transaction in voucher_fundings %}
73+
{% include 'grants/transaction.html' %}
10974
{% endfor %}
11075
</div>
11176
{% endif %}
11277
{% if cancelled_subscriptions %}
11378
<hr>
11479
<div id="cancelled-subscriptions">
11580
<p class="font-body font-weight-semibold subtitle mb-0">
116-
<i class="g-icon g-icon__dot-circle mr-2"></i> {% trans "Inactive Subscriptions" %}
81+
<i class="g-icon g-icon__dot-circle mr-2"></i> {% trans "Inactive Subscriptions" %} ({{cancelled_subscriptions|length}})
11782
</p>
11883
{% for subscription in cancelled_subscriptions %}
11984
<div class="py-3 mx-sm-0 row transaction-history">

‎app/grants/templates/grants/transaction.html‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{% load static humanize i18n grants_extra %}
2+
<div class="py-3 mx-sm-0 row transaction-history">
3+
<div class="d-none d-sm-block col-2 font-subheader text-center text-md-left my-auto">
4+
{{ transaction.created_on|date:"d M Y" }}
5+
</div>
6+
<div class="col-3 col-sm-2 col-md-1 justify-content-center special_tag">
7+
<a href="{% url 'profile' transaction.subscription.contributor_profile.handle %}">
8+
<img class="avatar rounded-circle" src="{{ transaction.subscription.contributor_profile.avatar_url }}">
9+
</a>
10+
</div>
11+
<div class="col-5 col-sm-4 my-auto">
12+
<div class="font-weight-bold font-body">
13+
<a href="{% url 'profile' transaction.subscription.contributor_profile.handle %}">
14+
{{ transaction.subscription.contributor_profile }}
15+
</a>
16+
</div>
17+
<div class="info font-caption">
18+
{{ transaction.subscription.amount_per_period|floatformat:4|intcomma }} {{ transaction.subscription.token_symbol }}
19+
{% if not transaction.tx_cleared %} (Pending) {% endif %}
20+
{% if not transaction.success %} (Failed) {% endif %}
21+
</div>
22+
</div>
23+
{% if not transaction.subscription.contributor_profile.hide_wallet_address %}
24+
<div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
25+
<a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
26+
{% if transaction.tx_id %}
27+
View Etherscan
28+
{% endif %}
29+
</a>
30+
</div>
31+
{% endif %}
32+
<div class="offset-lg-1 col-4 col-md-2 my-auto tags font-caption">
33+
<div class="tag tag-lg token">
34+
<p>
35+
{{ transaction.subscription.amount_per_period|floatformat:4|intcomma }}
36+
<span>{{ transaction.subscription.token_symbol }}</span>
37+
</p>
38+
</div>
39+
{% if transaction.value_in_usdt_now %}
40+
<div class="tag tag-lg usd">
41+
<p>
42+
{{ transaction.value_in_usdt_now }}
43+
<span>USD</span>
44+
</p>
45+
</div>
46+
{% endif %}
47+
</div>
48+
</div>

‎app/grants/views.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ def grant_details(request, grant_id, grant_slug):
218218
cancelled_subscriptions = grant.subscriptions.filter(active=False, error=False).order_by('-created_on')
219219
_contributions = Contribution.objects.filter(subscription__in=grant.subscriptions.all())
220220
phantom_funds = grant.phantom_funding.all()
221-
contributions = list(_contributions.order_by('-created_on')) + [ele.to_mock_contribution() for ele in phantom_funds.order_by('-created_on')]
221+
contributions = list(_contributions.order_by('-created_on'))
222+
voucher_fundings = [ele.to_mock_contribution() for ele in phantom_funds.order_by('-created_on')]
222223
contributors = list(_contributions.distinct('subscription__contributor_profile')) + list(phantom_funds.distinct('profile'))
223224
activity_count = len(cancelled_subscriptions) + len(contributions)
224225
user_subscription = grant.subscriptions.filter(contributor_profile=profile, active=True).first()
@@ -298,6 +299,7 @@ def grant_details(request, grant_id, grant_slug):
298299
'contributors': contributors,
299300
'clr_active': clr_active,
300301
'is_team_member': is_team_member,
302+
'voucher_fundings': voucher_fundings,
301303
}
302304

303305
if tab == 'stats':

0 commit comments

Comments
 (0)