-
Notifications
You must be signed in to change notification settings - Fork 9
[OSDEV-1721] SLC. Customer Comms for SLC workflow #536
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
Merged
Merged
Changes from 29 commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
2454bf0
added basic logic to send email through different actions.
roman-stolar 210fc6f
added email templated + added send email logic
roman-stolar 1c8f7d4
filled templates
roman-stolar a12a5b1
fix
roman-stolar 6196cd7
applied all data to email templates
roman-stolar 14c91e8
Merge branch 'main' into OSDEV-1721-customer-comms-slc-workflow
roman-stolar 803e516
fix linter errors
roman-stolar 5ce4ff3
fix linter
roman-stolar 2f04dbe
Update template and data for "Email 1: OS ID exists / additional cont…
roman-stolar 374324b
fix
roman-stolar 1892c18
Update template and data for "Email 2: OS ID exists / additional cont…
roman-stolar 4677b58
Update template and data for "Email 4: OS ID does not exist / new fac…
roman-stolar 085f504
fix linter
roman-stolar b6972a1
Update template and data for "Email 3: OS ID exists / additional cont…
roman-stolar b6a7be6
Merge branch 'main' into OSDEV-1721-customer-comms-slc-workflow
roman-stolar 9941435
update field name
roman-stolar 91c64a3
fix linter
roman-stolar 1bb0b62
updated body .txt with links
roman-stolar aaad513
updated sender
roman-stolar aed339e
fixes
roman-stolar a6052a6
updated release notes
roman-stolar 49d74e5
fix linter
roman-stolar 3c6e477
small improvements
roman-stolar 55cae64
fix
roman-stolar 4d5cf0a
fix Vlad comments
roman-stolar f72d19e
fix code rabbit comment
roman-stolar 6180343
fix linter
roman-stolar 793d86a
Merge branch 'main' into OSDEV-1721-customer-comms-slc-workflow
roman-stolar d37ccc5
added logic to send email only for SLC request
roman-stolar fd53a8d
fetch is_claimed data from FacilityClaim
roman-stolar 31cdafe
fix
roman-stolar 1e6c3e3
Updated unit tests to cover new email templates sending
roman-stolar b051f5d
fix fail test
roman-stolar ae06821
fix tests
roman-stolar 03a6b4f
Merge branch 'main' into OSDEV-1721-customer-comms-slc-workflow
roman-stolar c92cf4d
fix linter
roman-stolar 33b46c3
fixes
roman-stolar db0c46c
fixed test
roman-stolar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/django/api/templates/mail/slc_additional_info_confirmation_body.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title> | ||
| Thank You for Your Submission – It Is Now Being Reviewed | ||
| </title> | ||
| </head> | ||
| <body> | ||
| <p>Hello,</p> | ||
| <p> | ||
| Thank you for submitting your production location information to <a href="https://info.opensupplyhub.org/">Open Supply Hub</a> (OS Hub)! | ||
| </p> | ||
| <p> | ||
| Our team is now reviewing your submission to ensure it can be assigned an <a href="https://info.opensupplyhub.org/resources/a-free-universal-id-matching-algorithm">OS ID</a>. This | ||
| process may take up to 15 business days. | ||
| </p> | ||
| <p> | ||
| Once the review is complete, you will receive an email confirming your OS ID. If we need any | ||
| additional information, we will contact you at this email address. | ||
| </p> | ||
| <p> | ||
| <b>Here are the details of your submission:</b> | ||
| </p> | ||
| <ul> | ||
| <li>Production Location Name: {{ pl_name }}</li> | ||
| <li>Production Location Address: {{ pl_address }}</li> | ||
| <li>Production Location Country: {{ pl_country }}</li> | ||
| </ul> | ||
| <p> | ||
| <b>If you have also requested to <a href="https://info.opensupplyhub.org/resources/claim-a-facility">claim this location</a>:</b> After your OS ID is confirmed, we will | ||
| review the documents you submitted to claim the location and either approve or deny the claim. | ||
| You will also receive an email when this stage is complete. | ||
| </p> | ||
| <p> | ||
| Thank you for sharing your information! Your data helps open doors to safe and sustainable | ||
| supply chains. | ||
| </p> | ||
| <p>Best Regards,</p> | ||
| {% include "mail/signature_block.html" %} | ||
| </body> | ||
| </html> |
27 changes: 27 additions & 0 deletions
27
src/django/api/templates/mail/slc_additional_info_confirmation_body.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| {% block content %} | ||
| Hello, | ||
|
|
||
| Thank you for submitting your production location information to Open Supply Hub (https://info.opensupplyhub.org/) (OS Hub)! | ||
|
|
||
| Our team is now reviewing your submission to ensure it can be assigned an OS ID. | ||
| This process may take up to 15 business days. | ||
|
|
||
| Once the review is complete, you will receive an email confirming your OS ID (https://info.opensupplyhub.org/resources/a-free-universal-id-matching-algorithm). | ||
| If we need any additional information, we will contact you at this email address. | ||
|
|
||
| Here are the details of your submission: | ||
| - Production Location Name: {{ pl_name }} | ||
| - Production Location Address: {{ pl_address }} | ||
| - Production Location Country: {{ pl_country }} | ||
|
|
||
| If you have also requested to claim this location (https://info.opensupplyhub.org/resources/claim-a-facility): After your OS ID is confirmed, we will | ||
| review the documents you submitted to claim the location and either approve or deny the claim. | ||
| You will also receive an email when this stage is complete. | ||
|
|
||
| Thank you for sharing your information! Your data helps open doors to safe and sustainable | ||
| supply chains. | ||
|
|
||
| Best Regards, | ||
|
|
||
| {% include "mail/signature_block.txt" %} | ||
| {% endblock content %} |
1 change: 1 addition & 0 deletions
1
src/django/api/templates/mail/slc_additional_info_confirmation_subject.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Thank You for Your Submission – It Is Now Being Reviewed |
58 changes: 58 additions & 0 deletions
58
src/django/api/templates/mail/slc_contribution_approval_body.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title> | ||
| Great News: your OS ID is ready! | ||
| </title> | ||
| </head> | ||
| <body> | ||
| <p> | ||
| Hello, | ||
| </p> | ||
| <p> | ||
| Thank you for submitting your production location information to <a href="https://info.opensupplyhub.org/">Open Supply Hub</a> (OS Hub)! | ||
| </p> | ||
| <p> | ||
| You can now: | ||
| </p> | ||
| <ol> | ||
| <li> | ||
| <p> | ||
| <b>Save your OS ID and the public link</b> to your production location profile and share it | ||
| with clients and stakeholders: | ||
| </p> | ||
| <ul> | ||
| <li>OS ID: {{ os_id }}</li> | ||
| <li>Public link: {{ location_url }}</li> | ||
| </ul> | ||
| </li> | ||
| {% if not is_claimed %} | ||
| <li> | ||
| <p> | ||
| <b>Claim your production location</b> to take control of | ||
| your data and make it visible to more global partners. It’s free and only takes a few | ||
| steps! <b><a href="{{ pl_claim_url }}">Claim my production location now</a></b>. | ||
| </p> | ||
| </li> | ||
| {% endif %} | ||
| <li> | ||
| <p> | ||
| <b>Learn more about the OS ID</b> and how to use it to advance your business | ||
| in this <a href="https://info.opensupplyhub.org/facilities">Guide for Facilities</a>. | ||
| </p> | ||
| </li> | ||
| </ol> | ||
| {% if is_claimed %} | ||
| <p> | ||
| <b>We will now review the documents you submitted to <a href="https://info.opensupplyhub.org/resources/claim-a-facility">claim the location</a> | ||
| and either approve or deny the claim.</b> Review of claims typically takes 7 - 10 business days. | ||
| You will receive another email when this stage is complete. | ||
| </p> | ||
| {% endif %} | ||
| <p> | ||
| Thank you for sharing your information! Your data helps open doors to safe and sustainable | ||
| supply chains. | ||
| </p> | ||
| {% include "mail/signature_block.html" %} | ||
| </body> | ||
| </html> |
32 changes: 32 additions & 0 deletions
32
src/django/api/templates/mail/slc_contribution_approval_body.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| {% block content %} | ||
| Hello, | ||
|
|
||
| Thank you for submitting your production location information to Open Supply Hub (https://info.opensupplyhub.org/) (OS Hub)! | ||
|
|
||
| You can now: | ||
| 1. Save your OS ID and the public link to your production location profile and share it | ||
| with clients and stakeholders: | ||
| - OS ID: {{ os_id }} | ||
| - Public link: {{ location_url }} | ||
| {% if not is_claimed %} | ||
| 2. Claim your production location to take control of | ||
| your data and make it visible to more global partners. It’s free and only takes a few | ||
| steps! Claim my production location now ({{ pl_claim_url }}). | ||
| 3. Learn more about the OS ID and how to use it to advance your business in this Guide for Facilities (https://info.opensupplyhub.org/facilities). | ||
| {% else %} | ||
| 2. Learn more about the OS ID and how to use it to advance your business in this Guide for Facilities (https://info.opensupplyhub.org/facilities). | ||
| {% endif %} | ||
|
|
||
| {% if is_claimed %} | ||
| We will now review the documents you submitted to claim the location (https://info.opensupplyhub.org/resources/claim-a-facility) | ||
| and either approve or deny the claim. Review of claims typically takes 7 - 10 business days. | ||
| You will receive another email when this stage is complete. | ||
| {% endif %} | ||
|
|
||
| Thank you for sharing your information! Your data helps open doors to safe and sustainable | ||
| supply chains. | ||
|
|
||
| Best Regards, | ||
|
|
||
| {% include "mail/signature_block.txt" %} | ||
| {% endblock content %} |
1 change: 1 addition & 0 deletions
1
src/django/api/templates/mail/slc_contribution_approval_subject.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Great News: your OS ID is ready! |
50 changes: 50 additions & 0 deletions
50
src/django/api/templates/mail/slc_contribution_rejected_body.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title> | ||
| ACTION REQUESTED: We need more information to process your submission and provide an OS ID | ||
| </title> | ||
| </head> | ||
| <body> | ||
| <p> | ||
| Hello, | ||
| </p> | ||
| <p> | ||
| Thank you for submitting your production location information to <a href="https://info.opensupplyhub.org/">Open Supply Hub</a> (OS Hub)! | ||
| </p> | ||
| <p> | ||
| We weren’t able to accept your submission as provided. | ||
| To move forward and get an OS ID, please follow these steps: | ||
| </p> | ||
| <ol> | ||
| <li> | ||
| <p> | ||
| <b>Review the feedback below:</b> | ||
| </p> | ||
| <ul> | ||
| <li>{{ action_reason_text_raw }}</li> | ||
| </ul> | ||
| </li> | ||
| <li> | ||
| <p> | ||
| <b>Make the necessary updates</b> based on the feedback and <b>resubmit your information</b> | ||
| using this link: <b><a href="{{ pl_search_url }}">Resubmit Your Production Location</a></b> | ||
| </p> | ||
| </li> | ||
| </ol> | ||
| <p> | ||
| <b>Here are the details of your submission:</b> | ||
| </p> | ||
| <ul> | ||
| <li>Production Location Name: {{ pl_name }}</li> | ||
| <li>Production Location Address: {{ pl_address }}</li> | ||
| <li>Production Location Country: {{ pl_country }}</li> | ||
| </ul> | ||
| <p> | ||
| Thank you for sharing your information! Your data helps open doors to safe and sustainable | ||
| supply chains. | ||
| </p> | ||
| <p>Best Regards,</p> | ||
| {% include "mail/signature_block.html" %} | ||
| </body> | ||
| </html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.