Merge pull request #4111 from gratipay/takes-masspay

Include team members in MassPay

bin/masspay.py

@@ -1,21 +1,9 @@
 #!/usr/bin/env python
 """This is a script for managing MassPay each week.
 
-Most of our payouts are handled by Balanced, but they're limited to people in
-the U.S. We need to payout to people outside the U.S. (#126), and while we work
-on a long-term solution, we are using PayPal. However, we've grown past the
-point that PayPal's Instant Transfer feature is workable. This script is for
-interfacing with PayPal's MassPay feature.
+See documentation here:
 
-This script provides for:
-
-  1. Computing an input CSV by hitting the Gratipay database directly.
-  2. Computing two output CSVs (one to upload to PayPal, the second to use for POSTing
-      the exchanges back to Gratipay)
-  3. POSTing the exchanges back to Gratipay via the HTTP API.
-
-The idea is that you run steps 1 and 2, then run through the MassPay UI on the
-PayPal website using the appropriate CSV from step 2, then run step 3.
+    http://inside.gratipay.com/howto/run-masspay
 
 """
 from __future__ import absolute_import, division, print_function, unicode_literals

gratipay/billing/exchanges.py

@@ -185,6 +185,8 @@ def get_ready_payout_routes_by_network(db, network):
           FROM participants p
           JOIN current_exchange_routes r ON p.id = r.participant
          WHERE p.balance > 0
+           AND p.claimed_time is not null
+           AND p.is_suspicious is not true
            AND r.network = %s
            AND (
 
@@ -198,12 +200,21 @@ def get_ready_payout_routes_by_network(db, network):
                  ) > 0
 
 
-                OR -- Include green-lit Gratipay 1.0 balances
+                OR -- Include team members
+
+                (SELECT count(*)
+                   FROM takes
+                   JOIN teams t ON takes.team_id = t.id
+                  WHERE takes.participant_id = p.id
+                    AND p.has_verified_identity -- XXX apply this to *everyone* we pay out to
+                    AND t.is_approved IS TRUE
+                    AND t.is_closed IS NOT TRUE
+                 ) > 0
 
-                p.status_of_1_0_payout='pending-payout'
 
+                OR -- Include green-lit Gratipay 1.0 balances
 
-                ----- TODO: Include team members once process_takes is implemented
+                p.status_of_1_0_payout='pending-payout'
 
                )
     """, (network,))

gratipay/testing/billing.py

@@ -32,8 +32,8 @@ def setUp(self):
                                           braintree_customer_id=self.obama_bt_id)
         self.obama_route = ExchangeRoute.insert(self.obama, 'braintree-cc', self.obama_cc_token)
         # A customer with Paypal attached.
-        self.homer = self.make_participant('homer', is_suspicious=False,
-                                           claimed_time='now')
+        self.homer = self.make_participant('homer', is_suspicious=False, verified_in='US',
+                                           claimed_time='now', email_address='[email protected]')
         self.homer_route = ExchangeRoute.insert(self.homer, 'paypal', '[email protected]')