+ f'''pending
{message_count_noun(job.notifications_sending, job_type)}'''
),
- 'sending',
+ 'pending',
job.notifications_sending
],
[
diff --git a/app/main/views/pricing.py b/app/main/views/pricing.py
index 18a3d426a..bdbc0a454 100644
--- a/app/main/views/pricing.py
+++ b/app/main/views/pricing.py
@@ -7,11 +7,13 @@ from notifications_utils.international_billing_rates import (
from app.main import main
from app.main.forms import SearchByNameForm
from app.main.views.sub_navigation_dictionaries import using_notify_nav
+from app.utils.user import user_is_logged_in
CURRENT_SMS_RATE = '1.72'
@main.route('/using-notify/pricing')
+@user_is_logged_in
def pricing():
return render_template(
'views/pricing/index.html',
@@ -26,6 +28,7 @@ def pricing():
@main.route('/pricing/how-to-pay')
+@user_is_logged_in
def how_to_pay():
return render_template(
'views/pricing/how-to-pay.html',
@@ -34,6 +37,7 @@ def how_to_pay():
@main.route('/pricing/billing-details')
+@user_is_logged_in
def billing_details():
if current_user.is_authenticated:
return render_template(
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index fb84df3e2..84958807c 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -451,7 +451,6 @@ def add_service_template(service_id, template_type, template_folder_id=None):
form.template_content.data,
service_id,
form.subject.data if hasattr(form, 'subject') else None,
- form.process_type.data,
template_folder_id
)
except HTTPError as e:
@@ -525,8 +524,7 @@ def edit_service_template(service_id, template_id):
template['template_type'],
form.template_content.data,
service_id,
- subject,
- form.process_type.data,
+ subject
)
except HTTPError as e:
if e.status_code == 400:
diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py
index 8c55d5157..0fdcc8b85 100644
--- a/app/notify_client/service_api_client.py
+++ b/app/notify_client/service_api_client.py
@@ -163,7 +163,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return self.delete(endpoint, data)
@cache.delete('service-{service_id}-templates')
- def create_service_template(self, name, type_, content, service_id, subject=None, process_type='normal',
+ def create_service_template(self, name, type_, content, service_id, subject=None,
parent_folder_id=None):
"""
Create a service template.
@@ -173,7 +173,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
"template_type": type_,
"content": content,
"service": service_id,
- "process_type": process_type,
+ "process_type": 'normal',
}
if subject:
data.update({
@@ -190,7 +190,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete_by_pattern('service-{service_id}-template-*')
def update_service_template(
- self, id_, name, type_, content, service_id, subject=None, process_type=None
+ self, id_, name, type_, content, service_id, subject=None
):
"""
Update a service template.
@@ -206,10 +206,9 @@ class ServiceAPIClient(NotifyAdminAPIClient):
data.update({
'subject': subject
})
- if process_type:
- data.update({
- 'process_type': process_type
- })
+ data.update({
+ 'process_type': 'normal'
+ })
data = _attach_current_user(data)
endpoint = "/service/{0}/template/{1}".format(service_id, id_)
return self.post(endpoint, data)
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 8e91178f2..67f6f5412 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -31,7 +31,7 @@
{% endblock %}
{% block meta %}
{% endblock %}
-
+
{% endblock %}
{% block pageTitle %}
@@ -51,6 +51,16 @@
{% if current_user.is_authenticated %}
{% if current_user.platform_admin %}
{% set navigation = [
+ {
+ "href": url_for('main.get_started'),
+ "text": "Using notify",
+ "active": header_navigation.is_selected('using_notify')
+ },
+ {
+ "href": url_for('main.features'),
+ "text": "Features",
+ "active": header_navigation.is_selected('features')
+ },
{
"href": url_for('main.user_profile'),
"text": current_user.name,
diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html
index 21834648b..001130a1b 100644
--- a/app/templates/partials/count.html
+++ b/app/templates/partials/count.html
@@ -5,9 +5,12 @@
{% if notifications_deleted %}
{% for label, query_param, url, count in counts %}
-
- {{ big_number(count, label, smaller=True) }}
-
+ {% if query_param == 'pending' %}
+
{{ big_number(count, query_param, smaller=True) }}
+ {% else %}
+
{{ big_number(count, label, smaller=True) }}
+ {% endif %}
+
{% endfor %}
{{ pill(
status_filters,
diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index eaa8d026d..0b1ecad2f 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -50,7 +50,7 @@
{{ big_number(
item.notifications_sending,
smallest=True,
- label='sending',
+ label='pending',
) }}
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 193bbc8a6..89ba335b9 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -17,6 +17,6 @@
{{ ajax_block(partials, updates_url, 'counts', finished=job.processing_finished) }}
{{ ajax_block(partials, updates_url, 'notifications', finished=job.processing_finished) }}
-
+
{% endblock %}
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index 598ab743e..57c1aee9c 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -25,6 +25,11 @@
'counts'
) }}
+
+
+ Messages will remain in pending state until carrier status is received, typically 5 minutes.
+
+
{% call form_wrapper(
action=url_for('.view_notifications', service_id=current_service.id, message_type=message_type),
class="usa-search margin-bottom-2"
@@ -50,6 +55,10 @@
{% endcall %}
+
+
+
+
{% call form_wrapper(id="search-form") %}
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 01eb809c5..ffb055a74 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -50,7 +50,7 @@