Skip to content

feat: add event date to response of order for admin sales revenues (formerly fees) #6135

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

Merged
merged 3 commits into from
Jul 3, 2019
Merged

feat: add event date to response of order for admin sales revenues (formerly fees) #6135

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ae79d8
feat: add event date to response of order for admin sales revenues (f…
Anupam-dagar Jul 3, 2019
1d7c982
rename event date function name.
Anupam-dagar Jul 4, 2019
f65788e
Merge branch 'development' into revenue
Anupam-dagar Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/api/admin_sales/fees.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Meta:
maximum_fee = fields.Float(attribute='maximum_fee')
revenue = fields.Method('calc_revenue')
ticket_count = fields.Method('calc_ticket_count')
event_date = fields.Method('get_eventdate')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
event_date = fields.Method('get_eventdate')
event_date = fields.Method('get_event_date')


@staticmethod
def calc_ticket_count(obj):
Expand All @@ -37,6 +38,10 @@ def calc_revenue(obj):
return sum(
[o.get_revenue() for o in obj.orders if o.status == 'completed'])

@staticmethod
def get_eventdate(obj):
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
def get_eventdate(obj):
def get_event_date(obj):

return obj.starts_at.isoformat()


class AdminSalesFeesList(ResourceList):
"""
Expand Down