Skip to content
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.

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

[Fix] Add refunds to accountant report #292

Merged
merged 3 commits into from
Apr 28, 2023

Conversation

ChinemeremChigbo
Copy link
Member

Notion ticket link

[5] Add refunds to accountant report

Implementation description

Notes

Checklist

  • My PR name is descriptive, is in imperative tense and starts with one of the following: [Feature],[Improvement] or [Fix],
  • I have run the appropriate linter(s)
  • I have requested a review from the RCD team on GitHub, or specific people who are associated with this ticket

Copy link
Member

@sherryhli sherryhli left a comment

Choose a reason for hiding this comment

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

LGTM aside from a few nits!

lib/reports/resolvers.ts Outdated Show resolved Hide resolved
paymentMethod: true,
},
});
const methodPaymentRequest = JSON.parse(JSON.stringify(paymentRequest));
Copy link
Member

Choose a reason for hiding this comment

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

  1. I might be missing something but doesn't JSON.parse(JSON.stringify(x)) == x? Is the intention to make a deep copy, in which case I'd suggest defining a deepCopy function?

  2. Nit for naming

Suggested change
const methodPaymentRequest = JSON.parse(JSON.stringify(paymentRequest));
const paymentGroupByMethodQuery = JSON.parse(JSON.stringify(paymentRequest));

lib/reports/resolvers.ts Outdated Show resolved Hide resolved
lib/reports/resolvers.ts Outdated Show resolved Hide resolved
Copy link
Member

@sherryhli sherryhli left a comment

Choose a reason for hiding this comment

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

Forgot to mention but could you please also take a look at the lint errors? 🙏

Copy link
Member

@sherryhli sherryhli left a comment

Choose a reason for hiding this comment

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

LGTM! 🚢

@ChinemeremChigbo ChinemeremChigbo merged commit e439e00 into staging Apr 28, 2023
@ChinemeremChigbo ChinemeremChigbo deleted the accountant-report-refunds branch April 28, 2023 14:40
leogjhuang added a commit that referenced this pull request Apr 29, 2023
* [Fix] Change renewal report to most recent expiring permits (#293)
* [Feature] Allow processing fee field to be manually edited (#291)
* [Fix] Fix the GraphQL delete employee mutation (#286)
* [Fix] Add refunds to accountant report (#292)
* Add note field for permit holder’s old user ID (#290)
* Update User ID copy (#289)
* [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285)
* Update README (#284)
* Fix time zone bug in requests header (#281)
* [Fix] Fix time zone for requests and reports (#278)
* [Chore] Add BSF contributors to employee database (#277)
* [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276)
* [Docs] BSF CONTRIBUTING.md (#275)
@leogjhuang leogjhuang mentioned this pull request Apr 29, 2023
3 tasks
leogjhuang pushed a commit that referenced this pull request Apr 29, 2023
* Add refunds to accountant report

* Fix yarn lint commands

* Fix typing errors for resolver queries
leogjhuang added a commit that referenced this pull request Apr 29, 2023
* [Release] Version 0.0.7

* [Fix] Change renewal report to most recent expiring permits (#293)
* [Feature] Allow processing fee field to be manually edited (#291)
* [Fix] Fix the GraphQL delete employee mutation (#286)
* [Fix] Add refunds to accountant report (#292)
* Add note field for permit holder’s old user ID (#290)
* Update User ID copy (#289)
* [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285)
* Update README (#284)
* Fix time zone bug in requests header (#281)
* [Fix] Fix time zone for requests and reports (#278)
* [Chore] Add BSF contributors to employee database (#277)
* [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276)
* [Docs] BSF CONTRIBUTING.md (#275)

* Revert "[Release] Version 0.0.7"

This reverts commit e73b435.

* [Docs] BSF CONTRIBUTING.md (#275)

* [Docs] Adding BSF CONTRIBUTING.md

* Small fixes to CONTRIBUTING.md

Co-authored-by: oustan10 <oustan10@gmail.com>

* [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276)

* [Chore] Add BSF contributors to employee database (#277)

* [Fix] Fix time zone for requests and reports (#278)

* [Fix] Fix time zone for requests and reports

* Add local time zone formatter function

* Fix time zone bug in requests header (#281)

* Update README (#284)

Update the readme with instructions for running the application locally
and seeding a self-hosted Postgres database.

* [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285)

* Update User ID copy (#289)

* Add note field for permit holder’s old user ID (#290)

* [Fix] Add refunds to accountant report (#292)

* Add refunds to accountant report

* Fix yarn lint commands

* Fix typing errors for resolver queries

* [Fix] Fix the GraphQL delete employee mutation (#286)

* [Feature] Allow processing fee field to be manually edited (#291)

* [Fix] Change renewal report to most recent expiring permits (#293)

---------

Co-authored-by: Aaron Abraham <aaronabraham311@gmail.com>
Co-authored-by: oustan10 <oustan10@gmail.com>
Co-authored-by: Sherry Li <sherryhli@users.noreply.github.com>
Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com>
leogjhuang added a commit that referenced this pull request Apr 29, 2023
* [Fix] Change renewal report to most recent expiring permits (#293)
* [Feature] Allow processing fee field to be manually edited (#291)
* [Fix] Fix the GraphQL delete employee mutation (#286)
* [Fix] Add refunds to accountant report (#292)
* Add note field for permit holder’s old user ID (#290)
* Update User ID copy (#289)
* [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285)
* Update README (#284)
* Fix time zone bug in requests header (#281)
* [Fix] Fix time zone for requests and reports (#278)
* [Chore] Add BSF contributors to employee database (#277)
* [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276)
* [Docs] BSF CONTRIBUTING.md (#275)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants