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

Check if copy method is copy before sending comment email #29911

Merged
merged 4 commits into from
Oct 24, 2020

Conversation

JeroenVanLeusden
Copy link
Member

@JeroenVanLeusden JeroenVanLeusden commented Sep 4, 2020

Description (*)

As seen in the comments email copies should only be sent as separated emails if their copy method is copy.

Related Pull Requests

None I could find.

Fixed Issues (if relevant)

None I could find.

Manual testing scenarios (*)

  1. Enable sales_email/order_comment/enabled

  2. Add email address to sales_email/order_comment/copy_to

  3. Set sales_email/order_comment/copy_method to bcc (default value).

  4. Place order.

  5. Add order comment in order overview (adminhtml area) and uncheck notify customer.

  6. Email copy should not be send because notify customer is disabled and copy set to bcc.

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

Resolved issues:

  1. resolves [Issue] Check if copy method is copy before sending comment email #29915: Check if copy method is copy before sending comment email

@m2-assistant
Copy link

m2-assistant bot commented Sep 4, 2020

Hi @JeroenVanLeusden. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@ghost ghost added this to Pending Review in Pull Requests Dashboard Sep 4, 2020
@magento-engcom-team magento-engcom-team added Component: Sales Release Line: 2.4 Partner: Reach Digital Pull Request is created by partner Reach Digital partners-contribution Pull Request is created by Magento Partner labels Sep 4, 2020
@sidolov sidolov added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround. labels Sep 4, 2020
@sidolov
Copy link
Contributor

sidolov commented Sep 4, 2020

@magento create issue

Copy link
Contributor

@sidolov sidolov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JeroenVanLeusden could you please cover changes with automated test?

@ghost ghost moved this from Pending Review to Changes Requested in Pull Requests Dashboard Sep 4, 2020
@ghost ghost assigned sidolov Sep 4, 2020
@engcom-Charlie engcom-Charlie self-assigned this Sep 7, 2020
@engcom-Charlie
Copy link
Contributor

Hi @JeroenVanLeusden, please cover your changes by automated test. Otherwise, we can't proceed with your PR.
Thank you.

@JeroenVanLeusden
Copy link
Member Author

@sidolov Will do. However shouldn't we remove the entire ifelse statement and only send a copy/bcc if the customer itself actually receives an email?

@sidolov
Copy link
Contributor

sidolov commented Sep 11, 2020

@JeroenVanLeusden do you mean to send an email when $notify === true only?

@JeroenVanLeusden
Copy link
Member Author

@sidolov Correct

@sidolov
Copy link
Contributor

sidolov commented Sep 14, 2020

If we are going to be consistent with the comment

// Email copies are sent as separated emails if their copy method is 'copy' or a customer should not be notified

and I believe it's a right way to preserve backward compatible behavior, we should remove the esle statement and just add one more if expression like:

if (!$notify || $this->identityContainer->getCopyMethod() === 'copy') {
    $sender->sendCopyTo();
}

@JeroenVanLeusden
Copy link
Member Author

Fine by me. Will update this when i find some spare time.

@engcom-Charlie
Copy link
Contributor

Hi @JeroenVanLeusden, will you continue with this PR?
Thank you.

@JeroenVanLeusden
Copy link
Member Author

It's still on my todo list, hopefully will have some time end of this week.

@JeroenVanLeusden
Copy link
Member Author

@magento run all tests

@engcom-Charlie
Copy link
Contributor

@magento run all tests

@engcom-Charlie engcom-Charlie moved this from Changes Requested to Pending Review in Pull Requests Dashboard Oct 13, 2020
@ghost ghost moved this from Pending Review to Ready for Testing in Pull Requests Dashboard Oct 16, 2020
@ghost ghost assigned gabrieldagama Oct 16, 2020
@magento-engcom-team
Copy link
Contributor

Hi @gabrieldagama, thank you for the review.
ENGCOM-8348 has been created to process this Pull Request
✳️ @gabrieldagama, could you please add one of the following labels to the Pull Request?

Label Description
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests
Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests
Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests

@engcom-Alfa engcom-Alfa self-assigned this Oct 16, 2020
@engcom-Alfa engcom-Alfa moved this from Ready for Testing to Testing in Progress in Pull Requests Dashboard Oct 16, 2020
@engcom-Alfa engcom-Alfa added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Oct 16, 2020
@engcom-Alfa
Copy link
Contributor

✔️ QA Passed

Case 1

Manual testing scenario:

  1. Go to Admin -> Stores -> Configuration -> Sales -> Sales Email -> Order Comments and set Enabled to Yes
  2. Add email address to Send Order Comment Email Copy To
  3. Set Send Order Comments Email Copy Method to Bcc
  4. Place order.
  5. Add order comment in order overview (adminhtml area) and uncheck notify customer.

Before: ✖️ a copy of the email was sent (but shouldn't have been sent because the customer notification was turned off and the copy was set to a hidden copy.)

Screenshot from 2020-10-16 15-07-38

After: ✔️ email copy wasn't sent

Case 2

Manual testing scenario:

  1. Go to Admin -> Stores -> Configuration -> Sales -> Sales Email -> Order Comments and set Enabled to Yes
  2. Add email address to Send Order Comment Email Copy To
  3. Set Send Order Comments Email Copy Method to Bcc
  4. Place order.
  5. Add order comment in order overview (adminhtml area) and check notify customer.

After: ✔️ email copy was sent

@engcom-Alfa engcom-Alfa added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Oct 19, 2020
@engcom-Alfa engcom-Alfa moved this from Testing in Progress to Extended Testing (optional) in Pull Requests Dashboard Oct 19, 2020
@engcom-Alfa engcom-Alfa moved this from Extended Testing (optional) to Merge in Progress in Pull Requests Dashboard Oct 19, 2020
@magento-engcom-team magento-engcom-team merged commit ef74d31 into magento:2.4-develop Oct 24, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 24, 2020

Hi @JeroenVanLeusden, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ghost ghost moved this from Merge in Progress to Recently Merged in Pull Requests Dashboard Oct 24, 2020
@JeroenVanLeusden JeroenVanLeusden deleted the patch-1 branch February 10, 2021 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Component: Sales Event: MageCONF CD 2020 Partner: Reach Digital Pull Request is created by partner Reach Digital partners-contribution Pull Request is created by Magento Partner Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround.
Projects
Pull Requests Dashboard
  
Recently Merged
Development

Successfully merging this pull request may close these issues.

[Issue] Check if copy method is copy before sending comment email
6 participants