Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Remove tips from the UI #4219

Merged
merged 1 commit into from
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions www/1.0-payout.spt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ if user.ANON:
suppress_sidebar = True
banner = _("1.0")
title = _("Status of Your 1.0 Payout")
receiving, ntips = user.participant.get_old_stats()
balance = user.participant.balance
status = user.participant.status_of_1_0_payout
[---] text/html
Expand Down Expand Up @@ -71,19 +70,6 @@ status = user.participant.status_of_1_0_payout
, _a='</a>'|safe
) }}</p>
{% endif %}

{% if ntips %}
<p>{{ ngettext(
"P.S. You were receiving {b}{receiving} per week from one person{_b} under Gratipay 1.0. Want to receive that money again under Gratipay 2.0? {a}Apply for a new Team{_a} instead of a one-time payout."
, "P.S. You were receiving {b}{receiving} per week from {n} people{_b} under Gratipay 1.0. Want to receive that money again under Gratipay 2.0? {a}Apply for a new Team{_a} instead of a one-time payout."
, ntips
, receiving=format_currency(receiving, 'USD')
, a='<a href="/new">'|safe
, _a='</a>'|safe
, b='<b>'|safe
, _b='</b>'|safe
) }}</p>
{% endif %}
{% endif %}
{% endif %}
{% endblock %}
Expand Down
26 changes: 0 additions & 26 deletions www/new.spt
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,9 @@ if user.participant.email_address is None:
if not user.participant.has_payout_route:
raise Response(400, _("You must attach a PayPal account to apply for a new Team."))


# We'll actually migrate *all* non-zero tips from non-closed, non-suspicious
# users, in case someone responds to a "failing card" notification at some
# point. But let's only tell them about the funded tips.

receiving, ntips = user.participant.get_old_stats()
title = _("Apply for a New Team")
banner = _("Apply")
suppress_sidebar = True

deadline = datetime(2015, 10, 2).date()
now = datetime.utcnow().date()
delta = (deadline - now).total_seconds() # will be zero on Oct 2
still_migrating = delta > 0
[---] text/html
{% extends "templates/base.html" %}

Expand Down Expand Up @@ -110,21 +99,6 @@ still_migrating = delta > 0
) }}
</label>

{% if ntips and still_migrating %}
<h2>{{ _("Migration of Payments") }}</h2>

<p>{{ _("The {ntips} weekly tips totalling {receiving} that previously were directed to your ~{username} user account under Gratipay 1.0 will be converted into weekly voluntary payments to your new Team under {a}Gratipay 2.0{_a}, pending approval of your application."
, ntips=ntips
, receiving=format_currency(receiving, 'USD')
, username=user.participant.username
, a='<a href="https://medium.com/gratipay-blog/gratipay-2-0-2453d3c53077">'|safe
, _a='</a>'|safe
) }}</p>
{% else %}
<br>
<br>
{% endif %}

<button type="submit">{{ _("Apply") }}</button>
</form>
{% endblock %}