-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feature - billing #145
Feature - billing #145
Conversation
joefitter
commented
Dec 30, 2019
- Added asru routes for updating billing and loading billing history
13a12dc
to
7ac4336
Compare
Billing notes: External External admin users have a licence-fees page accessed from the dashboard where they can see fees for current year. PILs include revoked and transfers that happened in that year, figures reflect this but we should add a lot of test coverage around this. Fees and dates are defined here: https://github.com/UKHomeOffice/asl-pages/pull/653/files#diff-d249ae431a0871ff9768ad3dac381134R1-R28 - this should be checked to make sure the figures are correct, also it will need a new entry adding for 2020 financial year. Previous years can be accessed (if defined in config file above), if year is not found it will default to 2019. Internal As above, but non-transferred licences have a billing property which can be changed by asru users by expanding the column and adding a comment. History of billable changes are shown if present - these are taken from workflow using model-tasks with new filters (action and status) - this method works fine for current financial year, but we perhaps need to look at how to filter billable licences for previous years. Currently billable is a default true boolean on the model, we may need to make a join table similar to pil transfers? internal all licences All licence fees accessed through footer link, includes similar overview to above but for all establishments, also includes transferred licences twice (if still billable) as I remember this being a requirement (to and from establishment both billed in transfer year) All personal licences tab - only includes active licences, transferred licences are not doubled up, they probably should show twice for the from and to establishment but I couldn't work out the join magic required. To do
To merge
|
91e96d7
to
20565fa
Compare
20565fa
to
f7c16ec
Compare
Now WIP until UKHomeOffice/asl-components#101 and UKHomeOffice/asl-pages#665 |
8e74fc3
to
444d45e
Compare
* Added asru routes for updating billing and loading billing history
* Added overview for all licences * Added establishment overview * Added personal overview
… - this should probably be added with signposting
44319db
to
b71a9b9
Compare
package.json
Outdated
@@ -13,8 +13,7 @@ | |||
"build": "npm run build:js && npm run build:css", | |||
"build:js": "node --max_old_space_size=4096 node_modules/.bin/webpack", | |||
"prebuild:css": "mkdir -p ./public/css", | |||
"build:css": "npm-sass ./assets/sass/app.scss > ./public/css/app.css", | |||
"postinstall": "npm run build" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this redundant / deprecated?
endDate, | ||
year: req.year | ||
}; | ||
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.then({ json: { meta, data }} => {
res.locals.static.fees = {
...pick(meta, ['startDate', 'endDate']),
...pick(data, ['fees', 'personal', 'establishment', 'total']),
numPils: data.numberOfPils,
numPels: data.numberOfPels,
year: req.year
};
})
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WHO ARE YOU AND WHAT HAVE YOU DONE WITH PHIL?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
haha trying to fill in for @joefitter
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Too far. Too. Far.