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.

Sign up for GitHub

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

Two-part tariff review pages housekeeping #1050

Merged
merged 4 commits into from
May 24, 2024
Merged

Two-part tariff review pages housekeeping #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c4843f
Two-part tariff review pages housekeeping
Beckyrose200 May 23, 2024
7853d76
Add preventDoubleClick attribute to review pages
Beckyrose200 May 23, 2024
ede2c79
Remove unnecessary property from fetchReviewChargeReference
Beckyrose200 May 23, 2024
e4a43d7
Merge branch 'main' into 2pt-review-pages-housekeeping
Beckyrose200 May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/services/bill-runs/two-part-tariff/fetch-review-charge-reference.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ async function _fetchBillRun (billRunId) {
.findById(billRunId)
.select(
'id',
'fromFinancialYearEnding',
'toFinancialYearEnding')
}

Expand Down
2 changes: 1 addition & 1 deletion app/views/bill-runs/amend-adjustment-factor.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
errorMessage: error.chargeAdjustmentElement
}) }}

{{ govukButton({ text: 'Confirm' }) }}
{{ govukButton({ text: 'Confirm', preventDoubleClick: true }) }}
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/bill-runs/amend-billable-returns.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{# Hidden input for authorised volume #}
<input type="hidden" name="authorisedVolume" value="{{ authorisedQuantity }}">

{{ govukButton({ text: 'Confirm' }) }}
{{ govukButton({ text: 'Confirm', preventDoubleClick: true }) }}
</form>
</div>
{% endblock %}
3 changes: 2 additions & 1 deletion app/views/bill-runs/match-details.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
{{ govukButton({
text: "Edit the billable returns",
href: "/system/bill-runs/" + billRunId + "/review/" + licenceId + "/match-details/" + chargeElement.chargeElementId + "/amend-billable-returns",
classes: "govuk-button--secondary"
classes: "govuk-button--secondary",
preventDoubleClick: true
}) }}
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion test/services/bill-runs/two-part-tariff/amend-adjustment-factor.service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ describe('Amend Adjustment Factor Service', () => {
function _billRun () {
return {
id: 'cc4bbb18-0d6a-4254-ac2c-7409de814d7e',
fromFinancialYearEnding: 2023,
toFinancialYearEnding: 2023
}
}
Expand Down
1 change: 0 additions & 1 deletion test/services/bill-runs/two-part-tariff/charge-reference-details.service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ describe('Charge Reference Details Service', () => {
function _billRun () {
return {
id: 'cc4bbb18-0d6a-4254-ac2c-7409de814d7e',
fromFinancialYearEnding: 2023,
toFinancialYearEnding: 2023
}
}
Expand Down
1 change: 0 additions & 1 deletion test/services/bill-runs/two-part-tariff/fetch-review-charge-reference.service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ describe('Fetch Review Charge Reference service', () => {

expect(result.billRun).to.equal({
id: billRun.id,
fromFinancialYearEnding: billRun.fromFinancialYearEnding,
toFinancialYearEnding: billRun.toFinancialYearEnding
})
})
Expand Down
Loading