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

Add pre sroc returns flagging to service #1335

Merged
merged 9 commits into from
Sep 24, 2024

Conversation

Beckyrose200
Copy link
Contributor

https://eaflood.atlassian.net/browse/WATER-4199
https://eaflood.atlassian.net/browse/WATER-4676

During testing for the first ticket, it was discovered that editing a return on a licence and then flagging that licence for supplementary billing, was always flagging the licence for pre-sroc supplementary billing even when the years were for sroc.

After discussions it was determined that editing a return should only be able to add a flag on a licence for either pre-sroc billing OR two-part tariff supplementary billing.
This is because regular sroc supplementary billing doesn't look at the returns, so editing a return won't change anything on the bill run.
This PR adds an additional check on the determine-return-log-years service to check if the return has a start date before the SROC start date. If it does we add the flag on the licence for pre-sroc supplementary billing.

https://eaflood.atlassian.net/browse/WATER-4199
https://eaflood.atlassian.net/browse/WATER-4676

During testing for the first ticket, it was discovered that editing a return on a licence and then flagging that licence for supplementary billing, was always flagging the licence for pre-sroc supplementary billing even when the years where for sroc. After discussions it was determine that editing a return should only be able to add a flag on a licence for either pre sroc billing OR two-part tariff supplementary billing. This is because regular sroc supplementary billing doesn't look at the returns, and so editing a return won't change anything on the bill run. This PR adds an addition check on the determine-return-log-years service to check if the return has a start date before the SROC start date. If it does then we add the flag on the licence for pre sroc supplementary billing.
@Beckyrose200 Beckyrose200 self-assigned this Sep 16, 2024
@Beckyrose200 Beckyrose200 added the bug Something isn't working label Sep 16, 2024
@Beckyrose200 Beckyrose200 marked this pull request as ready for review September 17, 2024 09:28
Copy link
Contributor

@Jozzey Jozzey left a comment

Choose a reason for hiding this comment

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

@Beckyrose200 Beckyrose200 merged commit 1c3ba4b into main Sep 24, 2024
6 checks passed
@Beckyrose200 Beckyrose200 deleted the flagging-returns-for-supp-billing branch September 24, 2024 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants