2019-03-22 14:46:03 +00:00
|
|
|
from collections import OrderedDict
|
2021-11-12 18:32:35 +00:00
|
|
|
from datetime import datetime
|
2020-02-28 12:32:47 +00:00
|
|
|
from functools import partial
|
2019-03-22 14:46:03 +00:00
|
|
|
|
2023-04-28 11:08:12 -07:00
|
|
|
from flask import flash, redirect, render_template, request, url_for
|
2019-07-01 15:22:08 +01:00
|
|
|
from flask_login import current_user
|
2018-02-20 11:22:17 +00:00
|
|
|
from notifications_python_client.errors import HTTPError
|
2018-02-19 16:53:29 +00:00
|
|
|
|
2023-12-18 16:10:12 -05:00
|
|
|
from app import current_organization, org_invite_api_client, organizations_client
|
2018-02-20 11:22:17 +00:00
|
|
|
from app.main import main
|
2018-02-19 16:53:29 +00:00
|
|
|
from app.main.forms import (
|
2022-03-15 10:50:18 +00:00
|
|
|
AdminBillingDetailsForm,
|
2023-07-12 12:09:44 -04:00
|
|
|
AdminNewOrganizationForm,
|
2022-03-15 10:50:18 +00:00
|
|
|
AdminNotesForm,
|
2023-07-12 12:09:44 -04:00
|
|
|
AdminOrganizationDomainsForm,
|
2018-02-19 16:53:29 +00:00
|
|
|
InviteOrgUserForm,
|
2023-07-12 12:09:44 -04:00
|
|
|
OrganizationOrganizationTypeForm,
|
|
|
|
|
RenameOrganizationForm,
|
2019-02-19 17:26:16 +00:00
|
|
|
SearchByNameForm,
|
2018-02-20 11:22:17 +00:00
|
|
|
SearchUsersForm,
|
2018-02-19 16:53:29 +00:00
|
|
|
)
|
2020-02-28 12:32:47 +00:00
|
|
|
from app.main.views.dashboard import (
|
|
|
|
|
get_tuples_of_financial_years,
|
|
|
|
|
requested_and_current_financial_year,
|
|
|
|
|
)
|
2023-07-12 12:09:44 -04:00
|
|
|
from app.models.organization import AllOrganizations, Organization
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
from app.models.user import InvitedOrgUser, User
|
2021-11-12 18:32:35 +00:00
|
|
|
from app.utils.csv import Spreadsheet
|
2021-06-09 13:19:05 +01:00
|
|
|
from app.utils.user import user_has_permissions, user_is_platform_admin
|
2018-02-08 12:19:21 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations", methods=["GET"])
|
2018-02-27 16:45:20 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def organizations():
|
2018-02-08 12:19:21 +00:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/index.html",
|
2023-07-12 12:09:44 -04:00
|
|
|
organizations=AllOrganizations(),
|
2019-03-21 11:22:53 +00:00
|
|
|
search_form=SearchByNameForm(),
|
2018-02-08 12:19:21 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/add", methods=["GET", "POST"])
|
2018-02-27 16:45:20 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def add_organization():
|
|
|
|
|
form = AdminNewOrganizationForm()
|
2018-02-14 13:08:44 +00:00
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2021-02-11 12:02:42 +00:00
|
|
|
try:
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(
|
|
|
|
|
url_for(
|
|
|
|
|
".organization_settings",
|
|
|
|
|
org_id=Organization.create_from_form(form).id,
|
|
|
|
|
)
|
|
|
|
|
)
|
2021-02-11 12:02:42 +00:00
|
|
|
except HTTPError as e:
|
2023-08-25 09:12:23 -07:00
|
|
|
msg = "Organization name already exists"
|
2021-02-11 12:02:42 +00:00
|
|
|
if e.status_code == 400 and msg in e.message:
|
2022-12-20 09:44:33 -05:00
|
|
|
form.name.errors.append("This organization name is already in use")
|
2021-02-11 12:02:42 +00:00
|
|
|
else:
|
|
|
|
|
raise e
|
2018-02-14 13:08:44 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
return render_template("views/organizations/add-organization.html", form=form)
|
2018-02-14 13:08:44 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>", methods=["GET"])
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2023-07-12 12:09:44 -04:00
|
|
|
def organization_dashboard(org_id):
|
2020-02-28 12:32:47 +00:00
|
|
|
year, current_financial_year = requested_and_current_financial_year(request)
|
2023-08-25 09:12:23 -07:00
|
|
|
services = current_organization.services_and_usage(financial_year=year)["services"]
|
2018-02-08 16:18:18 +00:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/index.html",
|
2020-02-27 15:21:08 +00:00
|
|
|
services=services,
|
2020-02-28 12:32:47 +00:00
|
|
|
years=get_tuples_of_financial_years(
|
2023-08-25 09:12:23 -07:00
|
|
|
partial(url_for, ".organization_dashboard", org_id=current_organization.id),
|
2021-03-10 15:39:06 +00:00
|
|
|
start=current_financial_year - 2,
|
|
|
|
|
end=current_financial_year,
|
2020-02-28 12:32:47 +00:00
|
|
|
),
|
|
|
|
|
selected_year=year,
|
2020-02-28 16:14:28 +00:00
|
|
|
search_form=SearchByNameForm() if len(services) > 7 else None,
|
2020-02-27 15:21:08 +00:00
|
|
|
**{
|
2023-08-25 09:12:23 -07:00
|
|
|
f"total_{key}": sum(service[key] for service in services)
|
|
|
|
|
for key in ("emails_sent", "sms_cost")
|
2021-11-12 14:35:16 +00:00
|
|
|
},
|
|
|
|
|
download_link=url_for(
|
2023-08-25 09:12:23 -07:00
|
|
|
".download_organization_usage_report", org_id=org_id, selected_year=year
|
|
|
|
|
),
|
2018-02-08 16:18:18 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/download-usage-report.csv", methods=["GET"])
|
2021-11-12 14:35:16 +00:00
|
|
|
@user_has_permissions()
|
2023-07-12 12:09:44 -04:00
|
|
|
def download_organization_usage_report(org_id):
|
2023-08-25 09:12:23 -07:00
|
|
|
selected_year = request.args.get("selected_year")
|
2023-07-12 12:09:44 -04:00
|
|
|
services_usage = current_organization.services_and_usage(
|
2021-11-12 18:32:35 +00:00
|
|
|
financial_year=selected_year
|
2023-08-25 09:12:23 -07:00
|
|
|
)["services"]
|
2021-11-12 18:32:35 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
unit_column_names = OrderedDict(
|
|
|
|
|
[
|
|
|
|
|
("service_id", "Service ID"),
|
|
|
|
|
("service_name", "Service Name"),
|
|
|
|
|
("emails_sent", "Emails sent"),
|
|
|
|
|
("sms_remainder", "Free text message allowance remaining"),
|
|
|
|
|
]
|
|
|
|
|
)
|
2021-11-25 10:04:21 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
monetary_column_names = OrderedDict(
|
|
|
|
|
[
|
|
|
|
|
("sms_cost", "Spent on text messages ($)"),
|
|
|
|
|
]
|
|
|
|
|
)
|
2021-11-12 18:32:35 +00:00
|
|
|
|
2021-11-25 10:07:53 +00:00
|
|
|
org_usage_data = [
|
2021-11-25 10:15:50 +00:00
|
|
|
list(unit_column_names.values()) + list(monetary_column_names.values())
|
2021-11-25 10:07:53 +00:00
|
|
|
] + [
|
2023-08-25 09:12:23 -07:00
|
|
|
[service[attribute] for attribute in unit_column_names.keys()]
|
|
|
|
|
+ [
|
|
|
|
|
"{:,.2f}".format(service[attribute])
|
|
|
|
|
for attribute in monetary_column_names.keys()
|
2021-11-25 10:07:53 +00:00
|
|
|
]
|
|
|
|
|
for service in services_usage
|
|
|
|
|
]
|
2021-11-12 18:32:35 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
return (
|
|
|
|
|
Spreadsheet.from_rows(org_usage_data).as_csv_data,
|
|
|
|
|
200,
|
|
|
|
|
{
|
|
|
|
|
"Content-Type": "text/csv; charset=utf-8",
|
|
|
|
|
"Content-Disposition": (
|
|
|
|
|
"inline;"
|
|
|
|
|
'filename="{} organization usage report for year {}'
|
|
|
|
|
' - generated on {}.csv"'.format(
|
|
|
|
|
current_organization.name,
|
|
|
|
|
selected_year,
|
|
|
|
|
datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
|
|
|
|
|
)
|
|
|
|
|
),
|
|
|
|
|
},
|
|
|
|
|
)
|
2021-11-12 14:35:16 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/trial-services", methods=["GET"])
|
2019-05-21 14:56:15 +01:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def organization_trial_mode_services(org_id):
|
2019-05-21 14:56:15 +01:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/trial-mode-services.html",
|
2019-05-21 14:56:15 +01:00
|
|
|
search_form=SearchByNameForm(),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/users", methods=["GET"])
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2018-02-19 16:53:29 +00:00
|
|
|
def manage_org_users(org_id):
|
2018-02-08 12:19:21 +00:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/users/index.html",
|
2023-07-12 12:09:44 -04:00
|
|
|
users=current_organization.team_members,
|
|
|
|
|
show_search_box=(len(current_organization.team_members) > 7),
|
2018-02-19 16:53:29 +00:00
|
|
|
form=SearchUsersForm(),
|
2018-02-08 12:19:21 +00:00
|
|
|
)
|
2018-02-19 16:53:29 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/users/invite", methods=["GET", "POST"])
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2018-02-19 16:53:29 +00:00
|
|
|
def invite_org_user(org_id):
|
2023-08-25 09:12:23 -07:00
|
|
|
form = InviteOrgUserForm(inviter_email_address=current_user.email_address)
|
2018-02-19 16:53:29 +00:00
|
|
|
if form.validate_on_submit():
|
|
|
|
|
email_address = form.email_address.data
|
2023-08-25 09:12:23 -07:00
|
|
|
invited_org_user = InvitedOrgUser.create(current_user.id, org_id, email_address)
|
2018-02-19 16:53:29 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
flash(
|
|
|
|
|
"Invite sent to {}".format(invited_org_user.email_address),
|
|
|
|
|
"default_with_tick",
|
|
|
|
|
)
|
|
|
|
|
return redirect(url_for(".manage_org_users", org_id=org_id))
|
2018-02-19 16:53:29 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/users/invite-org-user.html", form=form
|
2018-02-19 16:53:29 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/users/<uuid:user_id>", methods=["GET"])
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_user(org_id, user_id):
|
2022-01-11 14:16:37 +00:00
|
|
|
# The only action that can be done to an org user is to remove them from the org.
|
|
|
|
|
# This endpoint is used to get the ID of the user to delete without passing it as a
|
|
|
|
|
# query string, but it uses the template for all org team members in order to avoid
|
|
|
|
|
# having a page containing a single link.
|
2018-02-19 16:53:29 +00:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/users/index.html",
|
2023-07-12 12:09:44 -04:00
|
|
|
users=current_organization.team_members,
|
|
|
|
|
show_search_box=(len(current_organization.team_members) > 7),
|
2022-01-11 14:16:37 +00:00
|
|
|
form=SearchUsersForm(),
|
2023-08-25 09:12:23 -07:00
|
|
|
user_to_remove=User.from_id(user_id),
|
2018-02-19 16:53:29 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route(
|
|
|
|
|
"/organizations/<uuid:org_id>/users/<uuid:user_id>/delete", methods=["POST"]
|
|
|
|
|
)
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2023-07-12 12:09:44 -04:00
|
|
|
def remove_user_from_organization(org_id, user_id):
|
|
|
|
|
organizations_client.remove_user_from_organization(org_id, user_id)
|
2018-02-19 16:53:29 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".show_accounts_or_dashboard"))
|
2018-02-19 16:53:29 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route(
|
|
|
|
|
"/organizations/<uuid:org_id>/cancel-invited-user/<uuid:invited_user_id>",
|
|
|
|
|
methods=["GET"],
|
|
|
|
|
)
|
2018-03-05 14:00:47 +00:00
|
|
|
@user_has_permissions()
|
2018-02-19 16:53:29 +00:00
|
|
|
def cancel_invited_org_user(org_id, invited_user_id):
|
2023-08-25 09:12:23 -07:00
|
|
|
org_invite_api_client.cancel_invited_user(
|
|
|
|
|
org_id=org_id, invited_user_id=invited_user_id
|
|
|
|
|
)
|
2018-02-19 16:53:29 +00:00
|
|
|
|
2020-08-17 14:30:09 +01:00
|
|
|
invited_org_user = InvitedOrgUser.by_id_and_org_id(org_id, invited_user_id)
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
flash(
|
|
|
|
|
f"Invitation cancelled for {invited_org_user.email_address}",
|
|
|
|
|
"default_with_tick",
|
|
|
|
|
)
|
|
|
|
|
return redirect(url_for("main.manage_org_users", org_id=org_id))
|
2018-03-06 17:12:31 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/settings/", methods=["GET"])
|
2019-06-03 13:29:28 +01:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def organization_settings(org_id):
|
2018-03-06 17:12:31 +00:00
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/index.html",
|
2018-03-06 17:12:31 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/settings/edit-name", methods=["GET", "POST"])
|
2019-06-03 13:29:28 +01:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_name(org_id):
|
|
|
|
|
form = RenameOrganizationForm(name=current_organization.name)
|
2018-03-06 17:12:31 +00:00
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2022-01-11 14:24:25 +00:00
|
|
|
try:
|
2023-07-12 12:09:44 -04:00
|
|
|
current_organization.update(name=form.name.data)
|
2022-01-11 14:24:25 +00:00
|
|
|
except HTTPError as http_error:
|
2023-08-25 09:12:23 -07:00
|
|
|
error_msg = "Organization name already exists"
|
2022-01-11 14:24:25 +00:00
|
|
|
if http_error.status_code == 400 and error_msg in http_error.message:
|
2023-08-25 09:12:23 -07:00
|
|
|
form.name.errors.append("This organization name is already in use")
|
2022-01-11 14:24:25 +00:00
|
|
|
else:
|
|
|
|
|
raise http_error
|
|
|
|
|
else:
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2018-03-06 17:12:31 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-name.html",
|
2018-03-06 17:12:31 +00:00
|
|
|
form=form,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/settings/edit-type", methods=["GET", "POST"])
|
2019-02-19 17:26:16 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_type(org_id):
|
|
|
|
|
form = OrganizationOrganizationTypeForm(
|
|
|
|
|
organization_type=current_organization.organization_type
|
2019-02-19 17:26:16 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2023-07-12 12:09:44 -04:00
|
|
|
current_organization.update(
|
|
|
|
|
organization_type=form.organization_type.data,
|
2019-10-03 11:57:24 +01:00
|
|
|
delete_services_cache=True,
|
2019-02-19 17:26:16 +00:00
|
|
|
)
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2019-02-19 17:26:16 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-type.html",
|
2019-02-19 17:26:16 +00:00
|
|
|
form=form,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route(
|
|
|
|
|
"/organizations/<uuid:org_id>/settings/edit-organization-domains",
|
|
|
|
|
methods=["GET", "POST"],
|
|
|
|
|
)
|
2019-02-19 17:26:16 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_domains(org_id):
|
|
|
|
|
form = AdminOrganizationDomainsForm()
|
2019-02-19 17:26:16 +00:00
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2020-05-15 17:50:30 +01:00
|
|
|
try:
|
2023-07-12 12:09:44 -04:00
|
|
|
organizations_client.update_organization(
|
2020-05-15 17:50:30 +01:00
|
|
|
org_id,
|
2023-08-25 09:12:23 -07:00
|
|
|
domains=list(
|
|
|
|
|
OrderedDict.fromkeys(
|
|
|
|
|
domain.lower() for domain in filter(None, form.domains.data)
|
|
|
|
|
)
|
|
|
|
|
),
|
2020-05-15 17:50:30 +01:00
|
|
|
)
|
|
|
|
|
except HTTPError as e:
|
|
|
|
|
error_message = "Domain already exists"
|
|
|
|
|
if e.status_code == 400 and error_message in e.message:
|
|
|
|
|
flash("This domain is already in use", "error")
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-domains.html",
|
2020-05-15 17:50:30 +01:00
|
|
|
form=form,
|
|
|
|
|
)
|
|
|
|
|
else:
|
|
|
|
|
raise e
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2019-02-19 17:26:16 +00:00
|
|
|
|
2023-07-12 12:09:44 -04:00
|
|
|
form.populate(current_organization.domains)
|
2019-02-19 17:26:16 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-domains.html",
|
2019-02-19 17:26:16 +00:00
|
|
|
form=form,
|
2019-05-13 14:50:40 +01:00
|
|
|
)
|
2021-02-05 10:52:08 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route("/organizations/<uuid:org_id>/settings/notes", methods=["GET", "POST"])
|
2021-02-05 10:52:08 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_notes(org_id):
|
|
|
|
|
form = AdminNotesForm(notes=current_organization.notes)
|
2021-02-05 10:52:08 +00:00
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2023-07-12 12:09:44 -04:00
|
|
|
if form.notes.data == current_organization.notes:
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2021-02-05 10:52:08 +00:00
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
current_organization.update(notes=form.notes.data)
|
|
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2021-02-05 10:52:08 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-organization-notes.html",
|
2021-02-05 10:52:08 +00:00
|
|
|
form=form,
|
|
|
|
|
)
|
2021-02-04 18:19:54 +00:00
|
|
|
|
|
|
|
|
|
2023-08-25 09:12:23 -07:00
|
|
|
@main.route(
|
|
|
|
|
"/organizations/<uuid:org_id>/settings/edit-billing-details",
|
|
|
|
|
methods=["GET", "POST"],
|
|
|
|
|
)
|
2021-02-04 18:19:54 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def edit_organization_billing_details(org_id):
|
2022-03-15 10:50:18 +00:00
|
|
|
form = AdminBillingDetailsForm(
|
2023-07-12 12:09:44 -04:00
|
|
|
billing_contact_email_addresses=current_organization.billing_contact_email_addresses,
|
|
|
|
|
billing_contact_names=current_organization.billing_contact_names,
|
|
|
|
|
billing_reference=current_organization.billing_reference,
|
|
|
|
|
purchase_order_number=current_organization.purchase_order_number,
|
|
|
|
|
notes=current_organization.notes,
|
2021-02-05 11:56:05 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2023-07-12 12:09:44 -04:00
|
|
|
current_organization.update(
|
2021-02-05 11:56:05 +00:00
|
|
|
billing_contact_email_addresses=form.billing_contact_email_addresses.data,
|
|
|
|
|
billing_contact_names=form.billing_contact_names.data,
|
|
|
|
|
billing_reference=form.billing_reference.data,
|
|
|
|
|
purchase_order_number=form.purchase_order_number.data,
|
|
|
|
|
notes=form.notes.data,
|
|
|
|
|
)
|
2023-08-25 09:12:23 -07:00
|
|
|
return redirect(url_for(".organization_settings", org_id=org_id))
|
2021-02-05 11:56:05 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
2023-08-25 09:12:23 -07:00
|
|
|
"views/organizations/organization/settings/edit-organization-billing-details.html",
|
2021-02-05 11:56:05 +00:00
|
|
|
form=form,
|
|
|
|
|
)
|
Add new 'Billing' page for organisations
We want organisation team members to be able to see the MOU details for
their organisation. This change creates a new page called billing, which
contains these details. It's only visible to platform admin users now -
the plan is to add more information to this page, then to make it visible
to all organisation users.
The page showing the MOU covers the case of when agreement_signed is
True, when an agreement_signed is False, and when agreement_signed is
None. The case when an agreement_signed is None is very rare - it
signifies that the agreement is not signed but that we have some
service-specific agreements in place. We only have a few organisations
in this state, so it's unlikely that the content for this scenario will
be seen.
When an organisation has signed the agreement we may know the full
details (signing date, version signed, the person who signed it or who it
was signed on behalf of), or we may only have the name of the person who
signed the agreement. We show the more detailed content if possible, and
a less detailed version of the content if not.
There's a new route for downloading the agreement which is almost
identical to the existing `.service_download_agreement` route (plus the
test is almost the same), except that it takes an organisation ID
instead of a service ID.
2021-12-07 13:42:44 +00:00
|
|
|
|
|
|
|
|
|
2023-07-12 12:09:44 -04:00
|
|
|
@main.route("/organizations/<uuid:org_id>/billing")
|
Add new 'Billing' page for organisations
We want organisation team members to be able to see the MOU details for
their organisation. This change creates a new page called billing, which
contains these details. It's only visible to platform admin users now -
the plan is to add more information to this page, then to make it visible
to all organisation users.
The page showing the MOU covers the case of when agreement_signed is
True, when an agreement_signed is False, and when agreement_signed is
None. The case when an agreement_signed is None is very rare - it
signifies that the agreement is not signed but that we have some
service-specific agreements in place. We only have a few organisations
in this state, so it's unlikely that the content for this scenario will
be seen.
When an organisation has signed the agreement we may know the full
details (signing date, version signed, the person who signed it or who it
was signed on behalf of), or we may only have the name of the person who
signed the agreement. We show the more detailed content if possible, and
a less detailed version of the content if not.
There's a new route for downloading the agreement which is almost
identical to the existing `.service_download_agreement` route (plus the
test is almost the same), except that it takes an organisation ID
instead of a service ID.
2021-12-07 13:42:44 +00:00
|
|
|
@user_is_platform_admin
|
2023-07-12 12:09:44 -04:00
|
|
|
def organization_billing(org_id):
|
2023-08-25 09:12:23 -07:00
|
|
|
return render_template("views/organizations/organization/billing.html")
|