feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

Anupam-dagar · 2019-06-27T20:17:13Z

Reference: #3173

Short description of what this resolves:

Currently there is no event date in the table of fees in admin sales section. This PR adds an event date to the table of fees in admin sales section. Also the Fees is renamed to Revenue.

Changes proposed in this pull request:

Rename Fees to Revenue.
Fetch events model along with admin-sales-fee model.
Sort both models by name so that while adding event date for an event in admin-sales-fee, mismatch of event isn't there.
Add aftermodel to add event date to admin-sales-fee model.
Make relevant changes in the frontend.

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the Upstream development branch.
The acceptance, integration, unit tests and linter 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)

Screenshots

niranjan94 · 2019-06-28T09:29:39Z

app/routes/admin/sales/fees.js


 export default Route.extend({
  titleToken() {
-    return this.l10n.t('Fees');
+    return this.l10n.t('Revenue');


The route name also should chan ge

niranjan94 · 2019-06-28T09:29:50Z

app/routes/admin/sales/fees.js

  },

  model() {
-    return this.store.findAll('admin-sales-fee');
+    return RSVP.hash({


Use async-await instead of RSVP.hash

niranjan94 · 2019-06-28T09:30:09Z

app/routes/admin/sales/fees.js

+  },
+
+  afterModel(model) {
+    model.orders.forEach((data, index) => data.set('eventDate', model.events[index].startsAtDate));


Do this in model

niranjan94 · 2019-06-28T09:30:17Z

app/routes/admin/sales/fees.js

+    model.orders.forEach((data, index) => data.set('eventDate', model.events[index].startsAtDate));
+  },
+
+  setupController(controller, model) {


Do not do this.

Anupam-dagar · 2019-06-28T19:12:41Z

@niranjan94 This is ready for another review.

niranjan94 · 2019-06-29T11:41:43Z

app/routes/admin/sales/revenue.js

+  async model() {
+    let orders = await this.store.findAll('admin-sales-fee', { reload: true }).then(orders => orders.sortBy('name'));
+    let events = await this.store.findAll('event', { reload: true }).then(events => events.sortBy('name'));
+    orders.forEach((data, index) => data.set('eventDate', events[index].startsAtDate));


Please do not assume the indexes of both orders and events match. (ie) for example, do not assume orders[0] matches with events[0]

I actually assumed it on the basis that I sorted them on the basis of name. I guess name in orders and events are event name only, right? I wasn't able to find another way to get event date as their is no relation to event in orders model. Maybe we can discuss this in tomorrow's meeting.

Anupam-dagar · 2019-07-02T20:12:37Z

This PR has now a dependency on corresponding server PR fossasia/open-event-server#6135

Reference: fossasia#3173

… RSVP.hash

abhinavk96 · 2019-07-03T04:33:02Z

app/routes/admin/sales/revenue.js

  },

-  model() {
+  async model() {
    return this.store.findAll('admin-sales-fee');


not required here, if you are not using await.

niranjan94 · 2019-07-03T09:35:35Z

app/routes/admin/sales/revenue.js

  },

-  model() {
+  async model() {


async not needed

shreyanshdwivedi · 2019-07-03T10:00:53Z

app/models/admin-sales-fee.js

@@ -1,11 +1,13 @@
 import attr from 'ember-data/attr';
 import ModelBase from 'open-event-frontend/models/base';
+import moment from 'moment';


Never used. Please remove this as travis is failing due to this

Anupam-dagar · 2019-07-03T20:12:29Z

This PR is ready for another review.

abhinavk96

Has the field already been added on server?

Anupam-dagar · 2019-07-05T03:38:20Z

@CosmicCoder96 yes the server PR is merged.

mrsaicharan1

Looks good.

Anupam-dagar · 2019-07-06T19:06:02Z

can we merge this?

Anupam-dagar changed the title ~~enh: Rename Fees to Revenue and add Event Date in Admin Sales Fees.~~ feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. Jun 27, 2019

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

niranjan94 suggested changes Jun 28, 2019

View reviewed changes

niranjan94 suggested changes Jun 29, 2019

View reviewed changes

Anupam-dagar force-pushed the revenue branch from 0c33109 to 23d2003 Compare July 2, 2019 20:10

Anupam-dagar added 3 commits July 3, 2019 07:07

enh: Rename Fees to Revenue and add Event Date in Admin Sales Fees.

59d61c0

Reference: fossasia#3173

Change route name from fees to revenue and use async-await instead of…

7722474

… RSVP.hash

change frontend as per server change.

23d2003

abhinavk96 suggested changes Jul 3, 2019

View reviewed changes

niranjan94 suggested changes Jul 3, 2019

View reviewed changes

app/routes/admin/sales/revenue.js Outdated

},

model() {

async model() {

Copy link

Member

niranjan94 Jul 3, 2019

Choose a reason for hiding this comment

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

async not needed

shreyanshdwivedi reviewed Jul 3, 2019

View reviewed changes

remove async from model and unused moment import.

ff15196

abhinavk96 reviewed Jul 4, 2019

View reviewed changes

Merge branch 'development' into revenue

ef9a5af

mariobehling requested a review from uds5501 July 5, 2019 08:34

mrsaicharan1 approved these changes Jul 5, 2019

View reviewed changes

shreyanshdwivedi approved these changes Jul 5, 2019

View reviewed changes

uds5501 approved these changes Jul 5, 2019

View reviewed changes

Merge branch 'development' into revenue

8aea93c

prateekj117 approved these changes Jul 6, 2019

View reviewed changes

niranjan94 requested a review from abhinavk96 July 6, 2019 09:52

abhinavk96 approved these changes Jul 6, 2019

View reviewed changes

Merge branch 'development' into revenue

e561242

abhinavk96 merged commit f29899b into fossasia:development Jul 6, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

Anupam-dagar commented Jun 27, 2019

niranjan94 Jun 28, 2019

niranjan94 Jun 28, 2019

niranjan94 Jun 28, 2019

niranjan94 Jun 28, 2019

Anupam-dagar commented Jun 28, 2019

niranjan94 Jun 29, 2019

Anupam-dagar Jun 29, 2019

Anupam-dagar commented Jul 2, 2019

abhinavk96 Jul 3, 2019

niranjan94 Jul 3, 2019

shreyanshdwivedi Jul 3, 2019

Anupam-dagar commented Jul 3, 2019

abhinavk96 left a comment

Anupam-dagar commented Jul 5, 2019

mrsaicharan1 left a comment

Anupam-dagar commented Jul 6, 2019

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

feat: Rename Fees to Revenue and add Event Date in Admin Sales Fees. #3211

Conversation

Anupam-dagar commented Jun 27, 2019

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

Screenshots

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anupam-dagar commented Jun 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anupam-dagar commented Jul 2, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anupam-dagar commented Jul 3, 2019

abhinavk96 left a comment

Choose a reason for hiding this comment

Anupam-dagar commented Jul 5, 2019

mrsaicharan1 left a comment

Choose a reason for hiding this comment

Anupam-dagar commented Jul 6, 2019