darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3830 from alphagov/remove-2020-allowances

Browse Source 
Remove 2020/21 free allowance data
This commit is contained in:
Chris Hill-Scott
2021-04-01 10:40:29 +01:00
committed by GitHub
parent 88872b96e9 72acdee794
commit 18a96d3243
3 changed files with 34 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/config.py
View File

@@ -33,38 +33,14 @@ class Config(object):
AWS_REGION = 'eu-west-1'
DEFAULT_SERVICE_LIMIT = 50
DEFAULT_FREE_SMS_FRAGMENT_LIMITS = {
'central': {
2020: 250_000,
2021: 150_000,
},
'local': {
2020: 25_000,
2021: 25_000,
},
'nhs_central': {
2020: 250_000,
2021: 150_000,
},
'nhs_local': {
2020: 25_000,
2021: 25_000,
},
'nhs_gp': {
2020: 25_000,
2021: 10_000,
},
'emergency_service': {
2020: 25_000,
2021: 25_000,
},
'school_or_college': {
2020: 25_000,
2021: 10_000,
},
'other': {
2020: 25_000,
2021: 10_000,
},
'central': 150_000,
'local': 25_000,
'nhs_central': 150_000,
'nhs_local': 25_000,
'nhs_gp': 10_000,
'emergency_service': 25_000,
'school_or_college': 10_000,
'other': 10_000,
}
EMAIL_EXPIRY_SECONDS = 3600 # 1 hour
INVITATION_EXPIRY_SECONDS = 3600 * 24 * 2 # 2 days - also set on api

8
app/main/views/add_service.py
View File

@@ -6,11 +6,7 @@ from app import billing_api_client, service_api_client
from app.formatters import email_safe
from app.main import main
from app.main.forms import CreateNhsServiceForm, CreateServiceForm
from app.utils import (
get_current_financial_year,
user_is_gov_user,
user_is_logged_in,
)
from app.utils import user_is_gov_user, user_is_logged_in
def _create_service(service_name, organisation_type, email_from, form):
@@ -18,8 +14,6 @@ def _create_service(service_name, organisation_type, email_from, form):
'DEFAULT_FREE_SMS_FRAGMENT_LIMITS'
][
organisation_type
][
get_current_financial_year()
]
try: