Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

18240-NR Letters-Society #1485

Merged
merged 4 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions api/namex/resources/name_requests/report_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ def email_report(self, nr_id):
CORP_FORMS_URL = current_app.config.get('CORP_FORMS_URL')
CORP_ONLINE_URL = current_app.config.get('COLIN_URL')
NAME_REQUEST_URL = current_app.config.get('NAME_REQUEST_URL')
SOCIETIES_URL = current_app.config.get('SOCIETIES_URL')
email_body = email_body.replace('{{NAME_REQUEST_URL}}', NAME_REQUEST_URL)
email_body = email_body.replace('{{NAMEREQUEST_NUMBER}}', nr_model.nrNum)
email_body = email_body.replace('{{BUSINESS_URL}}', DECIDE_BUSINESS_URL)
email_body = email_body.replace('{{CORP_ONLINE_URL}}', CORP_ONLINE_URL)
email_body = email_body.replace('{{CORP_FORMS_URL}}', CORP_FORMS_URL)
email_body = email_body.replace('{{SOCIETIES_URL}}', SOCIETIES_URL)

email = {
'recipients': recipients,
Expand Down Expand Up @@ -247,7 +249,8 @@ def _get_template_data(nr_model):
nr_report_json['isXPRO'] = isXPRO
nr_report_json['isModernized'] = ReportResource._is_modernized(nr_model.entity_type_cd)
nr_report_json['isColin'] = ReportResource._is_colin(nr_model.entity_type_cd)
nr_report_json['isPaper'] = not (ReportResource._is_colin(nr_model.entity_type_cd) or ReportResource._is_modernized(nr_model.entity_type_cd))
nr_report_json['isSociety'] = ReportResource._is_society(nr_model.entity_type_cd)
nr_report_json['isPaper'] = not (ReportResource._is_colin(nr_model.entity_type_cd) or ReportResource._is_modernized(nr_model.entity_type_cd) or ReportResource._is_society(nr_model.entity_type_cd))
nr_report_json['requestCodeDescription'] = \
ReportResource._get_request_action_cd_description(nr_report_json['request_action_cd'])
nr_report_json['nrStateDescription'] = \
Expand Down Expand Up @@ -330,7 +333,7 @@ def _get_request_action_cd_description(request_cd: str):
def _get_state_cd_description(state_cd: str):
nr_state_description = {
'APPROVED': 'Approved',
'CONDITIONAL': 'Conditional Approval',
'CONDITIONAL': 'Conditionally Approved',
'REJECTED': 'Rejected',
'CONSUMED': 'Consumed',
'EXPIRED': 'Expired'
Expand Down Expand Up @@ -380,6 +383,11 @@ def _is_modernized(legal_type):
def _is_colin(legal_type):
colin_list = ['CR', 'UL', 'CC', 'XCR', 'XUL', 'RLC']
return legal_type in colin_list

@staticmethod
def _is_society(legal_type):
society_list = ['SO', 'XSO']
return legal_type in society_list


@staticmethod
Expand All @@ -388,6 +396,8 @@ def _get_instruction_group(legal_type):
return 'modernized'
if ReportResource._is_colin(legal_type):
return 'colin'
if ReportResource._is_society(legal_type):
return 'so'
return ''

@staticmethod
Expand Down Expand Up @@ -517,7 +527,7 @@ def _get_next_action_text(entity_type_cd: str):
},
'SO': {
'DEFAULT': f'To complete your filing, visit <a href="{url}">'
f'{url}</a> for more information'
f'{url}</a> and login with your BCeID.'
},
'PA': {
'DEFAULT': ReportResource.GENERIC_STEPS
Expand Down Expand Up @@ -558,7 +568,7 @@ def _get_next_action_text(entity_type_cd: str):
},
'XSO': {
'DEFAULT': f'To complete your filing, visit <a href="{url}">'
f'{url}</a> for more information'
f'{url}</a> and login with your BCeID.'
},
# Used for mapping back to legacy oracle codes, description not required
'FIRM': {
Expand Down
39 changes: 39 additions & 0 deletions api/report-templates/emails/approved-so.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Results of your Name Request

Your Name Request is **approved**. Follow the steps below to register a business with this name. If the name request expires before the business is registered, a new name request will be required.

---

# You\'re not done yet!

Follow these steps to register your business using this name:

1. Visit [Societies Online]({{SOCIETIES_URL}})
2. Log in with BCeID
3. Complete your Society application with the approved Name Request Number

---

# Your Name Request Details

**Name Request Number:**
{{NAMEREQUEST_NUMBER}}

**Name Request Expiry Date and Time:**
{{EXPIRATION_DATE}}

---

# Attached to this Email

The following documents are attached to this email:

* Results of Name Request

---

**Business Registry**
BC Registries and Online Services
Toll Free: 1-877-370-1033
Victoria Office: 250-370-1033
Email: [BCRegistries@gov.bc.ca](BCRegistries@gov.bc.ca)
41 changes: 41 additions & 0 deletions api/report-templates/emails/conditional-so.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Results of your Name Request

Your Name Request is **conditionally approved**. Follow the steps below to register a business with this name. If the name request expires before the business is registered, a new name request will be required.

---

# Your Next Steps

Follow these steps to register your business using this name:

1. Send in your consent letter to BCregistries@gov.bc.ca
2. Receive confirmation that the consent letter has been accepted
3. Visit [Societies Online]({{SOCIETIES_URL}})
4. Log in with your BCeID
5. Complete your Society application with the approved Name Request Number

---

# Your Name Request Details

**Name Request Number:**
{{NAMEREQUEST_NUMBER}}

**Name Request Expiry Date and Time:**
{{EXPIRATION_DATE}}

---

# Attached to this Email

The following documents are attached to this email:

* Results of Name Request

---

**Business Registry**
BC Registries and Online Services
Toll Free: 1-877-370-1033
Victoria Office: 250-370-1033
Email: [BCRegistries@gov.bc.ca](BCRegistries@gov.bc.ca)
13 changes: 10 additions & 3 deletions api/report-templates/nameRequest.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
RESULTS OF NAME REQUEST
</div>
<div class="report-type-desc">
{% if isSociety %}
<span class="highlighted-blue-text mt-1">Societies </span>

{% else %}
{{ entityTypeDescription }} - {{ legalAct}}
{% endif %}
</div>
</td>
</tr>
Expand All @@ -42,7 +47,7 @@
<div class="section-title-gray pt-4">Next Step(s):</div>
<table role="presentation">
{% if consentFlag in ['Y', 'R'] %}
{% if not isPaper%}
{% if not isPaper %}
<tr>
{% if consentFlag=='R' %}
<td class="checkbox">
Expand Down Expand Up @@ -99,24 +104,26 @@
{% if isModernized %}
<span class="section-data mt-2">You will need your NR Number and Applicant phone number or email address to access your Name Request.</span>
{% endif %}
{% if isColin %}
{% if isColin or isSociety %}
<span class="section-data mt-2">You will need your NR Number.</span>
{% endif %}
</td>
</tr>
{% endif %}
{% if isPaper %}
<tr>
{% if not isSociety %}
<td class="{{ 'mt-2 checkbox' if consentFlag in ['Y', 'R'] else 'checkbox' }}">
<img alt="" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTFweCIgaGVpZ2h0PSIxMXB4IiB2aWV3Qm94PSIwIDAgMTEgMTEiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8dGl0bGU+Y2hlY2tib3gtYmxhbmstb3V0bGluZSBjb3B5PC90aXRsZT4KICAgIDxnIGlkPSJGaW5hbC1PdXRwdXRzIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8ZyBpZD0iUGcxLVJlc3VsdHMtLUFwcHJvdmVkLUNvbmNlbnQtUmVjZWl2ZWQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC01MS4wMDAwMDAsIC01NDEuMDAwMDAwKSIgZmlsbD0iIzIzNDA3NSIgZmlsbC1ydWxlPSJub256ZXJvIj4KICAgICAgICAgICAgPGcgaWQ9ImNoZWNrYm94LWJsYW5rLW91dGxpbmUtY29weSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNTEuMDAwMDAwLCA1NDEuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNOS43Nzc3Nzc3OCwwIEwxLjIyMjIyMjIyLDAgQzAuNTQzODg4ODg5LDAgMCwwLjU0Mzg4ODg4OSAwLDEuMjIyMjIyMjIgTDAsOS43Nzc3Nzc3OCBDMCwxMC40NTI3OTI1IDAuNTQ3MjA3NTI4LDExIDEuMjIyMjIyMjIsMTEgTDkuNzc3Nzc3NzgsMTEgQzEwLjQ1Mjc5MjUsMTEgMTEsMTAuNDUyNzkyNSAxMSw5Ljc3Nzc3Nzc4IEwxMSwxLjIyMjIyMjIyIEMxMSwwLjU0Mzg4ODg4OSAxMC40NSwwIDkuNzc3Nzc3NzgsMCBNOS43Nzc3Nzc3OCwxLjIyMjIyMjIyIEw5Ljc3Nzc3Nzc4LDkuNzc3Nzc3NzggTDEuMjIyMjIyMjIsOS43Nzc3Nzc3OCBMMS4yMjIyMjIyMiwxLjIyMjIyMjIyIEw5Ljc3Nzc3Nzc4LDEuMjIyMjIyMjIgWiIgaWQ9IlNoYXBlIj48L3BhdGg+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==">
</td>
<td>
{% if consentFlag in ['Y', 'R'] %}
<span class="section-data mt-2">Complete and submit the form along with the consent letter and any additional required documentation and payment</span>
{% else %}
{% else %}
<span class="section-data mt-2">Complete and submit the form along with any required documentation and payment</span>
{% endif %}
</td>
{% endif %}
</tr>
{% endif %}
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
<div class="bold pt-2">Approval Date:</div>
</td>
<td>
<div>{{entityTypeDescription}}</div>
<div>
{% if isSociety %}
<span>Society</span>
{% else %}
{{entityTypeDescription}}</div>
{% endif %}
<div class="pt-2">{{ nrStateDescription }}</div>
<div class="pt-2">{{ requestCodeDescription }}</div>
<div class="pt-2">{{ approvalDate }} Pacific Time</div>
Expand Down
Loading