From 728fdd63118644b341a261a602f01d07ef9484b2 Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Mon, 27 May 2024 10:39:36 -0700 Subject: [PATCH] clean up templates --- .../email_processors/__init__.py | 18 +--- .../email_templates/common/20px.html | 1 - .../common/base_template.jinja2 | 53 ----------- .../common/business-dashboard-link-alt.html | 4 - .../common/business-dashboard-link.html | 3 - .../email_templates/common/business-info.html | 67 -------------- .../common/business-information-block.jinja2 | 70 -------------- .../common/business-information.html | 71 --------------- .../email_templates/common/cra-notice.html | 14 --- .../email_templates/common/divider.html | 1 - .../email_templates/common/footer.html | 10 -- .../email_templates/common/header.html | 8 -- .../common/initiative-notice.html | 38 -------- .../email_templates/common/logo.html | 3 - .../email_templates/common/pdf-notice.html | 4 - .../common/reg-business-info.html | 40 -------- .../email_templates/common/style.html | 91 ------------------- .../common/whitespace-16px.html | 2 - .../common/whitespace-24px.html | 2 - 19 files changed, 1 insertion(+), 499 deletions(-) delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/20px.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/base_template.jinja2 delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link-alt.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/business-info.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/business-information-block.jinja2 delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/business-information.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/cra-notice.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/divider.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/footer.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/header.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/initiative-notice.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/logo.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/pdf-notice.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/reg-business-info.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/style.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/whitespace-16px.html delete mode 100644 services/emailer/src/namex_emailer/email_templates/common/whitespace-24px.html diff --git a/services/emailer/src/namex_emailer/email_processors/__init__.py b/services/emailer/src/namex_emailer/email_processors/__init__.py index 69356ad79..510e82c09 100644 --- a/services/emailer/src/namex_emailer/email_processors/__init__.py +++ b/services/emailer/src/namex_emailer/email_processors/__init__.py @@ -36,23 +36,7 @@ def substitute_template_parts(template_code: str) -> str: parts. There is no recursive search and replace. """ template_parts = [ - "business-dashboard-link", - "business-dashboard-link-alt", - "business-info", - "business-information", - "reg-business-info", - "cra-notice", - "nr-footer", - "footer", - "header", - "initiative-notice", - "logo", - "pdf-notice", - "style", - "divider", - "20px", - "whitespace-16px", - "whitespace-24px", + "nr-footer" ] # substitute template parts - marked up by [[filename]] diff --git a/services/emailer/src/namex_emailer/email_templates/common/20px.html b/services/emailer/src/namex_emailer/email_templates/common/20px.html deleted file mode 100644 index bd0e24dd2..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/20px.html +++ /dev/null @@ -1 +0,0 @@ -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/base_template.jinja2 b/services/emailer/src/namex_emailer/email_templates/common/base_template.jinja2 deleted file mode 100644 index cc8f9cf5f..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/base_template.jinja2 +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - {% block page_title %}{% endblock %} - {% include "./common/style.html" %} - - - - - - - - - - diff --git a/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link-alt.html b/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link-alt.html deleted file mode 100644 index fd3133c31..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link-alt.html +++ /dev/null @@ -1,4 +0,0 @@ -

- Your documents will be emailed to you. They will also be available on - your dashboard, for you to view and download at any time. -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link.html b/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link.html deleted file mode 100644 index db06eb807..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/business-dashboard-link.html +++ /dev/null @@ -1,3 +0,0 @@ -

- These documents are also available through your BC Business Registry account. -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/business-info.html b/services/emailer/src/namex_emailer/email_templates/common/business-info.html deleted file mode 100644 index 83112464b..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/business-info.html +++ /dev/null @@ -1,67 +0,0 @@ -[[20px.html]] -[[divider.html]] -[[20px.html]] - - - - {% if business.legalType == 'CP' %} - - {% elif business.legalType in ['SP', 'GP'] %} - - {% else %} - - {% endif %} - - {% if filing_status == 'PAID' and filing_type == 'incorporationApplication' %} - {% if filing.nameRequest.legalName %} - - - {% elif numbered_description %} - - - {% else %} - - - {% endif %} - {% elif business.businessName %} - - - {% endif %} - - - - {% if business.legalType in ['SP', 'GP'] %} - - {% else %} - - {% endif %} - {% if filing_status == 'PAID' and filing_type == 'incorporationApplication' %} - - {% else %} - - - {% endif %} - - - {% if business.taxId and business.taxId|length > 9 %} - - - - - {% endif %} - - - - - - - {% if header.isFutureEffective %} - - - - - {% endif %} - -[[20px.html]] -[[divider.html]] -[[20px.html]] diff --git a/services/emailer/src/namex_emailer/email_templates/common/business-information-block.jinja2 b/services/emailer/src/namex_emailer/email_templates/common/business-information-block.jinja2 deleted file mode 100644 index 824d3d148..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/business-information-block.jinja2 +++ /dev/null @@ -1,70 +0,0 @@ -{% include './common/20px.html' %} -{% include './common/divider.html' %} -{% include './common/20px.html' %} -
-
- {% if business.legalType == 'CP' %} -
Cooperative Association Name:
- {% elif business.legalType in ['SP', 'GP'] %} -
Business Name:
- {% else %} -
Company Name:
- {% endif %} - - {% if filing_status == 'PAID' and filing_type == 'incorporationApplication' %} - {% if filing.nameRequest.legalName %} - -
{{ filing.nameRequest.legalName }}
- {% elif numbered_description %} - -
{{ numbered_description }}
- {% else %} - -
Unknown
- {% endif %} - {% elif business.businessName %} - -
{{ business.businessName }}
- {% endif %} -
- - {% include './common/20px.html' %} -
- {% if business.legalType in ['SP', 'GP'] %} -
Registration Number:
- {% else %} -
Incorporation Number:
- {% endif %} - {% if filing_status == 'PAID' and filing_type == 'incorporationApplication' %} -
Pending
- {% else %} - -
{{ business.identifier }}
- {% endif %} -
- - {% if business.taxId and business.taxId|length > 9 %} - {% include './common/20px.html' %} -
-
Business Number:
-
{{ business.taxId }}
-
- {% endif %} - - {% include './common/20px.html' %} -
-
Date and Time of Filing:
-
{{ filing_date_time }}
-
- - {% if header.isFutureEffective %} - {% include './common/20px.html' %} -
-
Effective Date and Time:
-
{{ effective_date_time }}
-
- {% endif %} -
-{% include './common/20px.html' %} -{% include './common/divider.html' %} -{% include './common/20px.html' %} diff --git a/services/emailer/src/namex_emailer/email_templates/common/business-information.html b/services/emailer/src/namex_emailer/email_templates/common/business-information.html deleted file mode 100644 index 1e3026a9a..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/business-information.html +++ /dev/null @@ -1,71 +0,0 @@ -[[20px.html]] -[[divider.html]] -[[20px.html]] -
-
- {% if business.legalType == 'CP' %} -
Cooperative Association Name:
- {% elif business.legalType in ['SP', 'GP'] %} -
Business Name:
- {% else %} -
Company Name:
- {% endif %} - - {% if filing_status == 'PAID' and filing_type in ['amalgamationApplication', 'incorporationApplication'] %} - {% if filing.nameRequest.legalName %} - -
{{ filing.nameRequest.legalName }}
- {% elif numbered_description %} - -
{{ numbered_description }}
- {% else %} - -
Unknown
- {% endif %} - {% elif business.businessName %} - -
{{ business.businessName }}
- {% endif %} -
- - [[20px.html]] -
- {% if business.legalType in ['SP', 'GP'] %} -
Registration Number:
- {% else %} -
Incorporation Number:
- {% endif %} - {% if filing_status == 'PAID' and filing_type in ['amalgamationApplication', 'incorporationApplication'] %} -
Pending
- {% else %} - -
{{ business.identifier }}
- {% endif %} -
- - {% if business.taxId and business.taxId|length > 9 %} - [[20px.html]] -
-
Business Number:
-
{{ business.taxId }}
-
- {% endif %} - - [[20px.html]] -
-
Date and Time of Filing:
-
{{ filing_date_time }}
-
- - {% if header.isFutureEffective %} - [[20px.html]] -
-
Effective Date and Time:
-
{{ effective_date_time }}
-
- {% endif %} -
- -[[20px.html]] -[[divider.html]] -[[20px.html]] diff --git a/services/emailer/src/namex_emailer/email_templates/common/cra-notice.html b/services/emailer/src/namex_emailer/email_templates/common/cra-notice.html deleted file mode 100644 index 1a0177154..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/cra-notice.html +++ /dev/null @@ -1,14 +0,0 @@ -

- {% if business.legalType == 'CP' %} - Now that you have completed your incorporation, please - - visit the CRA website to request your business number. - - {% else %} - As part of a provincial–federal partnership, BC Registries and Online Services - and Canada Revenue Agency (CRA) have developed an agreement to assign a Business - Number to all companies operating in BC. As a result of this incorporation, a - Business number will be assigned to the company and will be emailed to the - company’s registered email address. - {% endif %} -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/divider.html b/services/emailer/src/namex_emailer/email_templates/common/divider.html deleted file mode 100644 index 2f44ee5dc..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/divider.html +++ /dev/null @@ -1 +0,0 @@ -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/footer.html b/services/emailer/src/namex_emailer/email_templates/common/footer.html deleted file mode 100644 index 43e9b7c72..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/footer.html +++ /dev/null @@ -1,10 +0,0 @@ -[[divider.html]] -

- diff --git a/services/emailer/src/namex_emailer/email_templates/common/header.html b/services/emailer/src/namex_emailer/email_templates/common/header.html deleted file mode 100644 index 8682491d5..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/header.html +++ /dev/null @@ -1,8 +0,0 @@ -
- - - - - -

-
diff --git a/services/emailer/src/namex_emailer/email_templates/common/initiative-notice.html b/services/emailer/src/namex_emailer/email_templates/common/initiative-notice.html deleted file mode 100644 index 509ab14f6..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/initiative-notice.html +++ /dev/null @@ -1,38 +0,0 @@ -
-

- As part of a provincial and federal partnership, BC Registries and Online - Services, our New West Partners, and other Canadian jurisdictions have - developed an agreement to share company information.​ -

- - -

 

- -

- The initiative will facilitate the updating of information to new or existing - extra provincial registrations of your BC company with one or more of the - partner jurisdictions. Select the jurisdictions you wish to be redirected - from the list below. You may want to submit a name search, register extra - provincially or update an existing extra provincial registration.​ -

- - -

 

- -

Our Partners:

- - - -

 

- -

- If your jurisdiction is not listed as one of BC's extraprovincial partners, you - must contact the jurisdiction you wish to register in directly in order to submit - a name request or complete an extraprovincial registration. -

-
diff --git a/services/emailer/src/namex_emailer/email_templates/common/logo.html b/services/emailer/src/namex_emailer/email_templates/common/logo.html deleted file mode 100644 index d245bc35c..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/logo.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Government of British Columbia -
diff --git a/services/emailer/src/namex_emailer/email_templates/common/pdf-notice.html b/services/emailer/src/namex_emailer/email_templates/common/pdf-notice.html deleted file mode 100644 index 4762ff796..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/pdf-notice.html +++ /dev/null @@ -1,4 +0,0 @@ -

- The PDF file format requires Adobe Reader to view. If required, download it at - https://get.adobe.com/reader/. -

diff --git a/services/emailer/src/namex_emailer/email_templates/common/reg-business-info.html b/services/emailer/src/namex_emailer/email_templates/common/reg-business-info.html deleted file mode 100644 index 97ecced6f..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/reg-business-info.html +++ /dev/null @@ -1,40 +0,0 @@ -[[20px.html]] -[[divider.html]] -[[20px.html]] -
-
-
Business name:
- {% if filing_type == 'registration' %} - {% if filing.nameRequest.legalName %} - -
{{ filing.nameRequest.legalName }}
- {% else %} - -
Unknown
- {% endif %} - {% else %} -
{{ business.businessName }}
- {% endif %} -
- - [[20px.html]] -
-
Registration number:
- {% if status == 'PAID' and filing_type == 'registration' %} -
Pending
- {% else %} - -
{{ business.identifier }}
- {% endif %} -
- - [[20px.html]] -
-
Date and time of filing:
-
{{ filing_date_time }}
-
-
- -[[20px.html]] -[[divider.html]] -[[20px.html]] diff --git a/services/emailer/src/namex_emailer/email_templates/common/style.html b/services/emailer/src/namex_emailer/email_templates/common/style.html deleted file mode 100644 index 55a2271d6..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/style.html +++ /dev/null @@ -1,91 +0,0 @@ - diff --git a/services/emailer/src/namex_emailer/email_templates/common/whitespace-16px.html b/services/emailer/src/namex_emailer/email_templates/common/whitespace-16px.html deleted file mode 100644 index be5b1687e..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/whitespace-16px.html +++ /dev/null @@ -1,2 +0,0 @@ - -

 

diff --git a/services/emailer/src/namex_emailer/email_templates/common/whitespace-24px.html b/services/emailer/src/namex_emailer/email_templates/common/whitespace-24px.html deleted file mode 100644 index d847b9801..000000000 --- a/services/emailer/src/namex_emailer/email_templates/common/whitespace-24px.html +++ /dev/null @@ -1,2 +0,0 @@ - -