feat: Model additions for payTM integration #6249

mrsaicharan1 · 2019-07-29T11:05:11Z

Short description of what this resolves:

PayTM uses a merchant key & a secret key to authorize payments. These will be used in the follow-up PRs for the integration of the payment gateway.

Changes proposed in this pull request:

Model & schema additions PayTM
Added hybrid properties to check for activation

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

app/models/setting.py

app/api/schema/orders.py

codecov · 2019-07-29T13:22:06Z

Codecov Report

Merging #6249 into development will increase coverage by 0.04%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           development    #6249      +/-   ##
===============================================
+ Coverage        65.24%   65.28%   +0.04%     
===============================================
  Files              287      287              
  Lines            14731    14749      +18     
===============================================
+ Hits              9611     9629      +18     
  Misses            5120     5120

Impacted Files	Coverage Δ
app/models/setting.py	`91.41% <100%> (+0.55%)`	⬆️
app/api/schema/settings.py	`100% <100%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b4ba3a...3d54758. Read the comment docs.

app/api/schema/settings.py

app/models/setting.py

mrsaicharan1 · 2019-08-09T12:30:58Z

@iamareebjamal @uds5501 @shreyanshdwivedi Please have a look

app/api/schema/stripe_authorization.py

app/models/setting.py

app/api/schema/settings.py

houndci-bot · 2019-08-09T14:17:17Z

app/api/schema/settings.py


+<<<<<<< Updated upstream
+=======
+    # payTM credentials


unexpected indentation (comment)

app/api/schema/settings.py

app/models/setting.py

app/api/schema/settings.py

app/models/setting.py

mrsaicharan1 · 2019-08-10T08:58:47Z

SAWarning: Attribute 'is_paytm_activated' on class <class 'app.models.setting.Setting'> appears to be a non-schema 'sqlalchemy.sql.column()' object; this won't be part of the declarative mapping
  % (key, cls)

@kushthedude @iamareebjamal I'm getting this warning when I restart the server. Aren't the model and schema fields present here?

mrsaicharan1 · 2019-08-10T09:18:26Z

SAWarning: Attribute 'is_paytm_activated' on class <class 'app.models.setting.Setting'> appears to be a non-schema 'sqlalchemy.sql.column()' object; this won't be part of the declarative mapping
  % (key, cls)
@kushthedude @iamareebjamal I'm getting this warning when I restart the server. Aren't the model and schema fields present here?

Fixed

app/models/setting.py

kushthedude

LGTM !

shreyanshdwivedi

LGTM 👍

mrsaicharan1 · 2019-08-10T10:47:34Z

Travis wasn't able to start. I've rebased and pushed once again. Please review. @kushthedude @uds5501 @shreyanshdwivedi

uds5501

LGTM

houndci-bot reviewed Jul 29, 2019

View reviewed changes

app/models/setting.py Outdated Show resolved Hide resolved

app/api/schema/orders.py Outdated Show resolved Hide resolved

auto-label bot added the feature label Jul 29, 2019

mrsaicharan1 force-pushed the paytm-fields branch 2 times, most recently from d1e0e66 to 66171b7 Compare July 29, 2019 13:00

kushthedude reviewed Jul 29, 2019

View reviewed changes

app/api/schema/settings.py Outdated Show resolved Hide resolved

app/models/setting.py Outdated Show resolved Hide resolved

app/models/setting.py Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the paytm-fields branch 4 times, most recently from 28fe009 to eaeed38 Compare July 30, 2019 04:08

mrsaicharan1 force-pushed the paytm-fields branch from e4b3ec8 to 4028bde Compare August 9, 2019 14:14

houndci-bot reviewed Aug 9, 2019

View reviewed changes

app/api/schema/stripe_authorization.py Show resolved Hide resolved

mrsaicharan1 force-pushed the paytm-fields branch from 4028bde to e877a63 Compare August 9, 2019 14:17

houndci-bot reviewed Aug 9, 2019

View reviewed changes

mrsaicharan1 force-pushed the paytm-fields branch 4 times, most recently from ccbc09b to 7f7c82c Compare August 10, 2019 06:36

mrsaicharan1 changed the title ~~feat: Model additons & hybrid methods for payTM~~ feat: Model additions for payTM integration Aug 10, 2019

mrsaicharan1 force-pushed the paytm-fields branch 5 times, most recently from e69d5c8 to 6d8c3ee Compare August 10, 2019 08:35

kushthedude reviewed Aug 10, 2019

View reviewed changes

app/models/setting.py Outdated Show resolved Hide resolved

kushthedude reviewed Aug 10, 2019

View reviewed changes

app/api/schema/settings.py Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the paytm-fields branch from 6d8c3ee to 5ec3dad Compare August 10, 2019 08:51

houndci-bot reviewed Aug 10, 2019

View reviewed changes

app/models/setting.py Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the paytm-fields branch from 5ec3dad to d22245d Compare August 10, 2019 08:52

fossasia deleted a comment Aug 10, 2019

mrsaicharan1 force-pushed the paytm-fields branch from ee83e35 to 507817e Compare August 10, 2019 09:17

uds5501 reviewed Aug 10, 2019

View reviewed changes

app/models/setting.py Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the paytm-fields branch from 0795fed to a629adf Compare August 10, 2019 09:51

kushthedude previously approved these changes Aug 10, 2019

View reviewed changes

uds5501 previously approved these changes Aug 10, 2019

View reviewed changes

shreyanshdwivedi previously approved these changes Aug 10, 2019

View reviewed changes

mrsaicharan1 dismissed stale reviews from shreyanshdwivedi, uds5501, and kushthedude via ebd4561 August 10, 2019 10:46

mrsaicharan1 force-pushed the paytm-fields branch from 4554bab to ebd4561 Compare August 10, 2019 10:46

mrsaicharan1 added 2 commits August 10, 2019 16:16

feat: Model Additions for PayTM integration

55dd88e

change in hybrid proprty

3d54758

mrsaicharan1 force-pushed the paytm-fields branch from ebd4561 to 3d54758 Compare August 10, 2019 10:47

uds5501 approved these changes Aug 10, 2019

View reviewed changes

kushthedude approved these changes Aug 10, 2019

View reviewed changes

iamareebjamal merged commit c1148bd into fossasia:development Aug 10, 2019

uds5501 mentioned this pull request Aug 10, 2019

feat: add paytm credentials and setup in admin/settings fossasia/open-event-frontend#3371

Merged

5 tasks

feat: Model additions for payTM integration #6249

feat: Model additions for payTM integration #6249

Uh oh!

Conversation

mrsaicharan1 commented Jul 29, 2019

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mrsaicharan1 commented Aug 9, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

houndci-bot Aug 9, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mrsaicharan1 commented Aug 10, 2019

Uh oh!

mrsaicharan1 commented Aug 10, 2019

Uh oh!

Uh oh!

kushthedude left a comment

Choose a reason for hiding this comment

Uh oh!

shreyanshdwivedi left a comment

Choose a reason for hiding this comment

Uh oh!

mrsaicharan1 commented Aug 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

uds5501 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov bot commented Jul 29, 2019 •

edited

Loading

mrsaicharan1 commented Aug 10, 2019 •

edited

Loading