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

MVJ-550 override_receivable_type in Rent (UI) #545

Merged
merged 3 commits into from
Nov 21, 2024

Conversation

juho-kettunen-nc
Copy link
Contributor

This implements the UI part of override receivable type, where it is a property of Rent, instead of ContractRent as in #544

@juho-kettunen-nc juho-kettunen-nc force-pushed the MVJ-550-override-receivable-type-rent branch from 182ceae to e0a9654 Compare November 15, 2024 15:04
@juho-kettunen-nc juho-kettunen-nc marked this pull request as ready for review November 18, 2024 13:20
@juho-kettunen-nc
Copy link
Contributor Author

Still requires customer blessing to use this Rent version instead of the ContractRent, but this is the best version of the logic we have right now.

Copy link
Contributor

@henrinie-nc henrinie-nc left a comment

Choose a reason for hiding this comment

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

This seems usable. Improvement might be to add an attribute to the service unit model to dictate whether to use override field for this service unit, so we would not need to hard code lists of ID's and define code with service unit names.

Check my comments on the changes before merging.

@juho-kettunen-nc
Copy link
Contributor Author

Added new field use_rent_override_receivable_type to the ServiceUnit model, and adjusted logic accordingly.

Input validation and tests in City-of-Helsinki/mvj@9e4c041

@henrinie-nc
Copy link
Contributor

Added new field use_rent_override_receivable_type to the ServiceUnit model, and adjusted logic accordingly.

* API [City-of-Helsinki/mvj@1277eed](https://github.com/City-of-Helsinki/mvj/commit/1277eed1f0152ecfb9f1f422d6a8a3adfeaa8355)

* UI [fb1f3f3](https://github.com/City-of-Helsinki/mvj-ui/commit/fb1f3f31c8652e6b3a050104ed07587d06e47bf3)

Input validation and tests in City-of-Helsinki/mvj@9e4c041

Looks good for the UI part!

@juho-kettunen-nc
Copy link
Contributor Author

Reminder to self: squash, or rebase locally

@juho-kettunen-nc juho-kettunen-nc force-pushed the MVJ-550-override-receivable-type-rent branch from 96e3d70 to f825671 Compare November 21, 2024 14:35
@juho-kettunen-nc juho-kettunen-nc merged commit f825671 into develop Nov 21, 2024
3 checks passed
@juho-kettunen-nc juho-kettunen-nc deleted the MVJ-550-override-receivable-type-rent branch November 21, 2024 14:45
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.

3 participants