feat: Implementation of event invoice generation & calculation #6121

mrsaicharan1 · 2019-06-28T06:46:42Z

Short description of what this resolves:

This implements a module for event invoice where the monthly gross amount & net amount are calculated and sent to every organizer on the 1st of every month.

Changes proposed in this pull request:

Provides helper functions to show invoices on organizer dashboard
Calculates event invoice
Schedules event invoice generation job for every 1st of the month.

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/api/helpers/event_invoices.py

codecov · 2019-06-28T07:14:22Z

Codecov Report

Merging #6121 into development will decrease coverage by 0.08%.
The diff coverage is 24.13%.

@@               Coverage Diff               @@
##           development    #6121      +/-   ##
===============================================
- Coverage        66.41%   66.32%   -0.09%     
===============================================
  Files              286      286              
  Lines            14380    14408      +28     
===============================================
+ Hits              9550     9556       +6     
- Misses            4830     4852      +22

Impacted Files	Coverage Δ
app/api/helpers/storage.py	`59.29% <ø> (ø)`	⬆️
app/__init__.py	`87% <100%> (+0.07%)`	⬆️
app/models/event.py	`79.25% <16.66%> (-1.43%)`	⬇️
app/api/helpers/scheduled_jobs.py	`21.66% <22.72%> (-0.56%)`	⬇️

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 50a615f...97f4db9. Read the comment docs.

mrsaicharan1 · 2019-06-28T14:54:42Z

@uds5501 @shreyanshdwivedi Please have a look

iamareebjamal · 2019-06-28T16:09:09Z

Implement completely, you have just added helpers

mrsaicharan1 · 2019-06-28T16:12:04Z

I was waiting for the FE integration to be done so that I could test it out. Is that okay?

…

On Fri, 28 Jun 2019 at 9:39 PM, Areeb Jamal ***@***.***> wrote: Implement completely, you have just added helpers — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#6121?email_source=notifications&email_token=AGAHUW3IPRT7W2VQJWVKESLP4YZSTA5CNFSM4H4CUD72YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODY2P5IQ#issuecomment-506789538>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGAHUW5WMGPDZXB4LDHCTTDP4YZSTANCNFSM4H4CUD7Q> .

mrsaicharan1 · 2019-06-29T13:10:26Z

@iamareebjamal Is it okay if I implement the invoice generation in a follow up PR?

iamareebjamal · 2019-06-29T13:30:50Z

I don't recommend breaking up same feature into multiple PRs. 1 commit = 1 complete feature

mrsaicharan1 · 2019-06-29T14:10:54Z

Alright will do it here itself

…

On Sat, 29 Jun 2019 at 7:00 PM, Areeb Jamal ***@***.***> wrote: I don't recommend breaking up same feature into multiple PRs. 1 commit = 1 complete feature — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#6121?email_source=notifications&email_token=AGAHUW3GCERCLL4PPRWKZH3P45PY3A5CNFSM4H4CUD72YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODY3Y3GQ#issuecomment-506957210>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGAHUW65LCE2PUJFIA4FY23P45PY3ANCNFSM4H4CUD7Q> .

app/api/helpers/scheduled_jobs.py

houndci-bot · 2019-06-30T13:07:59Z

app/api/helpers/scheduled_jobs.py

+            ticket_fee_object = db.session.query(TicketFee).filter_by(currency=currency).one()
+            ticket_fee_percentage = ticket_fee_object.service_fee
+            ticket_fee_maximum = ticket_fee_object.maximum_fee
+            orders = Order.query.filter_by(event=event).all()


local variable 'orders' is assigned to but never used

houndci-bot · 2019-06-30T13:07:59Z

app/api/helpers/scheduled_jobs.py

+            currency = event.payment_currency
+            ticket_fee_object = db.session.query(TicketFee).filter_by(currency=currency).one()
+            ticket_fee_percentage = ticket_fee_object.service_fee
+            ticket_fee_maximum = ticket_fee_object.maximum_fee


local variable 'ticket_fee_maximum' is assigned to but never used

houndci-bot · 2019-06-30T13:07:59Z

app/api/helpers/scheduled_jobs.py

+        for event in events:
+            currency = event.payment_currency
+            ticket_fee_object = db.session.query(TicketFee).filter_by(currency=currency).one()
+            ticket_fee_percentage = ticket_fee_object.service_fee


local variable 'ticket_fee_percentage' is assigned to but never used

app/api/helpers/scheduled_jobs.py

houndci-bot · 2019-06-30T13:14:58Z

app/api/helpers/scheduled_jobs.py

+            ticket_fees = event.tickets_sold * ticket_fee_percentage
+            if ticket_fees > ticket_fee_maximum:
+                ticket_fees = ticket_fee_maximum
+            net_revenue = gross_revenue - ticket_fees


local variable 'net_revenue' is assigned to but never used

houndci-bot · 2019-06-30T13:14:58Z

app/api/helpers/scheduled_jobs.py

 from app.models.ticket import Ticket
-from app.models.ticket_fee import get_fee
+from app.models.ticket_fee import TicketFees, get_fee


redefinition of unused 'TicketFees' from line 19

iamareebjamal · 2019-06-30T16:58:23Z

Solve codacy issues

houndci-bot · 2019-07-01T05:43:00Z

app/api/helpers/storage.py

@@ -82,6 +82,7 @@
        'ticket_attendee': 'attendees/tickets/pdf/{identifier}',
        'order': 'orders/invoices/pdf/{identifier}',
        'tickets_all': 'orders/tickets/pdf/{identifier}'
+        'event_invoice': 'events/organizer/invoices/pdf/{identifier}'


SyntaxError: invalid syntax

app/api/helpers/scheduled_jobs.py

houndci-bot · 2019-07-01T06:08:52Z

app/api/helpers/scheduled_jobs.py

 from app.models.ticket import Ticket
-from app.models.ticket_fee import get_fee
+from app.models.ticket_fee import TicketFees, get_fee


redefinition of unused 'TicketFees' from line 22

app/__init__.py

mrsaicharan1 · 2019-07-02T03:52:25Z

@iamareebjamal @shreyanshdwivedi @uds5501 Please have a look. If this is fine, will continue to implement further sub-issues linked to this.

mrsaicharan1 · 2019-07-02T06:24:35Z

I think I need modify the query such that the ticket sales which are queried should Only be restricted to that particular month, for a monthly cycle

app/models/event.py

Implemented function for event invoice calculation Added net_revenue & gross_revenue added logic for pdf and saved to DB Scheduled job on 1st of every month Hound & codacy Changed to monthly revenue

mrsaicharan1 · 2019-07-08T04:35:58Z

@CosmicCoder96 @iamareebjamal @uds5501 @shreyanshdwivedi Please have a look as this is a requirement for #6145 to move forward.

iamareebjamal · 2019-07-08T07:37:15Z

Fixes #abc, #xyz

doesnt work in GitHub. Separate issues in separate lines

…sia#6121) Implemented function for event invoice calculation Added net_revenue & gross_revenue added logic for pdf and saved to DB Scheduled job on 1st of every month Hound & codacy Changed to monthly revenue

auto-label bot added the feature label Jun 28, 2019

houndci-bot reviewed Jun 28, 2019

View reviewed changes

mrsaicharan1 force-pushed the event-invoice-fix branch 2 times, most recently from b1ddf94 to e0fc90c Compare June 28, 2019 06:52

houndci-bot reviewed Jun 28, 2019

View reviewed changes

app/api/helpers/event_invoices.py Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the event-invoice-fix branch from e0fc90c to 6db197f Compare June 28, 2019 06:53

mrsaicharan1 changed the title ~~feat: Implemented helper functions for invoice dashboard~~ feat: Implementation of invoice generation & calculation Jun 30, 2019

mrsaicharan1 changed the title ~~feat: Implementation of invoice generation & calculation~~ [WIP]feat: Implementation of invoice generation & calculation Jun 30, 2019

auto-label bot removed the feature label Jun 30, 2019

mrsaicharan1 force-pushed the event-invoice-fix branch from 52a532e to f722bf1 Compare June 30, 2019 13:07

houndci-bot reviewed Jun 30, 2019

View reviewed changes

fossasia deleted a comment Jun 30, 2019

mrsaicharan1 force-pushed the event-invoice-fix branch from 8d8f3b0 to d2484cb Compare June 30, 2019 16:02

fossasia deleted a comment Jun 30, 2019

houndci-bot reviewed Jul 1, 2019

View reviewed changes

fossasia deleted a comment Jul 1, 2019

houndci-bot reviewed Jul 1, 2019

View reviewed changes

mrsaicharan1 force-pushed the event-invoice-fix branch from fe72503 to c1449c9 Compare July 1, 2019 06:12

fossasia deleted a comment Jul 1, 2019

mrsaicharan1 force-pushed the event-invoice-fix branch 2 times, most recently from c1ab04c to 7e8e4cf Compare July 1, 2019 06:13

mrsaicharan1 commented Jul 1, 2019

View reviewed changes

app/__init__.py Outdated Show resolved Hide resolved

mrsaicharan1 changed the title ~~[WIP]feat: Implementation of invoice generation & calculation~~ feat: Implementation of invoice generation & calculation Jul 1, 2019

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

fossasia deleted a comment Jul 1, 2019

mrsaicharan1 force-pushed the event-invoice-fix branch from 7e8e4cf to c2e3af4 Compare July 1, 2019 06:24

mrsaicharan1 changed the title ~~feat: Implementation of invoice generation & calculation~~ feat: Implementation of event invoice generation & calculation Jul 2, 2019

mrsaicharan1 force-pushed the event-invoice-fix branch from c2e3af4 to fc88657 Compare July 2, 2019 08:06

houndci-bot reviewed Jul 2, 2019

View reviewed changes

mrsaicharan1 force-pushed the event-invoice-fix branch 2 times, most recently from 7796e9f to 3b1c24b Compare July 2, 2019 08:17

houndci-bot reviewed Jul 2, 2019

View reviewed changes

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

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

mrsaicharan1 force-pushed the event-invoice-fix branch 2 times, most recently from 2dece3b to d999881 Compare July 2, 2019 08:21

Added helper functions for invoice dashboard

ab066ac

Implemented function for event invoice calculation Added net_revenue & gross_revenue added logic for pdf and saved to DB Scheduled job on 1st of every month Hound & codacy Changed to monthly revenue

mrsaicharan1 force-pushed the event-invoice-fix branch from d999881 to ab066ac Compare July 4, 2019 03:31

mrsaicharan1 mentioned this pull request Jul 5, 2019

feat: Serving event invoices through a protected route #6145

Merged

6 tasks

Merge branch 'development' into event-invoice-fix

97f4db9

iamareebjamal approved these changes Jul 8, 2019

View reviewed changes

iamareebjamal merged commit 28f9fb8 into fossasia:development Jul 8, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Implementation of event invoice generation & calculation #6121

feat: Implementation of event invoice generation & calculation #6121

mrsaicharan1 commented Jun 28, 2019 •

edited by iamareebjamal

Loading

codecov bot commented Jun 28, 2019 •

edited

Loading

mrsaicharan1 commented Jun 28, 2019

iamareebjamal commented Jun 28, 2019

mrsaicharan1 commented Jun 28, 2019 via email

mrsaicharan1 commented Jun 29, 2019

iamareebjamal commented Jun 29, 2019

mrsaicharan1 commented Jun 29, 2019 via email •

edited

Loading

houndci-bot Jun 30, 2019

houndci-bot Jun 30, 2019

houndci-bot Jun 30, 2019

houndci-bot Jun 30, 2019

houndci-bot Jun 30, 2019

iamareebjamal commented Jun 30, 2019

houndci-bot Jul 1, 2019

houndci-bot Jul 1, 2019

mrsaicharan1 commented Jul 2, 2019 •

edited

Loading

mrsaicharan1 commented Jul 2, 2019

mrsaicharan1 commented Jul 8, 2019 •

edited

Loading

iamareebjamal commented Jul 8, 2019

feat: Implementation of event invoice generation & calculation #6121

feat: Implementation of event invoice generation & calculation #6121

Conversation

mrsaicharan1 commented Jun 28, 2019 • edited by iamareebjamal Loading

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

codecov bot commented Jun 28, 2019 • edited Loading

Codecov Report

mrsaicharan1 commented Jun 28, 2019

iamareebjamal commented Jun 28, 2019

mrsaicharan1 commented Jun 28, 2019 via email

mrsaicharan1 commented Jun 29, 2019

iamareebjamal commented Jun 29, 2019

mrsaicharan1 commented Jun 29, 2019 via email • edited Loading

houndci-bot Jun 30, 2019

Choose a reason for hiding this comment

houndci-bot Jun 30, 2019

Choose a reason for hiding this comment

houndci-bot Jun 30, 2019

Choose a reason for hiding this comment

houndci-bot Jun 30, 2019

Choose a reason for hiding this comment

houndci-bot Jun 30, 2019

Choose a reason for hiding this comment

iamareebjamal commented Jun 30, 2019

houndci-bot Jul 1, 2019

Choose a reason for hiding this comment

houndci-bot Jul 1, 2019

Choose a reason for hiding this comment

mrsaicharan1 commented Jul 2, 2019 • edited Loading

mrsaicharan1 commented Jul 2, 2019

mrsaicharan1 commented Jul 8, 2019 • edited Loading

iamareebjamal commented Jul 8, 2019

mrsaicharan1 commented Jun 28, 2019 •

edited by iamareebjamal

Loading

codecov bot commented Jun 28, 2019 •

edited

Loading

mrsaicharan1 commented Jun 29, 2019 via email •

edited

Loading

mrsaicharan1 commented Jul 2, 2019 •

edited

Loading

mrsaicharan1 commented Jul 8, 2019 •

edited

Loading