Organisation billing details visible on organisation settings page

app/models/organisation.py

@@ -46,6 +46,10 @@ class Organisation(JSONModel):
         'domains',
         'request_to_go_live_notes',
         'count_of_live_services',
+        'billing_contact_email_addresses',
+        'billing_contact_names',
+        'billing_reference',
+        'purchase_order_number',
         'notes'
     }
 
@@ -134,6 +138,19 @@ class Organisation(JSONModel):
             abort(404)
         return self.crown
 
+    @property
+    def billing_details(self):
+        billing_details = [
+            self.billing_contact_email_addresses,
+            self.billing_contact_names,
+            self.billing_reference,
+            self.purchase_order_number
+        ]
+        if any(billing_details):
+            return billing_details
+        else:
+            return None
+
     @cached_property
     def services(self):
         return organisations_client.get_organisation_services(self.id)

app/templates/views/organisations/organisation/settings/index.html

@@ -72,6 +72,12 @@
         }}
       {% endcall %}
 
+      {% call row() %}
+        {{ text_field('Billing details')}}
+        {{ optional_text_field(current_org.billing_details, default="No billing details yet", wrap=True) }}
+        {{ edit_field('Change', url_for('.organisation_settings', org_id=current_org.id), suffix='billing details for the organisation') }}
+      {% endcall %}
+
       {% call row() %}
         {{ text_field('Notes')}}
         {{ optional_text_field(current_service.notes, default="No notes yet", wrap=True) }}