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

Enhancement/email use owner setting #6071

Merged

Conversation

Travisimo
Copy link
Contributor

@Travisimo Travisimo commented May 9, 2018

Please be sure you are submitting this against the staging branch.

Q A
Bug fix? N
New feature? Y (Enhancement)
Automated tests included? Y
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs) fixes #4170, fixes #6425, Forum Post
BC breaks?
Deprecations?

Description: This is a new pull request based off of discussion from PR #6004. The "Use Owner As Mailer" setting has been added to the email template, adding more refined control for emails. The global config setting will now only act as a default settings for new emails. Emails can now individually have this feature toggled.

Steps to reproduce the bug:

  1. Set "Mailer is owner" flag to true (On) in Configuration -> Email
  2. Set from address on custom email attached to campaign
  3. Trigger campaign to send out email
  4. Email from address is populated with owner email instead of the defined custom email

Steps to test this PR:

Apply this PR and then apply the migration using bin/console doctrine:migrations:execute --up 20180508202930

  1. Set "Mailer is owner" flag to false (No) in Eamil-> Advanced Settings
  2. Set from address on custom email attached to campaign
  3. Trigger campaign to send out email
  4. Email from address uses defined custom from address if available
  5. If custom from address is not populated, use owner email if available, else use system default.
    Revoke the migration if required using bin/console doctrine:migrations:execute --down 20180508202930

List deprecations along with the new alternative:

List backwards compatibility breaks:

@mautibot mautibot added the code-review-needed PR's that require a code review before merging label May 9, 2018
@alanhartless
Copy link
Contributor

@Travisimo Thanks for doing this! I haven't tested this yet but just pointed out that it broke one of the tests. https://travis-ci.org/mautic/mautic/builds/377062056?utm_source=github_status&utm_medium=notification Let's make sure it didn't introduce a bug.

@Travisimo
Copy link
Contributor Author

@alanhartless Of course! Thanks for the suggestion and help along the way. The bug has been resolved.

@npracht
Copy link
Member

npracht commented May 13, 2018

Label: Enhancement

@mautibot mautibot added the enhancement Any improvement to an existing feature or functionality label May 13, 2018
Copy link
Sponsor Member

@escopecz escopecz left a comment

Choose a reason for hiding this comment

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

I found some tiny issues. Please resolve them and I'll test it then.

app/bundles/EmailBundle/Entity/Email.php Outdated Show resolved Hide resolved
app/bundles/EmailBundle/Form/Type/EmailType.php Outdated Show resolved Hide resolved
app/bundles/EmailBundle/Form/Type/EmailType.php Outdated Show resolved Hide resolved
@escopecz escopecz added the pending-feedback PR's and issues that are awaiting feedback from the author label Jun 11, 2018
@Travisimo
Copy link
Contributor Author

@escopecz thanks for the feedback! I will get to work on fixing those issues.

@Travisimo
Copy link
Contributor Author

@escopecz I have fixed the issues you have pointed out

@escopecz escopecz added ready-to-test PR's that are ready to test and removed pending-feedback PR's and issues that are awaiting feedback from the author labels Jun 12, 2018
@cla-bot
Copy link

cla-bot bot commented Nov 27, 2020

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@kuzmany kuzmany added pending-test-confirmation PR's that require one test before they can be merged and removed pending-feedback PR's and issues that are awaiting feedback from the author labels Nov 27, 2020
@kuzmany
Copy link
Member

kuzmany commented Nov 27, 2020

I've resolved conflicts.
Based on our discution with Ruth, we can continue with tests

@npracht npracht changed the base branch from staging to features December 1, 2020 06:06
@cla-bot
Copy link

cla-bot bot commented Dec 1, 2020

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@cla-bot
Copy link

cla-bot bot commented Dec 10, 2020

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@cla-bot
Copy link

cla-bot bot commented Dec 14, 2020

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@npracht npracht added the needs-documentation PR's that need documentation before they can be merged label Dec 20, 2020
@cla-bot
Copy link

cla-bot bot commented Dec 20, 2020

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@cla-bot
Copy link

cla-bot bot commented Jan 26, 2021

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@RCheesley RCheesley removed the needs-documentation PR's that need documentation before they can be merged label Feb 12, 2021
@RCheesley
Copy link
Sponsor Member

Updated the docs to reflect the 3.3 release, should be good to go once branch is updated and tests are passing.

@RCheesley RCheesley added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed pending-test-confirmation PR's that require one test before they can be merged labels Feb 13, 2021
@cla-bot
Copy link

cla-bot bot commented Feb 13, 2021

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: tmoheit.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@RCheesley RCheesley merged commit 8890e9d into mautic:features Feb 13, 2021
RCheesley added a commit to mautic/mautic-documentation that referenced this pull request Feb 26, 2021
* Add documentation for mautic/mautic#6071

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md
alfredoct96 pushed a commit to CTMobi/mautic-documentation that referenced this pull request Jul 14, 2021
* Add documentation for mautic/mautic#6071

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md

* Update pages/07.Channels/02.Emails/04.Mailer is owner/docs.en.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Any improvement to an existing feature or functionality ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged
Projects
None yet
10 participants