Skip to content

fix: Added factories & billing model additions #6130

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
merged 1 commit into from
Jul 4, 2019
Merged

fix: Added factories & billing model additions #6130

merged 1 commit into from
Jul 4, 2019

Conversation

@mrsaicharan1
Copy link
Member

@mrsaicharan1 mrsaicharan1 commented Jul 1, 2019 •
edited
Loading

Fixes #6127

ref: fossasia/open-event-frontend#3152

Short description of what this resolves:

  • Added factories for admin billing details
  • Added invoice_sending_day & invoice_sending_timezone

A field is required billing_state as well
ref: fossasia/open-event-frontend#3215 (review)

  • admin_billing_state for admin billing details(to pay event invoice)
  • biling_state for user billing details(to pay event invoice)

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.

houndci-bot
houndci-bot reviewed Jul 1, 2019
View reviewed changes
app/api/schema/settings.py
smtp_encryption = fields.Str(allow_none=True) # Can be tls, ssl, none


# Event Invoices settings
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

too many blank lines (2)

@auto-label auto-label bot added the fix label Jul 1, 2019
@fossasia fossasia deleted a comment Jul 1, 2019
@fossasia fossasia deleted a comment Jul 1, 2019
@mrsaicharan1 mrsaicharan1 changed the title fix: Invoices sent out & timezone additions [WIP]fix: Invoices sent out & timezone additions Jul 1, 2019
@auto-label auto-label bot removed the fix label Jul 1, 2019
@fossasia fossasia deleted a comment Jul 2, 2019
@mrsaicharan1 mrsaicharan1 force-pushed the invoice-fields-add branch 2 times, most recently from 56c6cb5 to 4c9c2fe Compare July 2, 2019 06:02
@fossasia fossasia deleted a comment Jul 2, 2019
@fossasia fossasia deleted a comment Jul 2, 2019
@codecov
Copy link

codecov bot commented Jul 2, 2019 •
edited
Loading

Codecov Report

Merging #6130 into development will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           development    #6130      +/-   ##
===============================================
+ Coverage        66.38%   66.41%   +0.02%     
===============================================
  Files              286      286              
  Lines            14369    14380      +11     
===============================================
+ Hits              9539     9550      +11     
  Misses            4830     4830
Impacted Files Coverage Δ
app/models/setting.py 90.65% <100%> (+0.31%) ⬆️
app/models/user.py 57.24% <100%> (+0.15%) ⬆️
app/api/schema/settings.py 100% <100%> (ø) ⬆️
app/api/schema/users.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 c08b22b...79d85c2. Read the comment docs.

@mrsaicharan1 mrsaicharan1 changed the title [WIP]fix: Invoices sent out & timezone additions fix: Invoices sent out & timezone additions Jul 2, 2019
@auto-label auto-label bot added the fix label Jul 2, 2019
@mrsaicharan1 mrsaicharan1 changed the title fix: Invoices sent out & timezone additions [WIP]fix: Invoices sent out & timezone additions Jul 2, 2019
@auto-label auto-label bot removed the fix label Jul 2, 2019
@fossasia fossasia deleted a comment Jul 2, 2019
@fossasia fossasia deleted a comment Jul 2, 2019
houndci-bot
houndci-bot reviewed Jul 2, 2019
View reviewed changes
@mrsaicharan1 mrsaicharan1 changed the title [WIP]fix: Invoices sent out & timezone additions [WIP]fix: Added factories & billing model additions Jul 2, 2019
@mrsaicharan1 mrsaicharan1 force-pushed the invoice-fields-add branch 2 times, most recently from 7cd7238 to beb9e82 Compare July 2, 2019 07:32
@mrsaicharan1 mrsaicharan1 changed the title [WIP]fix: Added factories & billing model additions fix: Added factories & billing model additions Jul 2, 2019
@auto-label auto-label bot added the fix label Jul 2, 2019
@mrsaicharan1 mrsaicharan1 mentioned this pull request Jul 2, 2019
Merged
5 tasks
iamareebjamal
iamareebjamal reviewed Jul 2, 2019
View reviewed changes
@mrsaicharan1
Copy link
Member Author

@uds5501 @shreyanshdwivedi Please have a look here too.

@mrsaicharan1 mrsaicharan1 mentioned this pull request Jul 3, 2019
Merged
5 tasks
@mrsaicharan1 mrsaicharan1 force-pushed the invoice-fields-add branch 5 times, most recently from 67d42ef to 3ad3cc2 Compare July 3, 2019 13:54
iamareebjamal
iamareebjamal reviewed Jul 3, 2019
View reviewed changes
iamareebjamal
iamareebjamal reviewed Jul 3, 2019
View reviewed changes
@mrsaicharan1
Copy link
Member Author

@iamareebjamal @shreyanshdwivedi @uds5501 Please review.

iamareebjamal
iamareebjamal previously approved these changes Jul 3, 2019
View reviewed changes
prateekj117
prateekj117 previously approved these changes Jul 4, 2019
View reviewed changes
@mrsaicharan1
Copy link
Member Author

mrsaicharan1 commented Jul 4, 2019 •
edited
Loading

@iamareebjamal Please merge this as this is a blocker for fossasia/open-event-frontend#3152. Updated with the latest migration too.

@mrsaicharan1 mrsaicharan1 dismissed stale reviews from prateekj117 and iamareebjamal via 6978951 July 4, 2019 04:45
@mrsaicharan1
Added fields for invoice and timezone
79d85c2 
Model additions for timezone & invoices sent out

invoices timezone change

Updated latest migration

Added factories
@iamareebjamal iamareebjamal merged commit 0ed9886 into fossasia:development Jul 4, 2019
iamareebjamal pushed a commit to iamareebjamal/open-event-server that referenced this pull request Aug 2, 2019
@mrsaicharan1 @iamareebjamal
fix: Added fields for invoice and timezone (fossasia#6130)
b757027
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iamareebjamal iamareebjamal iamareebjamal approved these changes

+2 more reviewers

@houndci-bot houndci-bot houndci-bot left review comments

@prateekj117 prateekj117 prateekj117 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

fix

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Additional fields required for timezone & invoice sent out date

4 participants

@mrsaicharan1 @iamareebjamal @houndci-bot @prateekj117