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

Merge pull request #4101 from alphagov/billing-content

Browse Source 
Fix billing page to show correct user who signed MOU
This commit is contained in:
Katie Smith
2021-12-13 11:19:04 +00:00
committed by GitHub
parent 53164837f9 30824b110c
commit e5df9614f7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/organisations/organisation/billing.html
View File

@@ -19,7 +19,7 @@
and financial agreement on {{ current_org.agreement_signed_at | format_date_normal }}. and financial agreement on {{ current_org.agreement_signed_at | format_date_normal }}.
</p> </p>
<p class="govuk-body"> <p class="govuk-body">
{{ current_org.agreement_signed_by.name or current_org.agreement_signed_on_behalf_of_name }} signed the agreement {{ current_org.agreement_signed_on_behalf_of_name or current_org.agreement_signed_by.name }} signed the agreement
on behalf of {{ current_org.name}}. on behalf of {{ current_org.name}}.
</p> </p>
<p class="govuk-body"> <p class="govuk-body">

1
tests/app/main/views/organisations/test_organisations.py
View File

@@ -1600,6 +1600,7 @@ def test_organisation_billing_page_not_accessible_if_not_platform_admin(
@pytest.mark.parametrize('signed_by_id, signed_by_name, expected_signatory', [ @pytest.mark.parametrize('signed_by_id, signed_by_name, expected_signatory', [
('1234', None, 'Test User'), ('1234', None, 'Test User'),
(None, 'The Org Manager', 'The Org Manager'), (None, 'The Org Manager', 'The Org Manager'),
('1234', 'The Org Manager', 'The Org Manager'),
]) ])
def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_person( def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_person(
organisation_one, organisation_one,