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

Commit

Permalink
Remove "payroll" from the Python
Browse files Browse the repository at this point in the history
What remains is user-facing in the about pages, etc.
  • Loading branch information
chadwhitacre committed May 12, 2016
1 parent 810e7b1 commit 9d6a8d6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](http://img.shields.io/travis/gratipay/gratipay.com/master.svg)](https://travis-ci.org/gratipay/gratipay.com)
[![Open Bounties](https://api.bountysource.com/badge/team?team_id=423&style=bounties_received)](https://www.bountysource.com/teams/gratipay/issues)

[Gratipay](http://gratipay.com) provides payments and payroll for open work,
[Gratipay](http://gratipay.com) provides payments and payouts for open work,
in order to cultivate an economy of gratitude, generosity, and love.
If you'd like to learn more, check out <https://gratipay.com/about>.
If you'd like to contribute to Gratipay, check out <http://inside.gratipay.com>.
Expand Down
2 changes: 1 addition & 1 deletion gratipay/billing/exchanges.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def get_ready_payout_routes_by_network(db, network):
p.status_of_1_0_payout='pending-payout'
----- TODO: Include members on payroll once process_payroll is implemented
----- TODO: Include team members once process_takes is implemented
)
""", (network,))
Expand Down
4 changes: 2 additions & 2 deletions gratipay/models/participant/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Participants on Gratipay give payments and take payroll.
"""Participants on Gratipay give payments and take payouts.
"""
from __future__ import print_function, unicode_literals

Expand Down Expand Up @@ -1575,7 +1575,7 @@ def to_dict(self, details=False, inquirer=None):

# Key: taking
# Values:
# 3.00 - user takes this amount in payroll
# 3.00 - user takes this amount from teams
output['taking'] = str(self.taking)
output['ntaking_from'] = self.ntaking_from

Expand Down
2 changes: 1 addition & 1 deletion gratipay/models/participant/mixins/identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class IdentityMixin(object):
A participant may have zero or more national identities on file with
Gratipay, with at most one for any given country at any given time. When at
least one of a participant's national identities has been verified, then
they may join the payroll of one or more Teams.
they may join one or more Teams.
Since national identity information is more sensitive than other
information in our database, we encrypt it in the application layer before
Expand Down
4 changes: 2 additions & 2 deletions gratipay/models/team/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Teams on Gratipay receive payments and distribute payroll.
"""Teams on Gratipay receive payments and distribute payouts.
"""
import re
from decimal import Decimal
Expand Down Expand Up @@ -271,7 +271,7 @@ def update_receiving(self, cursor=None):
""", dict(slug=self.slug))


# This next step is easy for now since we don't have payroll.
# This next step is easy for now since we don't have payouts.
from gratipay.models.participant import Participant
Participant.from_username(self.owner).update_taking(cursor or self.db)

Expand Down

0 comments on commit 9d6a8d6

Please sign in to comment.