fix: Restructure Account Invoice Tab #5049

maze-runnar · 2020-09-11T04:59:42Z

Change main tab name from "Billing Info" to "Billing"
initial frontend change On Invoice Page implement filters: Unpaid, Overdue, Paid, Failed, Refunding, Refunded
Add a column "Date" after "Event Name"

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)

vercel · 2020-09-11T04:59:51Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/p06ute571
✅ Preview: https://open-event-frontend-git-fork-maze-runnar-invoice.eventyay.vercel.app

iamareebjamal · 2020-09-11T05:09:21Z

app/controllers/account/billing/invoices/list.js

+          cellComponent   : 'ui-table/cell/events/cell-action'
+        }
+
+      ];


I don't understand. It's the exact same code. Why are there else if statements everywhere?

I don't understand. It's the exact same code. Why are there else if statements everywhere?

it will be changed, I don't know what would be the exact column name. Not mentioned in issue.

iamareebjamal · 2020-09-11T05:12:08Z

Are these statuses present in the server?

maze-runnar · 2020-09-11T05:13:43Z

created a PR, but only added option in status like status = fields.Str(validate=validate.OneOf(choices=["paid", "due", "refunding", "refunded", "unpaid"]), allow_none=True)

fossasia/open-event-server#7260

codecov · 2020-09-11T05:14:14Z

Codecov Report

Merging #5049 into development will increase coverage by 0.16%.
The diff coverage is 30.00%.

@@               Coverage Diff               @@
##           development    #5049      +/-   ##
===============================================
+ Coverage        22.68%   22.85%   +0.16%     
===============================================
  Files              488      489       +1     
  Lines             5183     5177       -6     
  Branches            21       35      +14     
===============================================
+ Hits              1176     1183       +7     
+ Misses            4003     3989      -14     
- Partials             4        5       +1

Impacted Files	Coverage Δ
app/controllers/account/billing/invoices/list.js	`0.00% <0.00%> (ø)`
app/models/user.js	`0.00% <ø> (ø)`
app/routes/account/billing/invoices/list.js	`58.82% <50.00%> (+5.88%)`	⬆️
app/controllers/application.js	`46.15% <0.00%> (-53.85%)`	⬇️
app/components/public/session-item.js	`22.22% <0.00%> (-17.78%)`	⬇️
app/components/forms/wizard/basic-details-step.js	`18.98% <0.00%> (-2.54%)`	⬇️
app/mixins/event-wizard.js	`1.05% <0.00%> (ø)`
app/controllers/events/view.js	`0.00% <0.00%> (ø)`
app/routes/public/session/view.js	`0.00% <0.00%> (ø)`
app/components/forms/wizard/attendee-step.js	`0.00% <0.00%> (ø)`
... and 7 more

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 194b6e9...46d819e. Read the comment docs.

maze-runnar · 2020-09-11T06:16:07Z

What's next in this issue, how to proceed?

iamareebjamal · 2020-09-11T06:22:44Z

Please remove unpaid and overdue status

maze-runnar · 2020-09-11T06:23:28Z

ok

maze-runnar · 2020-09-11T06:24:10Z

i haven't added overdue status

iamareebjamal · 2020-09-11T06:28:25Z

From server as well please

iamareebjamal · 2020-09-11T06:29:06Z

Then you need to make some dummy event invoices in the DB and check that they show up in the frontend under proper tabs

maze-runnar · 2020-09-11T06:29:36Z

From server as well please

Done

maze-runnar · 2020-09-11T06:29:48Z

Then you need to make some dummy event invoices in the DB and check that they show up in the frontend under proper tabs

ok

iamareebjamal · 2020-09-11T06:30:42Z

You can use this - http://localhost:5000/admin/eventinvoice/new/

maze-runnar · 2020-09-11T07:59:27Z

maze-runnar · 2020-09-11T09:03:02Z

In invoice # column provide the invoices as downloadable PDF

is it invoicepdfurl, which I need to add in first column?

maze-runnar · 2020-09-11T09:03:24Z

And how to do this -
For the invoice use company data provided in payment info

iamareebjamal · 2020-09-11T09:12:21Z

In invoice # column provide the invoices as downloadable PDF

is it invoicepdfurl, which I need to add in first column?

Yes

iamareebjamal · 2020-09-11T09:12:38Z

And how to do this -
For the invoice use company data provided in payment info

This will be solved in other issue

iamareebjamal · 2020-09-11T09:14:40Z

app/routes/account/billing/invoices/list.js

+      case 'refunding':
+        return this.l10n.t('Refunding');
+      case 'refunded':
+        return this.l10n.t('Refunded');


Simply use capitalize function instead of switch case. Check out admin/sessions/list route. Use All in else

iamareebjamal · 2020-09-11T09:15:02Z

app/routes/account/billing/invoices/list.js

@@ -21,7 +27,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
    this.set('params', params);
    const searchField = 'status';
    let filterOptions = [];
-    if (params.invoice_status === 'paid' || params.invoice_status === 'due') {
+    if (params.invoice_status === 'paid' || params.invoice_status === 'due' || params.invoice_status === 'refunding' || params.invoice_status === 'refunded') {


Use ['paid', ...].includes(params.invoice_status)

iamareebjamal · 2020-09-11T09:23:30Z

Also, upcoming is not a valid state

maze-runnar · 2020-09-11T09:54:38Z

Also, upcoming is not a valid state

it is calculated

iamareebjamal · 2020-09-16T12:04:40Z

Change it to invoices and then use .query('invoices', queryString)

maze-runnar · 2020-09-16T12:12:51Z

eventInvoices: this.asArray(this.authManager.currentUser.query('invoice', queryString)) invoice instead of event-invoice is working

maze-runnar · 2020-09-16T12:15:12Z

it's showing page correctly but not invoice data

maze-runnar · 2020-09-16T12:19:58Z

the page is showing correctly for the user now, accessible, not showing dummy data.Assertion Failed: Cannot call get with 'count' on an undefined object.

iamareebjamal · 2020-09-16T12:35:17Z

Check the API response in network tab

maze-runnar · 2020-09-16T12:38:50Z

NO event-envoice:

iamareebjamal · 2020-09-16T12:44:34Z

Checking

iamareebjamal · 2020-09-16T13:07:00Z

It's because of stupid ember data expecting relationship in user to be event-invoices and not event-invoice

Please create a PR on server fixing this relationship in user schema

iamareebjamal · 2020-09-16T13:14:56Z

Checked by doing that and still not working. Finding out why

iamareebjamal · 2020-09-16T15:03:58Z

It should be named eventInvoices exactly. Also changes are needed on backend. Sending a PR.

iamareebjamal · 2020-09-16T15:09:25Z

Pull the changes in fossasia/open-event-server#7270 locally and change it to eventInvoices

maze-runnar · 2020-09-16T15:20:01Z

ok

maze-runnar · 2020-09-16T16:52:22Z

not working

iamareebjamal · 2020-09-16T17:20:58Z

Show the error, not just screenshot

maze-runnar · 2020-09-17T06:10:12Z

Uncaught (in promise) Error: Assertion Failed: Cannot call get with 'count' on an undefined object.
on using -
eventInvoices: this.asArray(this.authManager.currentUser.query('invoice', queryString))

And access error when using
eventInvoices: this.asArray(this.authManager.currentUser.query('eventInvoices', queryString))

iamareebjamal · 2020-09-17T06:31:35Z

You must not have changed invoice to eventInvoices in the user model. You have to try things out first intuitively at first. I have confirmed the changes and then commented. Already tested for 2-3 hours

iamareebjamal · 2020-09-17T06:38:09Z

That's the change I was asking you to make - 3b7415d (#5049)

maze-runnar · 2020-09-17T07:38:25Z

on making all changes this.model.eventInvoices.data is giving undefined

that's why there is this error - Uncaught (in promise) Error: Assertion Failed: Cannot call get with 'count' on an undefined object

maze-runnar · 2020-09-17T07:52:18Z

{"data": [], "links": {"self": "/v1/users/1/event-invoices?include=event&filter=%5B%5D&page%5Bsize%5D=10&page%5Bnumber%5D=1"}, "meta": {"count": 0}, "jsonapi": {"version": "1.0"}}
I have added dummy invoices here http://localhost:5000/admin/eventinvoice/new/ , but data is null

iamareebjamal · 2020-09-17T09:36:04Z

Please work on other issues

maze-runnar · 2020-09-17T11:13:57Z

ok

niranjan94 · 2020-09-17T20:54:44Z

Here is an overview of what got changed by this pull request:

Complexity decreasing per file
==============================
+ app/routes/account/billing/invoices/list.js  -3

See the complete overview on Codacy

initial commit

a10f78c

vercel bot deployed to Preview September 11, 2020 04:59 View deployment

iamareebjamal reviewed Sep 11, 2020

View reviewed changes

vercel bot temporarily deployed to Preview September 11, 2020 06:25 Inactive

vercel bot temporarily deployed to Preview September 11, 2020 06:27 Inactive

vercel bot deployed to Preview September 11, 2020 06:27 View deployment

adding all status to working

9673490

vercel bot deployed to Preview September 11, 2020 07:48 View deployment

iamareebjamal reviewed Sep 11, 2020

View reviewed changes

iamareebjamal mentioned this pull request Sep 16, 2020

fix: User event invoice endpoint fossasia/open-event-server#7270

Merged

fix

3b7415d

vercel bot deployed to Preview September 17, 2020 06:37 View deployment

fix

46d819e

vercel bot deployed to Preview September 17, 2020 20:52 View deployment

iamareebjamal changed the title ~~fix: Organizer Invoice Tab~~ fix: Restructure Account Invoice Tab Sep 17, 2020

iamareebjamal merged commit 17e41ba into fossasia:development Sep 17, 2020

maze-runnar deleted the invoice branch September 18, 2020 02:53

fix: Restructure Account Invoice Tab #5049

fix: Restructure Account Invoice Tab #5049

Conversation

maze-runnar commented Sep 11, 2020 • edited Loading

Checklist

vercel bot commented Sep 11, 2020 • edited Loading

iamareebjamal Sep 11, 2020

Choose a reason for hiding this comment

maze-runnar Sep 11, 2020

Choose a reason for hiding this comment

iamareebjamal commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

codecov bot commented Sep 11, 2020 • edited Loading

Codecov Report

maze-runnar commented Sep 11, 2020 • edited Loading

iamareebjamal commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

iamareebjamal commented Sep 11, 2020

iamareebjamal commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

iamareebjamal commented Sep 11, 2020

maze-runnar commented Sep 11, 2020 • edited Loading

maze-runnar commented Sep 11, 2020

maze-runnar commented Sep 11, 2020 • edited Loading

iamareebjamal commented Sep 11, 2020

iamareebjamal commented Sep 11, 2020

iamareebjamal Sep 11, 2020

Choose a reason for hiding this comment

maze-runnar Sep 11, 2020

Choose a reason for hiding this comment

iamareebjamal Sep 11, 2020 • edited Loading

Choose a reason for hiding this comment

iamareebjamal commented Sep 11, 2020

maze-runnar commented Sep 11, 2020

iamareebjamal commented Sep 16, 2020

maze-runnar commented Sep 16, 2020

maze-runnar commented Sep 16, 2020

maze-runnar commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

maze-runnar commented Sep 16, 2020 • edited Loading

iamareebjamal commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

maze-runnar commented Sep 16, 2020

maze-runnar commented Sep 16, 2020

iamareebjamal commented Sep 16, 2020

maze-runnar commented Sep 17, 2020 • edited Loading

iamareebjamal commented Sep 17, 2020

iamareebjamal commented Sep 17, 2020 • edited Loading

maze-runnar commented Sep 17, 2020 • edited Loading

maze-runnar commented Sep 17, 2020 • edited Loading

iamareebjamal commented Sep 17, 2020

maze-runnar commented Sep 17, 2020

niranjan94 commented Sep 17, 2020

maze-runnar commented Sep 11, 2020 •

edited

Loading

vercel bot commented Sep 11, 2020 •

edited

Loading

codecov bot commented Sep 11, 2020 •

edited

Loading

maze-runnar commented Sep 11, 2020 •

edited

Loading

maze-runnar commented Sep 11, 2020 •

edited

Loading

maze-runnar commented Sep 11, 2020 •

edited

Loading

iamareebjamal Sep 11, 2020 •

edited

Loading

maze-runnar commented Sep 16, 2020 •

edited

Loading

maze-runnar commented Sep 17, 2020 •

edited

Loading

iamareebjamal commented Sep 17, 2020 •

edited

Loading

maze-runnar commented Sep 17, 2020 •

edited

Loading

maze-runnar commented Sep 17, 2020 •

edited

Loading