Sre emails

queue_services/entity-emailer/devops/vaults.json

@@ -15,5 +15,12 @@
             "sentry",
             "launchdarkly"
         ]
+    },
+    {
+        "vault": "web-url",
+        "application": [
+            "name-request",
+            "bcregistry"
+        ]
     }
 ]

queue_services/entity-emailer/src/entity_emailer/config.py

@@ -138,6 +138,9 @@ class _Config():  # pylint: disable=too-few-public-methods
         'subject': os.getenv('NATS_ENTITY_EVENT_SUBJECT', 'entity.events'),
     }
 
+    NAME_REQUEST_URL = os.getenv('NAME_REQUEST_URL', '')
+    DECIDE_BUSINESS_URL = os.getenv('DECIDE_BUSINESS_URL', '')
+
 
 class DevConfig(_Config):  # pylint: disable=too-few-public-methods
     """Creates the Development Config object."""

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

@@ -72,13 +72,18 @@ def process(email_info: dict, option) -> dict:  # pylint: disable-msg=too-many-l
             legal_name = n_item['name']
             break
 
+    name_request_url = current_app.config.get('NAME_REQUEST_URL')
+    decide_business_url = current_app.config.get('DECIDE_BUSINESS_URL')
+
     # render template with vars
     mail_template = Template(filled_template, autoescape=True)
     html_out = mail_template.render(
         nr_number=nr_number,
         expiration_date=expiration_date,
         legal_name=legal_name,
-        refund_value=refund_value
+        refund_value=refund_value,
+        name_request_url=name_request_url,
+        decide_business_url=decide_business_url
     )
 
     # get recipients

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

@@ -1,21 +1,50 @@
-Your name request {{ nr_number }} for the approved name **{{ legal_name }}** is due to expire on {{ expiration_date }}.
+# Your Name Request is Expiring Soon
 
-If your name request expires, you will need to pay for another name request, and wait for it to be reviewed.
+Your name request {{ nr_number }} for **{{ legal_name }}** is due to expire on {{ expiration_date }}.
 
-As well, if your name request expires, the approved name becomes available to the public.
+If your name request expires:
 
-We recommend that you use your name request before it expires, or go to [www.bcregistry.ca/namerequest](www.bcregistry.ca/namerequest) and renew your name request.
+* The approved name is no longer reserved for business registration and becomes available to the public
+* You will need to submit and pay for a new name request
 
-To renew your 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.
 
-* Go to [www.bcregistry.ca/namerequest](www.bcregistry.ca/namerequest)
-* Go to the "Manage My Name Request" tab
-* Enter the NR number ({{ nr_number }}), and applicant's phone number or email address
-* Click the "Retrieve Name Request" button
-* Click "Renew Name Request ($30)"
-* Pay
+---
 
-Name requests are renewed for an additional 56 days from the original expiry date, with the exception of restoration or reinstatements, which are renewed for 1 year and 56 days.
+# Option 1: Finish Registering a Business
 
+Follow these steps to register your business 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
+
+If you don't have a BC Registries Account, [create one here]({{ decide_business_url }})
+
+---
+
+# Option 2: Renew your Name Request
+
+You may renew your name request to extend the expiry date by 56 days from te original date of expiry:
+
+1. Visit [BC Registries and Online Services]({{ name_request_url }})
+2. Click on the "Manage My Name Request" tab
+3. Enter the NR number, and applicant's phone number or email address
+4. Click the "Retrieve Name Request" button
+5. Click "Resubmit Name Request ($30)"
+6. Make a Payment
+
+---
+
+# Your Name Request Details
+
+**Name Request Number:**
+{{ nr_number }}
+
+**Name Request Expiry Date and Time:**
+{{ expiration_date }}
+
+---
 
 [[nr-footer.html]]

queue_services/entity-emailer/src/entity_emailer/email_templates/NR-EXPIRED.html

@@ -1,8 +1,32 @@
-Your BC Registries Name Request number {{ nr_number }} has expired, and the approved name **{{ legal_name }}** is no longer reserved for your use.
+# Your Name Request has Expired
 
-If you still wish to use this name, please go to [www.bcregistry.ca/namerequest](www.bcregistry.ca/namerequest) to look up {{ nr_number }} under the Manage My Name Request tab and click the Resubmit button to submit a new Name Request for this name.
+Your Name Request ({{ nr_number }}) has expired and the approved name **{{ legal_name }}** is no longer reserved for your use. You may resubmit your name request within 2 weeks if you are still interested registering a business with this name.
 
-Note: Name availability is not guaranteed until it has been reviewed by staff.
+---
 
+# Resubmitting the same Name Request
+
+Follow these steps to resubmit a name request:
+
+1. Visit [BC Registries and Online Services]({{ name_request_url }})
+2. Click on the "Manage My Name Request" tab
+3. Enter the NR number, and applicant's phone number or email address
+4. Click the "Retrieve Name Request" button
+5. Click "Resubmit Name Request ($30)"
+6. Make a Payment
+
+\*Name availability is not guaranteed until it has been reviewed by staff.
+
+---
+
+# Your Name Request Details
+
+**Name Request Number:**
+{{ nr_number }}
+
+**Name Request Expiry Date and Time:**
+{{ expiration_date }}
+
+---
 
 [[nr-footer.html]]