diff --git a/app/formatters.py b/app/formatters.py index 86c187f55..a9519cbcf 100644 --- a/app/formatters.py +++ b/app/formatters.py @@ -448,6 +448,12 @@ def message_count_noun(count, template_type): else: return "text messages" + if template_type == "parts": + if count == 1: + return "text message part" + else: + return "text message parts" + elif template_type == "email": if count == 1: return "email" diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index 34d28443a..436da7735 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -15,62 +15,20 @@ Pricing {{ content_metadata( data={ -"Last updated": "Feb 27, 2023" +"Last updated": "January 25, 2024" } ) }} -

During pilot period, each service has an allowance of 250,000 free text messages. Once this allowance is met, the -application will stop delivering messages. There's no monthly charge, no setup fee and no procurement cost.

-

When a new service is added, it will start in trial mode. Moving a service out of trial mode is subject to approval by -the Notify.gov team.

-

You'll use more messages towards the allowance if you send text messages longer than 160 characters. -

+

During the pilot period, each service has an allowance of 250,000 message parts. Once this allowance is met, the +application will stop delivering messages. There's no monthly charge, no setup fee, and no procurement cost. You'll use +more parts towards the allowance if you:

-

- {% if not current_user.is_authenticated %} - Create an account, then - add your unique service(s). -

-{% else %} -Additional unique services may be added, although moving each service out of trial mode is subject to approval by the -Notify.gov team. -{% endif %} -

- -

When you add a new service it will start in trial mode.

- -

You’ll use more messages towards the allowance if you send text messages longer than 160 characters.

- - - -

Text messages

-

During pilot phase, each service has an annual allowance of 250,000 free text messages. Once this allowance is met, - the application will stop delivering messages.

- -

You’ll use more messages towards the allowance, if you send text messages longer than 160 characters.

-

You may also use more messages if you:

- -

Long text messages

If a text message is longer than 160 characters (including spaces), it counts as more than one message.

@@ -82,12 +40,12 @@ Notify.gov team. caption_visible=False ) %} {% for message_length, charge in [ - ('Up to 160 characters', '1 text message'), - ('Up to 306 characters', '2 text messages'), - ('Up to 459 characters', '3 text messages'), - ('Up to 612 characters', '4 text messages'), - ('Up to 765 characters', '5 text messages'), - ('Up to 918 characters', '6 text messages'), + ('Up to 160 characters', '1 part'), + ('Up to 306 characters', '2 parts'), + ('Up to 459 characters', '3 parts'), + ('Up to 612 characters', '4 parts'), + ('Up to 765 characters', '5 parts'), + ('Up to 918 characters', '6 parts'), ] %} {% call row() %} {{ text_field(message_length) }} @@ -186,11 +144,11 @@ Notify.gov team. caption_visible=False ) %} {% for message_length, charge in [ - ('Up to 70 characters', '1 text message'), - ('Up to 134 characters', '2 text messages'), - ('Up to 201 characters', '3 text messages'), - ('Up to 268 characters', '4 text messages'), - ('Each additional 67 characters', '1 additional text message'), + ('Up to 70 characters', '1 part'), + ('Up to 134 characters', '2 parts'), + ('Up to 201 characters', '3 parts'), + ('Up to 268 characters', '4 parts'), + ('Each additional 67 characters', '1 additional part'), ] %} {% call row() %} {{ text_field(message_length) }} @@ -200,43 +158,9 @@ Notify.gov team. {% endcall %} -

Sending text messages to international numbers

-

It might cost more to send text messages to international numbers than U.S. ones, depending on the country.

- - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 72b37170d..e1f377c6f 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -7,37 +7,33 @@ {% block content_column_content %}

Trial mode

-

When you add a new service it will start in trial mode. This lets you try out Notify.gov, with a few restrictions.

-

While your service is in trial mode you can only:

- - {% if current_service and current_service.trial_mode %} -

- To remove these restrictions, you can request to go live.

- {% else %} -

- To remove these restrictions: -

-
    -
  1. Sign in to Notify.
    2. -
  2. Go to the Settings page.
    3. -
  3. Select Request to go live.
    4. -
- {% endif %} -

- When we receive your request we’ll get back to you within one working day. -

-

Before you request to go live

-

You must:

+

Limits while in trial mode

+

While your service is in trial mode you can only:

+

Each text message is made up of one or more parts.

+ +

For more information on how message parts are calculated, see + Pricing.

+ +

Before going Live

+

Before you request to make your service live so you can send messages to clients:

+ +

Going Live

+ +

To remove the restrictions of Trial Mode and begin sending messages to clients complete the Live Campaign Form.

+

We'll get back to you within one working day.

{% endblock %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 87ce5ade8..5636536d5 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -19,25 +19,25 @@
- +

Daily messages across all services

You have sent {{ global_message_limit - daily_global_messages_remaining }} of your {{ global_message_limit }} daily messages allowance.

You have {{ daily_global_messages_remaining }} messages remaining.

-

Text messages

+

Text message parts

You have sent - {{ big_number(sms_sent, 'messages of your', smaller=True) }} - {{ big_number(sms_free_allowance, 'free messages allowance.', smaller=True) }} + {{ big_number(sms_sent, 'text message parts of your', smaller=True) }} + {{ big_number(sms_free_allowance, 'free message parts allowance.', smaller=True) }}
You have {% if sms_free_allowance > 0 %} - {{ big_number(sms_allowance_remaining, 'messages remaining.', smaller=True) }} + {{ big_number(sms_allowance_remaining, 'message parts remaining.', smaller=True) }} {% endif %} {# {% for row in sms_breakdown %} {% if row.charged_units > 0 %} {{ big_number( - row.charged_units, + row.charged_units, 'at {:.2f} pence per message'.format(row.rate * 100), smaller=True ) }} @@ -90,7 +90,7 @@ {{ item.month }} {% endcall %} {% for counts, template_type in [ - (item.sms_counts.0, 'sms'), + (item.sms_counts.0, 'parts'), ] %} {% call field(align='left') %} {{ big_number( @@ -126,7 +126,7 @@ {% endif %} {% endcall %} - + {% endcall %}
{% endif %} @@ -140,7 +140,7 @@

- What counts as 1 text message?
+ What counts as 1 text message part?
See pricing.

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index b15e55a48..ff851dfed 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -992,8 +992,8 @@ def test_usage_page( sms_column = normalize_spaces(annual_usage[0].text) assert ( - "You have sent 251,800 messages of your 250,000 free messages allowance. You have 0 messages remaining." - in sms_column + "You have sent 251,800 text message parts of your 250,000 free message parts allowance." + " You have 0 message parts remaining." in sms_column ) assert "$29.85 spent" not in sms_column assert "1,500 at 1.65 pence" not in sms_column @@ -1029,8 +1029,8 @@ def test_usage_page_no_sms_spend( annual_usage = page.find_all("div", {"class": "keyline-block"}) sms_column = normalize_spaces(annual_usage[0].text) assert ( - "You have sent 1,000 messages of your 250,000 free messages allowance. You have 249,000 messages remaining." - in sms_column + "You have sent 1,000 text message parts of your 250,000 free message parts allowance." + " You have 249,000 message parts remaining." in sms_column ) assert "$0.00 spent" not in sms_column assert "pence per message" not in sms_column @@ -1106,7 +1106,7 @@ def test_usage_page_with_0_free_allowance( sms_column = normalize_spaces(annual_usage[0].text) assert ( - "You have sent 251,800 messages of your 0 free messages allowance. You have" + "You have sent 251,800 text message parts of your 0 free message parts allowance. You have" in sms_column ) assert "free allowance remaining" not in sms_column