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

Update the two-part tariff review tables to include adjustments #942

Merged
merged 17 commits into from
Apr 26, 2024

Conversation

Beckyrose200
Copy link
Contributor

As part of the work on the two-part tariff review pages, we will be adding new links to review charge reference adjustment factors. In preparation for this change, the review tables need to be updated to add columns for these new values to be stored. We have decided that the column names for all the original values should stay as their descriptive name. Any values that get changed by a user and then persisted should have the word 'amended' in front of the column. For example, aggregate and amendedAggregate, allocated and amendedAllocated. This PR is to update the columns and to clear up previous code that isn't following this naming convention for the persisted data.

As part of the work on the two-part tariff review pages we getting ready to add new links to review and change the adjustment factors on a charge reference. In preparation for this change the review tables we currently have need to be updated to accommodate these new values. In this preparation we have decided that the column names for the original source data should stay as they are and any new values that are getting persisted should have the word 'amended' in front of the colum name. For example aggregate and amendedAggregate. This PR is for the table migrations and to clear up some previous code that used the column names the wrong way round.
@Beckyrose200 Beckyrose200 added the enhancement New feature or request label Apr 25, 2024
@Beckyrose200 Beckyrose200 self-assigned this Apr 25, 2024
@Beckyrose200 Beckyrose200 marked this pull request as ready for review April 26, 2024 13:43
Copy link
Member

@Cruikshanks Cruikshanks 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 a3570c3 into main Apr 26, 2024
6 checks passed
@Beckyrose200 Beckyrose200 deleted the update-review-two-part-tariff-tables branch April 26, 2024 14:45
jonathangoulding pushed a commit that referenced this pull request Apr 29, 2024
As part of the work on the two-part tariff review pages we getting ready to add new links to review and change the adjustment factors on a charge reference. In preparation for this change the review tables we currently have need to be updated to accommodate these new values. In this preparation we have decided that the column names for the original source data should stay as they are and any new values that are getting persisted should have the word 'amended' in front of the colum name. For example aggregate and amendedAggregate. This PR is for the table migrations and to clear up some previous code that used the column names the wrong way round.
Beckyrose200 added a commit that referenced this pull request May 1, 2024
During testing it was noted that the amended billable returns banner broke during a previous PR (#942). It is currently always being displayed. This is because it displays the banner if the amended volume doesn't equal the source volume and since the 'calculated' column no longer exists in the db it therefore never equals each other. This change is to fix the banner to display it only when there is a change to the amended amount.
Beckyrose200 added a commit that referenced this pull request May 1, 2024
During testing it was noted that the amended billable returns banner broke during a previous PR (#942). It is currently always being displayed. This is because it displays the banner if the amended volume doesn't equal the source volume and since the 'calculated' column no longer exists in the db it therefore never equals each other. This change is to fix the banner to display it only when there is a change to the amended amount.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants