Skip to content

Allow shipment update emails to be disabled #33166

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

Closed
wants to merge 1 commit into from

Conversation

kassner
Copy link
Contributor

@kassner kassner commented Jun 7, 2021

Description

Already in place for invoices and creditmemos:

https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml#L26-L30

https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml#L25-L29

Fixed Issues (if relevant)

  1. Fixes Cannot disable shipment update emails #33165

Manual testing scenarios

See #33165

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)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Jun 7, 2021

Hi @kassner. Thank you for your contribution
Here are 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
  13. Semantic Version Checker

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

@m2-community-project m2-community-project bot added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Jun 7, 2021
@eduard13 eduard13 self-assigned this Jun 9, 2021
@eduard13
Copy link
Contributor

eduard13 commented Jun 9, 2021

@magento run all tests

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

Copy link
Contributor

@eduard13 eduard13 left a comment

Choose a reason for hiding this comment

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

Hi @kassner, thank you for your contribution. Could you please cover this fix by any automated tests (MFTF, integration)?

Optionally, may I ask you for a minor adjustment, to move the admin__field admin__field-option div to if condition?

<div class="admin__field admin__field-option">
<?php if ($block->canSendCommentEmail()): ?>
<input name="history[is_customer_notified]"
type="checkbox"
id="history_notify"
class="admin__control-checkbox"
value="1" />
<label class="admin__field-label" for="history_notify">
<?= $block->escapeHtml(__('Notify Customer by Email')) ?>
</label>
<?php endif; ?>
</div>

ℹ️ The current failed builds aren't related to your changes.

Thank you.

@kassner
Copy link
Contributor Author

kassner commented Jun 9, 2021

Could you please cover this fix by any automated tests (MFTF, integration)?

Oh. No. I was expecting this to be a quick fix. Setting up MFTF is way out of my league :(

@eduard13
Copy link
Contributor

Hi @kassner, I understand, indeed it's a quick one, however to avoid happening in the future, it's better to have it covered by some tests. So, no worries about that.
@kate-kyzyma may you help us covering this fix by a MFTF test?

@kate-kyzyma
Copy link
Contributor

@eduard13 I have added the MFTF test for current changes. Please, check it.

Thanks.

@eduard13
Copy link
Contributor

@magento run WebAPI Tests, Functional Tests B2B

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

@eduard13
Copy link
Contributor

@magento run WebAPI Tests, Functional Tests B2B

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

@eduard13 eduard13 added Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix labels Jun 18, 2021
Copy link
Contributor

@eduard13 eduard13 left a comment

Choose a reason for hiding this comment

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

Thank you @kassner for your contribution.

@magento-engcom-team
Copy link
Contributor

Hi @eduard13, thank you for the review.
ENGCOM-9123 has been created to process this Pull Request

@engcom-Alfa
Copy link
Contributor

engcom-Alfa commented Jul 9, 2021

✔️ QA Passed

Pre Conditions

  1. There should be order created; and order shipped followed by invoiced. At least one order should be existing in the Admin panel Sales > Shipments grid

Manual testing scenario:

  1. In the admin panel, go to Stores > Configuration > Sales > Sales Emails > Shipment comments - disable it;

  2. Open a shipment view (Sales > Shipments > view any shipment from grid) in the admin panel;

Before: ✖️ Notify Customer by Email checkbox was being active in the UI.

image

After: ✔️ Notify Customer by Email checkbox is not displayed at all in the UI

image

Additionally covered:

Tried enabling and disabling the shipment comments flag a couple of times, and the feature worked appropriately.
Covered testing the mailing validation. If we check the checkbox and submit the invoice comments, the mail is successfully getting forwarded to the buyer; If we disable it won't.

@engcom-Alfa
Copy link
Contributor

engcom-Alfa commented Aug 5, 2021

As per the latest edited details in the Comment , moving the PR fix for next step "Merge in Progress".

@m2-assistant
Copy link

m2-assistant bot commented Aug 27, 2021

Hi @kassner, 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.

@kassner kassner deleted the patch-33 branch June 1, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Frontend Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Component: Shipping Priority: P2 A defect with this priority could have functionality issues which are not to expectations. QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot disable shipment update emails
5 participants