Skip to content

Fix duplicated footer in Magento_Customer emails - #27356

Merged
magento-engcom-team merged 4 commits into
magento:2.4-developfrom
ptylek:fix-magento_customer_emails
Jun 5, 2020
Merged

Fix duplicated footer in Magento_Customer emails#27356
magento-engcom-team merged 4 commits into
magento:2.4-developfrom
ptylek:fix-magento_customer_emails

Conversation

@ptylek

@ptylek ptylek commented Mar 19, 2020 •
edited by ghost
Loading

Copy link
Copy Markdown
Contributor

Description (*)

Email templates for change email, change email and password, password reset have duplicated Thank you note which is already in the footer:

<td class="footer">
    <p class="closing">{{trans "Thank you, %store_name" store_name=$store.frontend_name}}!</p>
</td>

and footer template is imported.

Fixing this will remove duplicated content in email.

Related Pull Requests

Fixed Issues (if relevant)

Couldn't find any issues, maybe there is some.

Manual testing scenarios (*)

  1. As a logged in user go to User Area - My Account Information section and change password / email.
  2. Go to your email box and check those emails.

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] Fix duplicated footer in Magento_Customer emails #28433: Fix duplicated footer in Magento_Customer emails

@m2-assistant

m2-assistant Bot commented Mar 19, 2020

Copy link
Copy Markdown

Hi @ptylek. 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

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

@rogyar rogyar self-assigned this Mar 22, 2020
@rogyar

rogyar commented Mar 22, 2020

Copy link
Copy Markdown
Contributor

Hi @ptylek. Thank you for your collaboration. We could cover this part with an integration test in a similar way as we do here. However, covering templates not a common case for auto-tests. I believe we can skip it for now.

rogyar
rogyar previously approved these changes Mar 22, 2020
View reviewed changes

@rogyar rogyar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Failing tests are not related to the current changes

@rogyar
rogyar dismissed their stale review March 22, 2020 10:31

A potential issue spotted

@magento-engcom-team

magento-engcom-team commented Mar 22, 2020

Copy link
Copy Markdown
Contributor

Hi @rogyar, thank you for the review.
ENGCOM-7177 has been created to process this Pull Request
✳️ @rogyar, 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

rogyar
rogyar suggested changes Mar 22, 2020
View reviewed changes
Comment thread app/code/Magento/Customer/view/frontend/email/change_email.html
@ghost ghost assigned ptylek Mar 25, 2020
@ptylek ptylek changed the title Fix duplicated footer and incorrect greeting in Magento_Customer emails Fix duplicated footer in Magento_Customer emails Apr 4, 2020
@ptylek ptylek mentioned this pull request Apr 4, 2020
Merged
4 tasks
@lbajsarowicz

lbajsarowicz commented Apr 5, 2020

Copy link
Copy Markdown
Contributor

I would like to cover that with tests, but actually both footers are slightly different and it does not make sense to cover this specific case. The other two cases were covered:

@ptylek ptylek removed their assignment Apr 6, 2020
@ptylek

ptylek commented Apr 18, 2020

Copy link
Copy Markdown
Contributor Author

@rogyar do you know any update for this PR? As @lbajsarowicz suggested, it does not make sense to cover this specific case.

@ptylek

ptylek commented Apr 18, 2020

Copy link
Copy Markdown
Contributor Author

@magento run Database Compare

@slavvka slavvka added Priority: P3 May be fixed according to the position in the backlog. Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround. labels Apr 22, 2020
@slavvka slavvka added this to the 2.4.1 milestone Apr 22, 2020
@VladimirZaets VladimirZaets added the QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) label May 20, 2020
VladimirZaets
VladimirZaets suggested changes May 21, 2020
View reviewed changes

@VladimirZaets VladimirZaets left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi @ptylek . Thanks for collaboration. Due to Magento Definition of Done all code must be covered by tests. In this case, I think it can be covered by an integration test. Can you do it?

@ghost ghost assigned VladimirZaets May 21, 2020
@ptylek

ptylek commented May 21, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Hi @ptylek . Thanks for collaboration. Due to Magento Definition of Done all code must be covered by tests. In this case, I think it can be covered by an integration test. Can you do it?

@VladimirZaets I didn't know how to approach this issue with tests. I asked @lbajsarowicz and he advised

I would like to cover that with tests, but actually both footers are slightly different and it does not make sense to cover this specific case.

If there are any issues, maybe this change can be marked as cleanup.

@VladimirZaets

VladimirZaets commented May 29, 2020

Copy link
Copy Markdown
Contributor

@magento create issue

@ghost ghost mentioned this pull request May 29, 2020
Closed
4 tasks
@VladimirZaets VladimirZaets added QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope and removed QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) labels May 29, 2020
@magento-engcom-team

magento-engcom-team commented May 29, 2020

Copy link
Copy Markdown
Contributor

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

magento-engcom-team pushed a commit that referenced this pull request Jun 5, 2020
@slavvka
ENGCOM-7177: Fix duplicated footer and incorrect greeting in Magento_…
a286ba8 
…Customer emails #27356
@magento-engcom-team
magento-engcom-team merged commit c7c0a8c into magento:2.4-develop Jun 5, 2020
@m2-assistant

m2-assistant Bot commented Jun 5, 2020

Copy link
Copy Markdown

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

altdovydas pushed a commit to altdovydas/magento2 that referenced this pull request Aug 6, 2026
@slavvka
🔃 [Magento Community Engineering] Community Contributions - 2.4-devel…
08021cf 
…op expedited

Accepted Community Pull Requests:
 - magento#27586: magento#27337: GraphQl. Add a mutation for subscribe feature (by @atwixfirster)
 - magento#28034: magento/magento2#: GraphQL. Mutation: sendEmailToFriend. Test coverage for “Please provide Email of sender.” (by @atwixfirster)
 - magento#28105: [GraphQl] Gift Message coverage for customer order (by @Usik2203)
 - magento#27956: GraphQL GiftMessageGraphQl add coverage for cart (by @Usik2203)
 - magento#28418: MFTF: Refactoring AdminUrlRewritesForProductInAnchorCategoriesTestWithConfi… (by @kate-kyzyma)
 - magento#28391: Refactoring create product with several websites and check url rewrites test (by @kate-kyzyma)
 - magento#28466: Remove redundant argument in method useProductItem (by @Usik2203)
 - magento#28450: [integration] Refactoring AdvancedPricingImportExport fixture (by @Usik2203)
 - magento#28449: [Integration] Refactoring AdminNotification fixture (by @Usik2203)
 - magento#28408: MFTF: Refactoring AdminUrlRewritesForProductInAnchorCategoriesTest (by @kate-kyzyma)
 - magento#28304: magento/magento2#: Add additional test coverage to “updateCustomer” mutation (by @atwixfirster)
 - magento#28287: Action Groups for Check exist/not exist Category in Category list on Product Edit page. (by @engcom-Kilo)
 - magento#28361: MFTF: Refactoring AdminUpdateCustomURLRewritesPermanentTest (by @kate-kyzyma)
 - magento#28330: MFTF: Share wishlist with not valid email address (by @DmitryTsymbal)
 - magento#27357: Newsletter subscription emails should also use paragraph tags (by @ptylek)
 - magento#27373: magento/magento2#: Remove oauthUserContext from app/code/Magento/GraphQl/etc/graphql/di.xml (by @atwixfirster)
 - magento#27902: Improve Interceptor generator (by @lbajsarowicz)
 - magento#27903: Improve performance of InterfaceValidator (by @lbajsarowicz)
 - magento#27871: Prevent product gallery elements from blinking when they load (by @krzksz)
 - magento#27690: Fix handling of mixins for modules with no dependencies defined (by @krzksz)
 - magento#27839: [MFTF] Fixed file name violations (by @elevinskii)
 - magento#27619: Load storage polyfill conditionally (by @krzksz)
 - magento#27618: [PERF Improvements]Load polyfills for browsers that don't support certain features (by @krzksz)
 - magento#27481: Fixed issue magento#19481: After composer installation sample data can't be installed from command line (by @andrewbess)
 - magento#27260: Clean expired quotes - Fix out of memory on huge quotes list (by @ihor-sviziev)
 - magento#27356: Fix duplicated footer in Magento_Customer emails (by @ptylek)


Fixed GitHub Issues:
 - magento#27337: GraphQl. Add a mutation for subscribe feature (reported by @atwixfirster) has been fixed in magento#27586 by @atwixfirster in 2.4-develop branch
   Related commits:
     1. 2c812ba
     2. 670d0b1
     3. eefac70
     4. 863eb5c
     5. d0d744f
     6. 59c5d42
     7. a0a5c24

 - magento#28138: [Issue] magento/magento2#: GraphQL. Mutation: sendEmailToFriend. Test coverage for �Please provide Email of sender.� (reported by @m2-backlog[bot]) has been fixed in magento#28034 by @atwixfirster in 2.4-develop branch
   Related commits:
     1. bac11ae
     2. fbabac7
     3. d78be13

 - magento#253: PHP Extension 0 must be loaded - XML Parse mistake? (reported by @ScreamingDev) has been fixed in magento#28105 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. dbaf8a5
     2. 9479c3a
     3. 9d42238
     4. 003162a
     5. 689bbea
     6. 74a95e1
     7. e4d9a05
     8. b059e51
     9. 56b5ab6
     10. 6287c86
     11. b7897f1
     12. ca9078c
     13. e3555dc
     14. 709440b
     15. 6084502

 - magento#253: PHP Extension 0 must be loaded - XML Parse mistake? (reported by @ScreamingDev) has been fixed in magento#27956 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. dbaf8a5
     2. 9479c3a
     3. 9d42238
     4. 003162a
     5. 689bbea
     6. 74a95e1
     7. e4d9a05
     8. b059e51

 - magento#28394: [Issue] magento/magento2#: Add additional test coverage to �updateCustomer� mutation (reported by @m2-backlog[bot]) has been fixed in magento#28304 by @atwixfirster in 2.4-develop branch
   Related commits:
     1. 62f5c32

 - magento#28392: [Issue] Action Groups for Check exist/not exist Category in Category list on Product Edit page. (reported by @m2-backlog[bot]) has been fixed in magento#28287 by @engcom-Kilo in 2.4-develop branch
   Related commits:
     1. fbfbc61
     2. 4a8afd8

 - magento#28393: [Issue] MFTF: Refactoring AdminUpdateCustomURLRewritesPermanentTest (reported by @m2-backlog[bot]) has been fixed in magento#28361 by @kate-kyzyma in 2.4-develop branch
   Related commits:
     1. 7bb812a

 - magento#28377: [Issue] MFTF: Share wishlist with not valid email address (reported by @m2-backlog[bot]) has been fixed in magento#28330 by @DmitryTsymbal in 2.4-develop branch
   Related commits:
     1. 8727fb9
     2. fe64579
     3. 01b3edd

 - magento#28166: [Issue] Newsletter subscription emails should also use paragraph tags (reported by @m2-backlog[bot]) has been fixed in magento#27357 by @ptylek in 2.4-develop branch
   Related commits:
     1. 414b897
     2. 2f0bbe9
     3. a216e7f
     4. 0e4e419
     5. 3038b9b
     6. 3721999

 - magento#28040: GraphQl. Retrieve customer's shopping cart without an authorization token (reported by @atwixfirster) has been fixed in magento#27373 by @atwixfirster in 2.4-develop branch
   Related commits:
     1. b96c8e9
     2. 41f6a6e

 - magento#28383: [Issue] Improve Interceptor generator (reported by @m2-backlog[bot]) has been fixed in magento#27902 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. a375e13
     2. 3057ffa

 - magento#28339: [Issue] Prevent product gallery elements from blinking when they load (reported by @m2-backlog[bot]) has been fixed in magento#27871 by @krzksz in 2.4-develop branch
   Related commits:
     1. ce001b0
     2. c10d0a1
     3. de944ad
     4. 7858941
     5. 2b64912
     6. f0e7cfd
     7. 15860ab

 - magento#28340: [Issue] Fix handling of mixins for modules with no dependencies defined (reported by @m2-backlog[bot]) has been fixed in magento#27690 by @krzksz in 2.4-develop branch
   Related commits:
     1. 97f0a1f
     2. 16444d0

 - magento#28305: [Issue] [MFTF] Fixed file name violations (reported by @m2-backlog[bot]) has been fixed in magento#27839 by @elevinskii in 2.4-develop branch
   Related commits:
     1. c49ad32
     2. 7592e8d
     3. a3a5df6
     4. acc729f

 - magento#28381: [Issue] Load storage polyfill conditionally (reported by @m2-backlog[bot]) has been fixed in magento#27619 by @krzksz in 2.4-develop branch
   Related commits:
     1. cba9d46
     2. f81f12e
     3. e1a98e2
     4. f58a127
     5. e8b245e
     6. fbbd5ae

 - magento#28382: [Issue] [PERF Improvements]Load polyfills for browsers that don't support certain features (reported by @m2-backlog[bot]) has been fixed in magento#27618 by @krzksz in 2.4-develop branch
   Related commits:
     1. 2c1daf3
     2. bb53575
     3. e3b03d4
     4. 645b0bf

 - magento#19481: Magento 2.3.0: After composer installation sampledata can't be installed from command line (reported by @dverkade) has been fixed in magento#27481 by @andrewbess in 2.4-develop branch
   Related commits:
     1. b0c3ead
     2. 7fec913
     3. a24cc81
     4. a17f104
     5. 2bfb191
     6. be5fe83
     7. b429fda
     8. 952d2a9

 - magento#28342: [Issue] Clean expired quotes - Fix out of memory on huge quotes list (reported by @m2-backlog[bot]) has been fixed in magento#27260 by @ihor-sviziev in 2.4-develop branch
   Related commits:
     1. 1031b3b
     2. 4cd55f5
     3. 76f3ed4
     4. 7e9fd80
     5. 939e1de
     6. c40b3ee

 - magento#28433: [Issue] Fix duplicated footer in Magento_Customer emails (reported by @m2-backlog[bot]) has been fixed in magento#27356 by @ptylek in 2.4-develop branch
   Related commits:
     1. a18eecc
     2. 7fa9dd7
     3. 179f02c
     4. 03aeb89
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@rogyar rogyar rogyar approved these changes
@VladimirZaets VladimirZaets VladimirZaets approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@rogyar rogyar

@VladimirZaets VladimirZaets

@engcom-Alfa engcom-Alfa

@engcom-Echo engcom-Echo

Labels

Area: Frontend Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests Component: Customer Event: Global-Contribution-Day Partner: creativestyle partners-contribution Pull Request is created by Magento Partner Priority: P3 May be fixed according to the position in the backlog. 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
Archived in project

Milestone

2.4.1

Development

Successfully merging this pull request may close these issues.

[Issue] Fix duplicated footer in Magento_Customer emails

8 participants

@ptylek @rogyar @magento-engcom-team @lbajsarowicz @engcom-Alfa @engcom-Echo @VladimirZaets @slavvka