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

stop charging failed cards #3536

Merged
merged 6 commits into from
Jun 11, 2015
Merged

stop charging failed cards #3536

merged 6 commits into from
Jun 11, 2015

Conversation

chadwhitacre
Copy link
Contributor

Closes #3531.

@chadwhitacre
Copy link
Contributor Author

I think the fix for this is actually pretty trivial, simply constraining the participants query in payday.sql with AND error = ''. We should have a test, though, and I don't see that we demonstrate the working case first yet.

@rohitpaulk rohitpaulk force-pushed the stop-charging-failed-cards branch from 9884e0d to 2172092 Compare June 11, 2015 09:57
@rohitpaulk rohitpaulk force-pushed the stop-charging-failed-cards branch from f19ea3c to 65c3e68 Compare June 11, 2015 10:07
@chadwhitacre
Copy link
Contributor Author

@rohitpaulk Looks like you accidentally committed gratipay.{js,css}, ya?

@chadwhitacre chadwhitacre mentioned this pull request Jun 11, 2015
@rohitpaulk rohitpaulk force-pushed the stop-charging-failed-cards branch from 65c3e68 to d798acd Compare June 11, 2015 15:21
@rohitpaulk
Copy link
Contributor

Ah, right. Force pushing that off...

@rohitpaulk rohitpaulk force-pushed the stop-charging-failed-cards branch from d798acd to dc65fce Compare June 11, 2015 15:21
@chadwhitacre
Copy link
Contributor Author

I'm good to merge (once Travis is green) if you're okay with 8a6f517.

@chadwhitacre
Copy link
Contributor Author

Interesting, I'm not seeing that locally.

@chadwhitacre
Copy link
Contributor Author

/me runs a full make test

@chadwhitacre
Copy link
Contributor Author

Hrm ... I now get the error Travis gets, plus a bonus error. O.O

@chadwhitacre
Copy link
Contributor Author

___________________________ TestNewTeams.test_migrate_tips_to_subscriptions ____________________________
Traceback (most recent call last):
  File "/Users/whit537/personal/gratipay/gratipay.com/tests/py/test_teams.py", line 133, in test_migrate_tips_to_subscriptions
    assert subscriptions[0].subscriber == 'alice'
AssertionError: assert 'bob' == 'alice'
  - bob
  + alice

@chadwhitacre
Copy link
Contributor Author

Gah, the Travis error is because my commit was bad, one sec ...

A little clearer and it's good to exercise the API.
@chadwhitacre chadwhitacre force-pushed the stop-charging-failed-cards branch from 8a6f517 to d863824 Compare June 11, 2015 15:48
rohitpaulk added a commit that referenced this pull request Jun 11, 2015
@rohitpaulk rohitpaulk merged commit 39ad65a into master Jun 11, 2015
@rohitpaulk rohitpaulk deleted the stop-charging-failed-cards branch June 11, 2015 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants