18240 - Fixed Expiring Soon Emails

queue_services/entity-emailer/src/entity_emailer/email_processors/nr_notification.py

@@ -57,7 +57,7 @@ def __get_instruction_group(legal_type):
     if __is_colin(legal_type):
         return 'colin'
     if _is_society(legal_type):
-            return 'so'
+        return 'so'
     return ''
 
 
@@ -101,8 +101,8 @@ def process(email_info: dict, option) -> dict:  # pylint: disable-msg=too-many-l
 
     file_name_suffix = option.upper()
     if option == Option.BEFORE_EXPIRY.value:
-        if 'legalType' in nr_data:
-            legal_type = nr_data['legalType']
+        if 'entity_type_cd' in nr_data:
+            legal_type = nr_data['entity_type_cd']
             group = __get_instruction_group(legal_type)
             if group:
                 instruction_group = '-' + group

queue_services/entity-emailer/src/entity_emailer/email_templates/NR-BEFORE-EXPIRY-COLIN.html

@@ -4,19 +4,19 @@
 
 If your name request expires:
 
-* The approved name is no longer reserved for business registration and becomes available to the public
+* The approved name is no longer reserved for completing an application and becomes available to the public
 * You will need to submit and pay for a new name request
 
-Finish registering a business with this name before it expires. If you are not ready to register a business yet, you can renew this name request to extend the expiry date.
+Finish completing an application with this name before it expires. If you are not ready to completing an application yet, you can renew this name request to extend the expiry date.
 
 ---
 
-# Option 1: Finish Registering a Business
+# Option 1: Finish completing an application
 
-Follow these steps to register your business using the approved name:
+Follow these steps to completing an application using the approved name:
 
 1. Visit [BC Corporate Online]( {{ corp_online_url }})
-2. Register the business with this name by filing an Incorporation Application
+2. complete application with this name by filing an Incorporation Application
 
 If you don't have a BC Registries Account, [create one here]({{ decide_business_url }})
 

queue_services/entity-emailer/src/entity_emailer/email_templates/NR-BEFORE-EXPIRY-MODERNIZED.html

@@ -4,21 +4,21 @@
 
 If your name request expires:
 
-* The approved name is no longer reserved for business registration and becomes available to the public
+* The approved name is no longer reserved for completing an application and becomes available to the public
 * You will need to submit and pay for a new name request
 
-Finish registering a business with this name before it expires. If you are not ready to register a business yet, you can renew this name request to extend the expiry date.
+Finish completing an application with this name before it expires. If you are not ready to complete an application yet, you can renew this name request to extend the expiry date.
 
 ---
 
-# Option 1: Finish Registering a Business
+# Option 1: Finish completing an application
 
-Follow these steps to register your business using the approved name:
+Follow these steps to completing an application using the approved name:
 
 1. Visit [BC Registries and Online Services]({{ name_request_url }})
 2. Log in with your BC Registries Account
 3. Look up your Name Request
-4. Register the business with this name by following the instructions
+4. completing an application with this name by following the instructions
 
 If you don't have a BC Registries Account, [create one here]({{ decide_business_url }})
 

queue_services/entity-emailer/src/entity_emailer/email_templates/NR-BEFORE-EXPIRY-SO.html

@@ -4,16 +4,16 @@
 
 If your name request expires:
 
-* The approved name is no longer reserved for business registration and becomes available to the public
+* The approved name is no longer reserved for business completion and becomes available to the public
 * You will need to submit and pay for a new name request
 
-Finish registering a business with this name before it expires. If you are not ready to register a business yet, you can renew this name request to extend the expiry date.
+Finish completing an application with this name before it expires. If you are not ready to completing an application yet, you can renew this name request to extend the expiry date.
 
 ---
 
-# Option 1: Finish Registering a Business
+# Option 1: Finish completing an application
 
-Follow these steps to register your business using the approved name:
+Follow these steps to completing your application using the approved name:
 
 1. Visit {{ societies_url }}
 2. Log in with your BCeID