diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js index 4f92673a0..4f4017818 100644 --- a/app/assets/javascripts/collapsibleCheckboxes.js +++ b/app/assets/javascripts/collapsibleCheckboxes.js @@ -220,6 +220,6 @@ this.summary.bindEvents(this); }; - NotifyModules.CollapsibleCheckboxes = CollapsibleCheckboxes; + NotifyModules['collapsible-checkboxes'] = CollapsibleCheckboxes; }(window)); diff --git a/app/assets/javascripts/copyToClipboard.js b/app/assets/javascripts/copyToClipboard.js index e4b9a6d28..75d4d2f98 100644 --- a/app/assets/javascripts/copyToClipboard.js +++ b/app/assets/javascripts/copyToClipboard.js @@ -3,7 +3,7 @@ if (!document.queryCommandSupported('copy')) return; - Modules.CopyToClipboard = function() { + Modules['copy-to-clipboard'] = function() { const states = { 'valueVisible': (options) => ` diff --git a/app/assets/javascripts/enhancedTextbox.js b/app/assets/javascripts/enhancedTextbox.js index 3c36bb14b..d583c7581 100644 --- a/app/assets/javascripts/enhancedTextbox.js +++ b/app/assets/javascripts/enhancedTextbox.js @@ -9,7 +9,7 @@ const tagPattern = /\(\(([^\)\((\?)]+)(\?\?)?([^\)\(]*)\)\)/g; - window.NotifyModules.EnhancedTextbox = function() { + window.NotifyModules['enhanced-textbox'] = function() { this.start = function(textarea) { diff --git a/app/assets/javascripts/errorTracking.js b/app/assets/javascripts/errorTracking.js index 035a31b89..0e125c8e9 100644 --- a/app/assets/javascripts/errorTracking.js +++ b/app/assets/javascripts/errorTracking.js @@ -1,7 +1,7 @@ (function(window) { "use strict"; - window.NotifyModules.TrackError = function() { + window.NotifyModules['track-error'] = function() { this.start = function(component) { diff --git a/app/assets/javascripts/fileUpload.js b/app/assets/javascripts/fileUpload.js index 16d2e74e9..ddec98bce 100644 --- a/app/assets/javascripts/fileUpload.js +++ b/app/assets/javascripts/fileUpload.js @@ -27,7 +27,7 @@ function initUploadStatusAnnouncer() { (function(Modules) { "use strict"; - Modules.FileUpload = function() { + Modules['file-upload'] = function() { this.submit = () => this.$form.trigger('submit'); this.showCancelButton = () => { diff --git a/app/assets/javascripts/fullscreenTable.js b/app/assets/javascripts/fullscreenTable.js index 7662131d5..fb8c74399 100644 --- a/app/assets/javascripts/fullscreenTable.js +++ b/app/assets/javascripts/fullscreenTable.js @@ -1,7 +1,7 @@ (function(Modules) { "use strict"; - Modules.FullscreenTable = function() { + Modules['fullscreen-table'] = function() { this.start = function(component) { diff --git a/app/assets/javascripts/listEntry.js b/app/assets/javascripts/listEntry.js index f5c953455..7de7fe728 100644 --- a/app/assets/javascripts/listEntry.js +++ b/app/assets/javascripts/listEntry.js @@ -216,7 +216,7 @@ } }; - Modules.ListEntry = function () { + Modules['list-entry'] = function () { this.start = component => lists.push(new ListEntry($(component))); diff --git a/app/assets/javascripts/liveSearch.js b/app/assets/javascripts/liveSearch.js index 4c0035103..e4d0f9bd9 100644 --- a/app/assets/javascripts/liveSearch.js +++ b/app/assets/javascripts/liveSearch.js @@ -70,7 +70,7 @@ }; - Modules.LiveSearch = function() { + Modules['live-search'] = function() { this.start = function(component) { diff --git a/app/assets/javascripts/radioSelect.js b/app/assets/javascripts/radioSelect.js index 044b4a61f..0b8d38ef0 100644 --- a/app/assets/javascripts/radioSelect.js +++ b/app/assets/javascripts/radioSelect.js @@ -79,7 +79,7 @@ } }; - Modules.RadioSelect = function() { + Modules['radio-select'] = function() { this.start = function(component) { diff --git a/app/assets/javascripts/radioSlider.js b/app/assets/javascripts/radioSlider.js index cf3371051..2b06d500c 100644 --- a/app/assets/javascripts/radioSlider.js +++ b/app/assets/javascripts/radioSlider.js @@ -2,7 +2,7 @@ "use strict"; - global.NotifyModules.RadioSlider = function() { + global.NotifyModules['radio-slider'] = function() { this.start = function(component) { diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js index f8040f833..e415b386a 100644 --- a/app/assets/javascripts/templateFolderForm.js +++ b/app/assets/javascripts/templateFolderForm.js @@ -1,7 +1,7 @@ (function(Modules) { "use strict"; - Modules.TemplateFolderForm = function() { + Modules['template-folder-form'] = function() { this.start = function(templateFolderForm) { this.$form = $(templateFolderForm); diff --git a/app/assets/javascripts/updateContent.js b/app/assets/javascripts/updateContent.js index 3191e034a..16af16276 100644 --- a/app/assets/javascripts/updateContent.js +++ b/app/assets/javascripts/updateContent.js @@ -106,7 +106,7 @@ ); }; - global.NotifyModules.UpdateContent = function() { + global.NotifyModules['update-content'] = function() { this.start = component => { var $component = $(component); @@ -144,6 +144,6 @@ }; - global.NotifyModules.UpdateContent.calculateBackoff = calculateBackoff; + global.NotifyModules['update-content'].calculateBackoff = calculateBackoff; })(window); diff --git a/app/assets/javascripts/updateStatus.js b/app/assets/javascripts/updateStatus.js index b128439da..ce6aff6ce 100644 --- a/app/assets/javascripts/updateStatus.js +++ b/app/assets/javascripts/updateStatus.js @@ -1,7 +1,7 @@ (function(window) { "use strict"; - window.NotifyModules.UpdateStatus = function() { + window.NotifyModules['update-status'] = function() { const getRenderer = $component => response => $component.html( response.html diff --git a/app/main/views/pricing.py b/app/main/views/pricing.py index 5e60e6768..396e4b28d 100644 --- a/app/main/views/pricing.py +++ b/app/main/views/pricing.py @@ -35,18 +35,3 @@ def how_to_pay(): "views/pricing/how-to-pay.html", navigation_links=using_notify_nav(), ) - - -@main.route("/pricing/billing-details") -@user_is_logged_in -def billing_details(): - if current_user.is_authenticated: - return render_template( - "views/pricing/billing-details.html", - billing_details=current_app.config["NOTIFY_BILLING_DETAILS"], - navigation_links=using_notify_nav(), - ) - return render_template( - "views/pricing/billing-details-signed-out.html", - navigation_links=using_notify_nav(), - ) diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index 0fa479c3f..1bff2213b 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -67,7 +67,7 @@ Error
Your file needs a column called ‘{{ first_recipient_column }}’.
@@ -85,7 +85,7 @@ ErrorWe found more than one column called {{ ( recipients.duplicate_recipient_column_headers diff --git a/app/templates/views/pricing/billing-details-signed-out.html b/app/templates/views/pricing/billing-details-signed-out.html deleted file mode 100644 index a76a0fded..000000000 --- a/app/templates/views/pricing/billing-details-signed-out.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "base.html" %} -{% from "components/page-header.html" import page_header %} - -{% block per_page_title %} - Billing details -{% endblock %} - -{% block content_column_content %} - - {{ page_header('Billing details') }} - -
- Sign in to see our: -
- -- You can use this information to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order. -
- -{% endblock %} diff --git a/app/templates/views/pricing/billing-details.html b/app/templates/views/pricing/billing-details.html deleted file mode 100644 index 330a6adab..000000000 --- a/app/templates/views/pricing/billing-details.html +++ /dev/null @@ -1,138 +0,0 @@ -{% extends "base.html" %} -{% from "components/page-header.html" import page_header %} - -{% from "components/copy-to-clipboard.html" import copy_to_clipboard %} - -{% block per_page_title %} - Billing details -{% endblock %} - -{% block content_column_content %} - - {{ page_header('Billing details') }} - -- You can use the information on this page to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order (PO). -
- -- Contact us if you need any other details. -
- -- Cabinet Office -
- -
- The White Chapel Building
- 10 Whitechapel High Street
- London
- E1 8QS
-
- National Westminster Bank PLC (part of RBS group)
- Government Banking Services Branch
- 2nd Floor
- 280 Bishopsgate
- London
- EC2M 4RB
-
- Cabinet Office -
- -
- SSCL – Accounts Receivable
- PO Box 221
- Thornton-Cleveleys
- Blackpool
- Lancashire
- FY1 9JN
-