{{ _("Gives") }} {{ fmt(user.participant.giving) }}
- {{ _("Receives") }} {{ fmt(user.participant.receiving) }}
+ {{ _("Takes") }} {{ fmt(user.participant.taking) }}
{% for account in user_accounts %} @@ -65,7 +65,7 @@ suppress_sidebar = True
{{ other.username }}
{{ _("Gives") }} {{ fmt(other.giving) }}
- {{ _("Receives") }} {{ fmt(other.receiving) }}
+ {{ _("Takes") }} {{ fmt(other.taking) }}
{% for other_account in other_accounts %}
{{ user.participant.username }}
{{ _("Gives") }} {{ fmt(giving_after) }}
- {{ _("Receives") }} {{ fmt(receiving_after) }}
+ {{ _("Takes") }} {{ fmt(taking_after) }}
{% for user_account in user_accounts %} @@ -113,7 +113,7 @@ suppress_sidebar = True {% endif %} {{ other.username }}
{{ _("Gives") }} {{ fmt(other.giving) }}
- {{ _("Receives") }} {{ fmt(other.receiving) }}
+ {{ _("Takes") }} {{ fmt(other.taking) }}
{% for other_account in other_accounts %} diff --git a/www/~/%username/number.json.spt b/www/~/%username/number.json.spt deleted file mode 100644 index fd71c24abf..0000000000 --- a/www/~/%username/number.json.spt +++ /dev/null @@ -1,38 +0,0 @@ -from __future__ import print_function, unicode_literals - -from aspen import Response -from gratipay.utils import get_participant -from gratipay.exceptions import ProblemChangingNumber - -[-----------------------------------------------------------------------------] - -request.allow("POST") -participant = get_participant(state, restrict=True) - -number = request.body["number"] - -if number not in ("singular", "plural"): - raise Response(400) - -out = {} - -if number != participant.number: - if number == "singular" and not request.body.get("confirmed") and participant.nmembers > 0: - msg = _("Warning: Doing this will remove all the members from your team.\n\n" - "You'll have to add them back manually to undo this!") - out = {'confirm': msg} - elif number == "plural" and not request.body.get("confirmed") and participant.anonymous_receiving == True: - msg = _("Warning: This will make the total amount you receive publicly visible.\n\n" - "Are you sure you want to do this?") - out = {'confirm': msg} - else: - try: - participant.update_number(number) - except ProblemChangingNumber, e: - raise Response(400, unicode(e)) - msg = _("Your account type has been changed.") - out = {'number': number, 'msg': msg} - - -[---] application/json via json_dump -out diff --git a/www/~/%username/privacy.json.spt b/www/~/%username/privacy.json.spt index 092a3d22ee..e946401f86 100644 --- a/www/~/%username/privacy.json.spt +++ b/www/~/%username/privacy.json.spt @@ -7,18 +7,15 @@ participant = get_participant(state, restrict=True) if request.method == 'POST': field = request.body.get("toggle") - if field not in ["is_searchable", "anonymous_receiving", "anonymous_giving"]: + if field not in ["is_searchable", "anonymous_giving"]: raise Response(400) - if participant.IS_PLURAL and field == "anonymous_receiving": - raise Response(403, _("Teams aren't allowed to hide their receiving amount.")) - rec = website.db.one(""" UPDATE participants SET {0}=not {0} WHERE username=%s - RETURNING {0} + RETURNING {0} """.format(field), (user.participant.username,)) assert rec is not None @@ -29,7 +26,7 @@ if request.method == 'POST': else: rec = website.db.one(""" - SELECT is_searchable, anonymous_receiving, anonymous_giving + SELECT is_searchable, anonymous_giving FROM participants WHERE username=%s """, (user.participant.username,), back_as=dict) diff --git a/www/~/%username/settings/close.spt b/www/~/%username/settings/close.spt index f4648793dc..f4d214f2e4 100644 --- a/www/~/%username/settings/close.spt +++ b/www/~/%username/settings/close.spt @@ -79,16 +79,13 @@ elif nteams == 1: href="https://github.com/gratipay/gratipay.com/issues/397">data retention policy). -
- {% if participant.IS_SINGULAR %} - -
- {% endif %}
{{ _("Gives") }} {{ fmt(other.giving) }}
- {{ _("Receives") }} {{ fmt(other.receiving) }}
+ {{ _("Takes") }} {{ fmt(other.taking) }}
{% for other_account in other_accounts %}
{{ _("Gives") }} {{ fmt(giving_after) }}
- {{ _("Receives") }} {{ fmt(receiving_after) }}
+ {{ _("Takes") }} {{ fmt(taking_after) }}
{% for user_account in user_accounts %} @@ -113,7 +113,7 @@ suppress_sidebar = True {% endif %} {{ other.username }}
{{ _("Gives") }} {{ fmt(other.giving) }}
- {{ _("Receives") }} {{ fmt(other.receiving) }}
+ {{ _("Takes") }} {{ fmt(other.taking) }}
{% for other_account in other_accounts %} diff --git a/www/~/%username/number.json.spt b/www/~/%username/number.json.spt deleted file mode 100644 index fd71c24abf..0000000000 --- a/www/~/%username/number.json.spt +++ /dev/null @@ -1,38 +0,0 @@ -from __future__ import print_function, unicode_literals - -from aspen import Response -from gratipay.utils import get_participant -from gratipay.exceptions import ProblemChangingNumber - -[-----------------------------------------------------------------------------] - -request.allow("POST") -participant = get_participant(state, restrict=True) - -number = request.body["number"] - -if number not in ("singular", "plural"): - raise Response(400) - -out = {} - -if number != participant.number: - if number == "singular" and not request.body.get("confirmed") and participant.nmembers > 0: - msg = _("Warning: Doing this will remove all the members from your team.\n\n" - "You'll have to add them back manually to undo this!") - out = {'confirm': msg} - elif number == "plural" and not request.body.get("confirmed") and participant.anonymous_receiving == True: - msg = _("Warning: This will make the total amount you receive publicly visible.\n\n" - "Are you sure you want to do this?") - out = {'confirm': msg} - else: - try: - participant.update_number(number) - except ProblemChangingNumber, e: - raise Response(400, unicode(e)) - msg = _("Your account type has been changed.") - out = {'number': number, 'msg': msg} - - -[---] application/json via json_dump -out diff --git a/www/~/%username/privacy.json.spt b/www/~/%username/privacy.json.spt index 092a3d22ee..e946401f86 100644 --- a/www/~/%username/privacy.json.spt +++ b/www/~/%username/privacy.json.spt @@ -7,18 +7,15 @@ participant = get_participant(state, restrict=True) if request.method == 'POST': field = request.body.get("toggle") - if field not in ["is_searchable", "anonymous_receiving", "anonymous_giving"]: + if field not in ["is_searchable", "anonymous_giving"]: raise Response(400) - if participant.IS_PLURAL and field == "anonymous_receiving": - raise Response(403, _("Teams aren't allowed to hide their receiving amount.")) - rec = website.db.one(""" UPDATE participants SET {0}=not {0} WHERE username=%s - RETURNING {0} + RETURNING {0} """.format(field), (user.participant.username,)) assert rec is not None @@ -29,7 +26,7 @@ if request.method == 'POST': else: rec = website.db.one(""" - SELECT is_searchable, anonymous_receiving, anonymous_giving + SELECT is_searchable, anonymous_giving FROM participants WHERE username=%s """, (user.participant.username,), back_as=dict) diff --git a/www/~/%username/settings/close.spt b/www/~/%username/settings/close.spt index f4648793dc..f4d214f2e4 100644 --- a/www/~/%username/settings/close.spt +++ b/www/~/%username/settings/close.spt @@ -79,16 +79,13 @@ elif nteams == 1: href="https://github.com/gratipay/gratipay.com/issues/397">data retention policy). -
Things we clear immediately include your profile statement, the - tips you're receiving, and those you're giving. You'll also be - removed from any communities and teams you were a part of. If - you're closing a team account, all team members will be removed - from the team.
- -We specifically don't delete your past giving and - receiving history on the site, because that information also - belongs equally to other users (the ones you gave to and - received from).
+Things we clear immediately include your profile statement, + the payroll you're taking, and the payments you're giving.
+ +We specifically don't delete your past giving and + taking history on the site, because that information also belongs + equally to other users (the owners of the Teams you gave to and + took from).
After you close your account, your profile page will say, “The account owner has closed this account.”
diff --git a/www/~/%username/settings/index.html.spt b/www/~/%username/settings/index.html.spt index 18581e3e72..32c6a840a6 100644 --- a/www/~/%username/settings/index.html.spt +++ b/www/~/%username/settings/index.html.spt @@ -88,14 +88,6 @@ emails = participant.get_emails() {{ _("Hide total giving to others.") }}- {% if participant.IS_SINGULAR %} - -
- {% endif %}