don't forget takes when recomputing receiving amounts

gratipay · Jun 14, 2014 · e1bf52c · e1bf52c · chadwhitacre · Jun 17, 2014
1 parent 2b9eea3
commit e1bf52c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gittip/billing/payday.py b/gittip/billing/payday.py
@@ -391,7 +391,7 @@ def update_receiving_amounts(self):
               GROUP BY tippee;
 
             UPDATE participants
-               SET receiving = amount
+               SET receiving = (amount + takes)
               FROM total_receiving
              WHERE tippee = username;
         """

diff --git a/gittip/models/participant.py b/gittip/models/participant.py
@@ -610,15 +610,15 @@ def update_pledging(self, cursor=None):
     def update_receiving(self, cursor=None):
         receiving = (cursor or self.db).one("""
             UPDATE participants p
-               SET receiving = COALESCE((
+               SET receiving = (COALESCE((
                        SELECT sum(amount)
                          FROM current_tips
                          JOIN participants p2 ON p2.username = tipper
                         WHERE tippee = p.username
                           AND p2.is_suspicious IS NOT true
                           AND p2.last_bill_result = ''
                      GROUP BY tippee
-                   ), 0)
+                   ), 0) + takes)
              WHERE p.username = %s
          RETURNING receiving
         """, (self.username,))