Highlight flagged for SROC supplementary billing #2322
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://eaflood.atlassian.net/browse/WATER-3948 We have an issue that the current `include_in_supplementary_billing` flag was added at a time there was only 1 charge scheme. A licence gets flagged irrespective of whether the change relates to PRESROC or SROC. Where that has impacted us is when sending a billing batch. When it gets sent it clears the flag for _all_ licences included. But if we cancel one, for example, the PRESROC bill run, and send the SROC one we lose which licences still need to be processed on the PRESROC one. [Our solution](DEFRA/water-abstraction-service#2077) was to add a new `include_in_sroc_supplementary_billing` flag to the `licences` table and only set it to 'true' when an SROC charge version is approved. But this means a licence might be flagged only for SROC supplementary billing and the existing functionality to highlight this only looks at the `include_in_supplementary_billing` field. This change updates the 'marked for next supplementary bill run' notice to handle - marked for next PRESROC supplementary bill run only - marked for next SROC supplementary bill run only - marked for both schemes next supplementary bill run only
We reduce the logic in the view to just be 'if thing exists show it'. TBH, that should be the limit of logic in a view. We move the logic of determining what to show into the controller by adding a new function, used to set a new property in the view data. We expand the tests to include coverage for the changes we are making.
Cruikshanks
added a commit
that referenced
this pull request
Apr 5, 2023
https://eaflood.atlassian.net/browse/WATER-3948 In [Highlight flagged for SROC supplementary billing](#2322) we made a change to the notice shown to users when a licence is flagged for supplementary billing. The first iteration of the wording was what us developers had put together based on the existing messages and changes elsewhere in the service. Our UAT team have now had a chance to look at them and asked for some tweaks.
Cruikshanks
added a commit
that referenced
this pull request
Apr 5, 2023
https://eaflood.atlassian.net/browse/WATER-3948 In [Highlight flagged for SROC supplementary billing](#2322) we made a change to the notice shown to users when a licence is flagged for supplementary billing. The first iteration of the wording was what us developers had put together based on the existing messages and changes elsewhere in the service. Our UAT team have now had a chance to look at them and asked for some tweaks. Pre-sroc (old charge scheme) needs to be > This licence has been marked for the next supplementary bill run for the old charge scheme. When a licence is flagged for both the old and new schemes > This licence has been marked for the next supplementary bill runs for the current and old charge schemes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://eaflood.atlassian.net/browse/WATER-3948
We have an issue that the current
include_in_supplementary_billingflag was added at a time there was only 1 charge scheme. A licence gets flagged irrespective of whether the change relates to PRESROC or SROC.Where that has impacted us is when sending a billing batch. When it gets sent it clears the flag for all licences included. But if we cancel one, for example, the PRESROC bill run, and send the SROC one we lose which licences still need to be processed on the PRESROC one.
Our solution was to add a new
include_in_sroc_supplementary_billingflag to thelicencestable and only set it to 'true' when an SROC charge version is approved. But this means a licence might be flagged only for SROC supplementary billing and the existing functionality to highlight this only looks at theinclude_in_supplementary_billingfield.This change updates the 'marked for next supplementary bill run' notice to handle
Examples of the updated notice