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

Add 'Temporary trade' option no-returns-reason page #1223

Merged
merged 5 commits into from
Aug 1, 2024
Merged

Add 'Temporary trade' option no-returns-reason page #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3603e7
Add 'Temporary trade' option no-returns-reason page
rvsiyad Aug 1, 2024
e608825
Add 'Temporary trade' option to no returns required page
rvsiyad Aug 1, 2024
f3c58cf
Add 'Temporary trade" to static lookups
rvsiyad Aug 1, 2024
480ca96
Add 'temporary-trade' to no returns required validator
rvsiyad Aug 1, 2024
4087b85
Merge branch 'main' into add-temporary-trade-option-no-returns
rvsiyad Aug 1, 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
5 changes: 3 additions & 2 deletions app/lib/static-lookups.lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const returnRequirementReasons = {
'change-to-special-agreement': 'Change to special agreement',
'error-correction': 'Error correction',
'extension-of-licence-validity': 'Limited extension of licence validity (LEV)',
'licence-conditions-do-not-require-returns': 'Licence conditions do not require returns',
'major-change': 'Major change',
'minor-change': 'Minor change',
'name-or-address-change': 'Licence holder name or address change',
Expand All @@ -47,8 +48,8 @@ const returnRequirementReasons = {
'returns-exception': 'Returns exception',
'succession-or-transfer-of-licence': 'Succession or transfer of licence',
'succession-to-remainder-licence-or-licence-apportionment': 'Succession to remainder licence or licence apportionment',
'transfer-and-now-chargeable': 'Licence transferred and now chargeable',
'licence-conditions-do-not-require-returns': 'Licence conditions do not require returns'
'temporary-trade': 'Temporary trade',
'transfer-and-now-chargeable': 'Licence transferred and now chargeable'
}

const sources = [
Expand Down
3 changes: 2 additions & 1 deletion app/validators/return-requirements/no-returns-required.validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ const Joi = require('joi')

const VALID_VALUES = [
'abstraction-below-100-cubic-metres-per-day',
'licence-conditions-do-not-require-returns',
'returns-exception',
'licence-conditions-do-not-require-returns'
'temporary-trade'
]

/**
Expand Down
11 changes: 8 additions & 3 deletions app/views/return-requirements/no-returns-required.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,20 @@
value: 'abstraction-below-100-cubic-metres-per-day',
checked: reason == 'abstraction-below-100-cubic-metres-per-day'
},
{
text: 'Licence conditions do not require returns',
value: 'licence-conditions-do-not-require-returns',
checked: reason == 'licence-conditions-do-not-require-returns'
},
{
text: 'Returns exception',
value: 'returns-exception',
checked: reason == 'returns-exception'
},
{
text: 'Licence conditions do not require returns',
value: 'licence-conditions-do-not-require-returns',
checked: reason == 'licence-conditions-do-not-require-returns'
text: 'Temporary trade',
value: 'temporary-trade',
checked: reason == 'temporary-trade'
}
]
}) }}
Expand Down
Loading