diff --git a/www/1.0-payout.spt b/www/1.0-payout.spt index 61db03d41e..22939cde87 100644 --- a/www/1.0-payout.spt +++ b/www/1.0-payout.spt @@ -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 @@ -71,19 +70,6 @@ status = user.participant.status_of_1_0_payout , _a=''|safe ) }}

{% endif %} - - {% if ntips %} -

{{ 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=''|safe - , _a=''|safe - , b=''|safe - , _b=''|safe - ) }}

- {% endif %} {% endif %} {% endif %} {% endblock %} diff --git a/www/new.spt b/www/new.spt index 32dde9b0fe..b116af13ba 100644 --- a/www/new.spt +++ b/www/new.spt @@ -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" %} @@ -110,21 +99,6 @@ still_migrating = delta > 0 ) }} - {% if ntips and still_migrating %} -

{{ _("Migration of Payments") }}

- -

{{ _("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=''|safe - , _a=''|safe - ) }}

- {% else %} -
-
- {% endif %} - {% endblock %}