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

Billing Cost Modifiers #1505

Merged
merged 12 commits into from Feb 4, 2020
Merged

Conversation

@justinlevi
Copy link
Contributor

justinlevi commented Dec 19, 2019

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated.
  • Changelog entry has been written

Many billing situations arise that need to have temporary and long term modifiers applied. This is the approach to handle this.

Changelog Entry

Improvement - Add billing modifier CRUD graphql mutations/queries. ( #1396 )

Closing issues

closes #1504

@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from 8025fcd to 18573de Dec 19, 2019
@justinlevi justinlevi changed the title WIP - Billing Cost Modifiers Billing Cost Modifiers Dec 21, 2019
@wintercreative wintercreative requested a review from rocketeerbkw Dec 21, 2019
@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from c6e416f to 9ad4a90 Dec 26, 2019
services/api/src/resources/billing/helpers.ts Outdated Show resolved Hide resolved
services/api/src/resources/billing/helpers.ts Outdated Show resolved Hide resolved
services/api/src/models/billing.ts Outdated Show resolved Hide resolved
services/api/src/resources/billing/resolvers.ts Outdated Show resolved Hide resolved
services/api/src/resources/billing/resolvers.ts Outdated Show resolved Hide resolved
services/api/src/typeDefs.js Outdated Show resolved Hide resolved
services/api/src/typeDefs.js Outdated Show resolved Hide resolved
services/api/src/typeDefs.js Outdated Show resolved Hide resolved
@justinlevi

This comment has been minimized.

Copy link
Contributor Author

justinlevi commented Dec 31, 2019

@rocketeerbkw In general, I'd like to talk about the permissions for this PR as they don't really seem to fit into any of the other existing permissions situations as I see it. As far as I understand it, the modifiers should really only be readonly for anyone but the lagoon admin users. Nobody should have the ability to add/edit/delete except for whoever is in charge of the billing tools. I'm not sure we have the current scopes/roles setup for that

@justinlevi justinlevi requested a review from rocketeerbkw Jan 6, 2020
@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from a6acb58 to bb6d552 Jan 7, 2020
Copy link
Member

rocketeerbkw left a comment

Last issue is the permission stuff, like we already talked about.

services/api/src/models/billing.ts Outdated Show resolved Hide resolved
services/api/src/models/billing.ts Outdated Show resolved Hide resolved
services/api/src/resources/billing/resolvers.ts Outdated Show resolved Hide resolved
@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from 40ea037 to 3007d7a Jan 9, 2020
@justinlevi

This comment has been minimized.

Copy link
Contributor Author

justinlevi commented Jan 17, 2020

Last issue is the permission stuff, like we already talked about.

I think this is all set. @rocketeerbkw can you double check the hasPermissions in the resolvers is correctly implemented with the new billing_modifier scope/resource?

@justinlevi justinlevi requested a review from rocketeerbkw Jan 17, 2020
@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from fec85dd to 84bd03c Jan 30, 2020
@justinlevi

This comment has been minimized.

Copy link
Contributor Author

justinlevi commented Jan 30, 2020

@rocketeerbkw Can you do another look over this? I cleaned up my commit history and added in the Admin UI work.

@justinlevi justinlevi force-pushed the justinlevi:feature/billing-cost-modifiers branch from 4526d96 to ef9f17a Feb 2, 2020
@Schnitzel Schnitzel added this to the v1.3.0 milestone Feb 4, 2020
@Schnitzel Schnitzel merged commit 54bed9d into amazeeio:master Feb 4, 2020
1 check passed
1 check passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.