Skip to content

Payment stuff #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
tsnoam merged 22 commits into from
Jun 2, 2017
Merged

Payment stuff #622

tsnoam merged 22 commits into from
Jun 2, 2017

Conversation

@jsmnbom
Copy link
Member

@jsmnbom jsmnbom commented May 19, 2017 •
edited
Loading

Would like a paymentbot.py example script before we merge... It would also serve as a way to test everything, as we're unable to do it automatically.

#617

jsmnbom added 17 commits May 19, 2017 19:41
@jsmnbom
Add new payment classes
8e62b02 
Invoice, LabeledPrice, OrderInfo, PreCheckoutQuery, ShippingAddress, ShippingOption, ShippingQuery and SuccessfulPayment
@jsmnbom
New payment bot methods
8be5719 
sendInvoice, answerShippingQuery, and answerPreCheckoutQuery
@jsmnbom
Add pay inlinekeyboardbutton type
034bcf0
@jsmnbom
Fix docstring for Message
2929c76
@jsmnbom
Add invoice and successful_payment to Message
c78d697
@jsmnbom
Merge branch 'master' into payment
834c1ab
@jsmnbom
MessageEntity != Sticker :P
77f0688
@jsmnbom
Fix import order
b69ecc3
@jsmnbom
Pop instead of get if our name doesn't match telegrams (user/from_user)
b276b06
@jsmnbom
OrderInfo can be completely empty
402e138 
In which case it should still be an OrderInfo not None
@jsmnbom
Payment ids should be unique... probably
5f96c50
@jsmnbom
Basic tests for payment stuff
9f6ec12
@jsmnbom
Sooo apparently python 2 doesn't like ‘ (\xe2)
a97da5c
@jsmnbom
We have to send and array... that's new...
76db279
@jsmnbom
Add invoice test and there's no EUD currency, whoops
4589704
@jsmnbom
Remove extra space from payment provider token
73d75b9
@jsmnbom
Getting instead of popping
d4f2f2e 
I really think we should be popping and I'm unable to see why it makes our tests fail, but for now.. rolling back.
@jsmnbom
Copy link
Member Author

jsmnbom commented May 20, 2017

Should be good for review (only missing the example)

@jsmnbom jsmnbom changed the base branch from master to beta May 21, 2017 12:44
@jsmnbom jsmnbom changed the base branch from beta to master May 21, 2017 13:41
@jsmnbom jsmnbom mentioned this pull request May 24, 2017
Merged
tsnoam added 3 commits May 26, 2017 20:02
@tsnoam
payment: Small fixes
cd24bb4 
 - Semantic fixes bot.py (if XXX is not None: ...).
 - Documentation fixes (arguments which are optional).
@tsnoam
payment: cr fixes
c4b7867
@tsnoam
Merge remote-tracking branch 'origin/master' into payment
137ffe2
@tsnoam
Copy link
Member

tsnoam commented Jun 1, 2017

In general LGTM. The few comments I had, I just committed/pushed the fix for.
@bomjacob please take a look at my changes, make sure you're happy with them. If you're happy, Travis is happy & coverity is happy we can merge :)

p.s.
really awsome work

@jsmnbom
Copy link
Member Author

jsmnbom commented Jun 2, 2017

Looks good to me, need to merge #631 too asap

@tsnoam tsnoam self-requested a review June 2, 2017 08:12
@tsnoam tsnoam merged commit 90e9e32 into master Jun 2, 2017
@tsnoam tsnoam deleted the payment branch June 2, 2017 08:15
@github-actions github-actions bot locked and limited conversation to collaborators Aug 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@tsnoam tsnoam Awaiting requested review from tsnoam

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jsmnbom @tsnoam