diff --git a/app/templates/views/dashboard/write-first-messages.html b/app/templates/views/dashboard/write-first-messages.html index 37a6c4278..1abd722d8 100644 --- a/app/templates/views/dashboard/write-first-messages.html +++ b/app/templates/views/dashboard/write-first-messages.html @@ -2,10 +2,10 @@ diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index 7fabec5d1..b10efba95 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -33,7 +33,7 @@ {{ big_number( total_sms_cost, 'spent', - currency="£", + currency="$", smaller=True ) }} @@ -44,7 +44,7 @@ {{ big_number( total_letter_cost, 'spent', - currency="£", + currency="$", smaller=True ) }} @@ -70,19 +70,19 @@ {{ service.service_name }}
-
+
{{ big_number( service.emails_sent, label=service.emails_sent|message_count_label('email'), smallest=True ) }}
-
+
{% if service.sms_cost %} {{ big_number( service.sms_cost, 'spent on text messages', - currency="£", + currency="$", smallest=True ) }} {% else %} @@ -93,14 +93,14 @@ ) }} {% endif %}
- +
{% endfor %} diff --git a/app/templates/views/organisations/organisation/settings/index.html b/app/templates/views/organisations/organisation/settings/index.html index 576143ed6..ca63ce59c 100644 --- a/app/templates/views/organisations/organisation/settings/index.html +++ b/app/templates/views/organisations/organisation/settings/index.html @@ -109,7 +109,7 @@ ) }} {% endcall %} - {% call row() %} + {% call row() %} {{ text_field('Known email domains') }} {{ optional_text_field(current_org.domains or None, default='None') }} diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py index bac4ffc0b..a99404c80 100644 --- a/tests/app/main/views/accounts/test_choose_accounts.py +++ b/tests/app/main/views/accounts/test_choose_accounts.py @@ -326,7 +326,7 @@ def test_should_show_back_to_service_if_user_belongs_to_service( '' 'Dashboard ' 'Send messages ' - 'Letters ' + # 'Letters ' 'Team members' ) # TODO: set sidebar variables in common test module diff --git a/tests/app/main/views/organisations/test_organisations.py b/tests/app/main/views/organisations/test_organisations.py index 598948506..e309b2974 100644 --- a/tests/app/main/views/organisations/test_organisations.py +++ b/tests/app/main/views/organisations/test_organisations.py @@ -469,8 +469,8 @@ def test_organisation_services_shows_live_services_and_usage( # Totals assert normalize_spaces(usage_rows[0].text) == "Emails 33,000 sent" - assert normalize_spaces(usage_rows[1].text) == "Text messages £42.00 spent" - assert normalize_spaces(usage_rows[2].text) == "Letters £30.50 spent" + assert normalize_spaces(usage_rows[1].text) == "Text messages $42.00 spent" + assert normalize_spaces(usage_rows[2].text) == "Letters $30.50 spent" assert normalize_spaces(services[0].text) == '1' assert normalize_spaces(services[1].text) == '5' @@ -478,11 +478,11 @@ def test_organisation_services_shows_live_services_and_usage( assert normalize_spaces(usage_rows[3].text) == "13,000 emails sent" assert normalize_spaces(usage_rows[4].text) == "122 free text messages sent" - assert normalize_spaces(usage_rows[5].text) == "£30.50 spent on letters" + assert normalize_spaces(usage_rows[5].text) == "$30.50 spent on letters" assert services[1].find('a')['href'] == url_for('main.usage', service_id=SERVICE_TWO_ID) assert normalize_spaces(usage_rows[6].text) == "20,000 emails sent" - assert normalize_spaces(usage_rows[7].text) == "£42.00 spent on text messages" - assert normalize_spaces(usage_rows[8].text) == "£0.00 spent on letters" + assert normalize_spaces(usage_rows[7].text) == "$42.00 spent on text messages" + assert normalize_spaces(usage_rows[8].text) == "$0.00 spent on letters" # Ensure there’s no ‘this org has no services message’ assert not page.select('.govuk-hint') @@ -512,12 +512,12 @@ def test_organisation_services_shows_live_services_and_usage_with_count_of_1( # Totals assert normalize_spaces(usage_rows[0].text) == "Emails 1 sent" - assert normalize_spaces(usage_rows[1].text) == "Text messages £0.00 spent" - assert normalize_spaces(usage_rows[2].text) == "Letters £0.00 spent" + assert normalize_spaces(usage_rows[1].text) == "Text messages $0.00 spent" + assert normalize_spaces(usage_rows[2].text) == "Letters $0.00 spent" assert normalize_spaces(usage_rows[3].text) == "1 email sent" assert normalize_spaces(usage_rows[4].text) == "1 free text message sent" - assert normalize_spaces(usage_rows[5].text) == "£0.00 spent on letters" + assert normalize_spaces(usage_rows[5].text) == "$0.00 spent on letters" @freeze_time("2020-02-20 20:20") @@ -938,7 +938,7 @@ def test_organisation_settings_for_platform_admin( 'Billing details None Change billing details for the organisation', 'Notes None Change the notes for the organisation', 'Default email branding GOV.UK Change default email branding for the organisation', - 'Default letter branding No branding Change default letter branding for the organisation', + # 'Default letter branding No branding Change default letter branding for the organisation', 'Known email domains None Change known email domains for the organisation', ] diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py index ff702a4b2..7d8ca0e51 100644 --- a/tests/app/main/views/service_settings/test_service_settings.py +++ b/tests/app/main/views/service_settings/test_service_settings.py @@ -74,8 +74,8 @@ def mock_get_service_settings_page_common( 'Send international text messages Off Change your settings for sending international text messages', 'Receive text messages Off Change your settings for receiving text messages', - 'Label Value Action', - 'Send letters Off Change your settings for sending letters', + # 'Label Value Action', + # 'Send letters Off Change your settings for sending letters', ]), (create_platform_admin_user(), [ @@ -97,8 +97,8 @@ def mock_get_service_settings_page_common( 'Send international text messages Off Change your settings for sending international text messages', 'Receive text messages Off Change your settings for receiving text messages', - 'Label Value Action', - 'Send letters Off Change your settings for sending letters', + # 'Label Value Action', + # 'Send letters Off Change your settings for sending letters', 'Label Value Action', 'Live Off Change service status', @@ -344,8 +344,8 @@ def test_send_files_by_email_row_on_settings_page( 'Send international text messages On Change your settings for sending international text messages', 'Receive text messages On Change your settings for receiving text messages', - 'Label Value Action', - 'Send letters Off Change your settings for sending letters', + # 'Label Value Action', + # 'Send letters Off Change your settings for sending letters', ]), (['email', 'sms', 'email_auth'], [ @@ -366,28 +366,28 @@ def test_send_files_by_email_row_on_settings_page( 'Send international text messages Off Change your settings for sending international text messages', 'Receive text messages Off Change your settings for receiving text messages', - 'Label Value Action', - 'Send letters Off Change your settings for sending letters', + # 'Label Value Action', + # 'Send letters Off Change your settings for sending letters', ]), - (['letter'], [ + # (['letter'], [ - 'Service name service one Change service name', - 'Sign-in method Text message code Change sign-in method', + # 'Service name service one Change service name', + # 'Sign-in method Text message code Change sign-in method', - 'Label Value Action', - 'Send emails Off Change your settings for sending emails', + # 'Label Value Action', + # 'Send emails Off Change your settings for sending emails', - 'Label Value Action', - 'Send text messages Off Change your settings for sending text messages', + # 'Label Value Action', + # 'Send text messages Off Change your settings for sending text messages', - 'Label Value Action', - 'Send letters On Change your settings for sending letters', - 'Send international letters Off Change', - 'Sender addresses 1 Example Street Manage sender addresses', - 'Letter branding Not set Change letter branding', + # 'Label Value Action', + # 'Send letters On Change your settings for sending letters', + # 'Send international letters Off Change', + # 'Sender addresses 1 Example Street Manage sender addresses', + # 'Letter branding Not set Change letter branding', - ]), + # ]), (['broadcast'], [ 'Service name service one Change service name', @@ -418,6 +418,7 @@ def test_should_show_overview_for_service_with_more_things_set( assert row == " ".join(page.find_all('tr')[index + 1].text.split()) +@pytest.mark.skip(reason="Skipping letter-specific test") def test_if_cant_send_letters_then_cant_see_letter_contact_block( client_request, service_one, @@ -430,6 +431,7 @@ def test_if_cant_send_letters_then_cant_see_letter_contact_block( assert 'Letter contact block' not in response +@pytest.mark.skip(reason="Skipping letter-specific test") def test_letter_contact_block_shows_none_if_not_set( client_request, service_one, @@ -449,6 +451,7 @@ def test_letter_contact_block_shows_none_if_not_set( assert 'default' in div.attrs['class'][0] +@pytest.mark.skip(reason="Skipping letter-specific test") def test_escapes_letter_contact_block( client_request, service_one, @@ -2085,7 +2088,7 @@ def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender( multiple_sms_senders, mock_get_service_settings_page_common, ): - service_one['permissions'] = ['email', 'sms', 'letter'] + service_one['permissions'] = ['email', 'sms'] page = client_request.get( 'main.service_settings', @@ -2101,7 +2104,7 @@ def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender( "Reply-to email addresses test@example.com …and 2 more Manage reply-to email addresses" assert get_row(page, 'Text message senders') == \ "Text message senders Example …and 2 more Manage text message senders" - assert get_row(page, 'Sender addresses') == "Sender addresses 1 Example Street …and 2 more Manage sender addresses" + # assert get_row(page, 'Sender addresses') == "Sender addresses 1 Example Street …and 2 more Manage sender addresses" @pytest.mark.parametrize('sender_list_page, index, expected_output', [ @@ -4755,6 +4758,7 @@ def test_service_settings_links_to_branding_request_page_for_emails( assert len(page.find_all('a', attrs={'href': expected_href})) == 1 +@pytest.mark.skip(reason="Skipping letter-specific test") def test_service_settings_links_to_branding_request_page_for_letters( mocker, service_one, diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index c1e532321..cb9692fcb 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -904,21 +904,21 @@ def test_should_not_show_upcoming_jobs_on_dashboard_if_service_has_no_jobs( @pytest.mark.parametrize('permissions', ( ['email', 'sms'], - ['email', 'sms', 'letter'], + # ['email', 'sms', 'letter'], )) @pytest.mark.parametrize('totals', [ ( { 'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'sms': {'requested': 99999, 'delivered': 0, 'failed': 0}, - 'letter': {'requested': 99999, 'delivered': 0, 'failed': 0} + # 'letter': {'requested': 99999, 'delivered': 0, 'failed': 0} }, ), ( { 'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'sms': {'requested': 0, 'delivered': 0, 'failed': 0}, - 'letter': {'requested': 100000, 'delivered': 0, 'failed': 0}, + # 'letter': {'requested': 100000, 'delivered': 0, 'failed': 0}, }, ), ]) @@ -950,12 +950,12 @@ def test_correct_font_size_for_big_numbers( ) assert ( - len(page.select_one('[data-key=totals]').select('.govuk-grid-column-one-third')) + len(page.select_one('[data-key=totals]').select('.govuk-grid-column-one-half')) ) == ( - len(page.select_one('[data-key=usage]').select('.govuk-grid-column-one-third')) + len(page.select_one('[data-key=usage]').select('.govuk-grid-column-one-half')) ) == ( len(page.select('.big-number-with-status .big-number-smaller')) - ) == 3 + ) == 2 def test_should_not_show_jobs_on_dashboard_for_users_with_uploads_page( @@ -1007,14 +1007,14 @@ def test_usage_page( assert normalize_spaces(unselected_nav_links[0].text) == '2010 to 2011 financial year' assert normalize_spaces(unselected_nav_links[1].text) == '2009 to 2010 financial year' - annual_usage = page.find_all('div', {'class': 'govuk-grid-column-one-third'}) + annual_usage = page.find_all('div', {'class': 'govuk-grid-column-one-half'}) # annual stats are shown in two rows, each with three column; email is col 1 - email_column = normalize_spaces(annual_usage[0].text + annual_usage[3].text) + email_column = normalize_spaces(annual_usage[0].text + annual_usage[2].text) assert 'Emails' in email_column assert '1,000 sent' in email_column - sms_column = normalize_spaces(annual_usage[1].text + annual_usage[4].text) + sms_column = normalize_spaces(annual_usage[1].text + annual_usage[3].text) assert 'Text messages' in sms_column assert '251,800 sent' in sms_column assert '250,000 free allowance' in sms_column @@ -1023,10 +1023,10 @@ def test_usage_page( assert '1,500 at 1.65 pence' in sms_column assert '300 at 1.70 pence' in sms_column - letter_column = normalize_spaces(annual_usage[2].text + annual_usage[5].text) - assert 'Letters' in letter_column - assert '100 sent' in letter_column - assert '£30.00 spent' in letter_column + # letter_column = normalize_spaces(annual_usage[2].text + annual_usage[5].text) + # assert 'Letters' in letter_column + # assert '100 sent' in letter_column + # assert '£30.00 spent' in letter_column @freeze_time("2012-03-31 12:12:12") @@ -1051,8 +1051,8 @@ def test_usage_page_no_sms_spend( service_id=SERVICE_ONE_ID, ) - annual_usage = page.find_all('div', {'class': 'govuk-grid-column-one-third'}) - sms_column = normalize_spaces(annual_usage[1].text + annual_usage[4].text) + annual_usage = page.find_all('div', {'class': 'govuk-grid-column-one-half'}) + sms_column = normalize_spaces(annual_usage[1].text + annual_usage[3].text) assert 'Text messages' in sms_column assert '250,000 free allowance' in sms_column assert '249,000 free allowance remaining' in sms_column @@ -1079,10 +1079,10 @@ def test_usage_page_monthly_breakdown( assert '140 free text messages' in monthly_breakdown assert '960 text messages at 1.65p' in monthly_breakdown assert '33 text messages at 1.70p' in monthly_breakdown - assert '5 first class letters at 33p' in monthly_breakdown - assert '10 second class letters at 31p' in monthly_breakdown - assert '3 international letters at 55p' in monthly_breakdown - assert '7 international letters at 84p' in monthly_breakdown + # assert '5 first class letters at 33p' in monthly_breakdown + # assert '10 second class letters at 31p' in monthly_breakdown + # assert '3 international letters at 55p' in monthly_breakdown + # assert '7 international letters at 84p' in monthly_breakdown assert 'March' in monthly_breakdown assert '£20.91' in monthly_breakdown @@ -1110,6 +1110,7 @@ def test_usage_page_monthly_breakdown_shows_months_so_far( assert len(rows) == expected_number_of_months +@pytest.mark.skip(reason="Skipping letter-specific test") @freeze_time("2012-03-31 12:12:12") def test_usage_page_letter_breakdown_ordered_by_postage_and_rate( client_request, @@ -1144,7 +1145,7 @@ def test_usage_page_with_0_free_allowance( year=2020, ) - annual_usage = page.select('main .govuk-grid-column-one-third') + annual_usage = page.select('main .govuk-grid-column-one-half') sms_column = normalize_spaces(annual_usage[1].text) assert '0 free allowance' in sms_column @@ -1705,7 +1706,7 @@ def test_breadcrumb_shows_if_service_is_suspended( @pytest.mark.parametrize('permissions', ( ['email', 'sms'], - ['email', 'sms', 'letter'], + # ['email', 'sms', 'letter'], )) def test_service_dashboard_shows_usage( client_request, @@ -1727,9 +1728,9 @@ def test_service_dashboard_shows_usage( 'Unlimited ' 'free email allowance ' '£29.85 ' - 'spent on text messages ' - '£30.00 ' - 'spent on letters' + 'spent on text messages' + # '£30.00 ' + # 'spent on letters' )