2.2 develop-update branch #3
Merged
Conversation
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
…StatusLabel() \Magento\Sales\Model\Order\Config::getStatusLabel(), used by template email was forcing the usage of getLabel() when in adminhtml area. I added a new method getFrontendStatusLabel() in \Magento\Sales\Model\Order and modified email template files to use it instead of the original implementation. I did not modify the original implementation because still in use by backend and frontend.
…n by addFieldToSelect()
Changed test method to fit the new implementation of the class method
Add logging of exception
Add logging of exception
…thout creating an administrator
…thout creating an administrator
…ento-engcom-magento2ce-1169 # Conflicts: # app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
… value of "GB" provided for the regionId field.
Accepted Public Pull Requests: - #19110: [Backport] Add additional check if password hash is empty in auth process (by @agorbulin) - #19105: #18840: Invalid Unit Test Annotations. (by @swnsma) - #19089: magento/magento#18901: Forgot password form should not available while customer is logged in. (by @swnsma) - #19073: #19071: Password strength indicator shows No Password� (by @dimasalamatov) - #18649: [Backport] Issue Fixed: Missing Fixed Product Tax total on PDF (by @maheshWebkul721) - #18815: [Backoport] Issue Fixed: Backups error from User Roles Permission 2.2.6 (by @maheshWebkul721) - #18461: fix Fatal Error when save configurable product in Magento 2.2.5 #18082 (by @thiagolima-bm) Fixed GitHub Issues: - #19060: User created by admin cannot login (reported by @tomekjordan) has been fixed in #19110 by @agorbulin in 2.2-develop branch Related commits: 1. 35c2345 - #18840: Invalid Unit Test Annotations (reported by @okorshenko) has been fixed in #19105 by @swnsma in 2.2-develop branch Related commits: 1. 252a0ed - #18901: Forgot password form should not available while customer is logged in. (reported by @webkul-ratnesh) has been fixed in #19089 by @swnsma in 2.2-develop branch Related commits: 1. a651b31 - #18617: Missing Fixed Product Tax total on PDF (reported by @Detzler) has been fixed in #18649 by @maheshWebkul721 in 2.2-develop branch Related commits: 1. 382e550 - #18150: Backups error from User Roles Permission 2.2.6 (reported by @andy17612) has been fixed in #18815 by @maheshWebkul721 in 2.2-develop branch Related commits: 1. bf700aa - #18082: Fatal Error when save configurable product in Magento 2.2.5 (reported by @vpatidar009) has been fixed in #18461 by @thiagolima-bm in 2.2-develop branch Related commits: 1. 03698da 2. 38854b5
Fixed issues: - MAGETWO-95411: [Backport 2.2.x] Add the ability to install Magento without creating an administrator
- pull origin lock file, update MFTF version only
- Fix flaky actionGroup
…ing order.getStatusLabel() #14914
…h level category exist and is translated
Accepted Public Pull Requests: - #17854: Fix translations of category design theme not being applied (by @cezary-zeglen) - #19118: [Backport] Add/update newsletter messages in translation file (by @arnoudhgz) - #18743: Fixed tierprice discount not calculated correctly if has specialprice (by @gelanivishal) - #18959: fixed js translation (by @torhoehn) - #17915: Fix/add expresion (by @magently) - #14914: FIX for issue #14849 - In Sales Emails no translation using order.getStatusLabel() (by @phoenix128) Fixed GitHub Issues: - #17625: Translations done within a theme that's enabled through a category Design change aren't used (reported by @chefbuitenhuis) has been fixed in #17854 by @cezary-zeglen in 2.2-develop branch Related commits: 1. f6eb7fb - #18652: Tierprice discount not calculated correctly if has specialprice. (reported by @Hoszi) has been fixed in #18743 by @gelanivishal in 2.2-develop branch Related commits: 1. e40b9c7 2. 451b6ba 3. edf09b3 4. 09bd229 - #18939: "Not yet calculated" for the tax in the summary section in the checkout is not translatable (reported by @progammer-rkt) has been fixed in #18959 by @torhoehn in 2.2-develop branch Related commits: 1. b51e3be - #17635: addExpressionFieldToSelect has to be called after all addFieldToSelect (reported by @dbsdsun) has been fixed in #17915 by @magently in 2.2-develop branch Related commits: 1. e9451e0 2. 29680f7 3. 5a702ef - #14849: In Sales Emails no translation using order.getStatusLabel() (reported by @raymond62) has been fixed in #14914 by @phoenix128 in 2.2-develop branch Related commits: 1. 03e7de4 2. 5d2b5be 3. 1c9ce84 4. 18ca5f0 5. bd80b1a 6. 2e634e4
[pangolin] MFTF 2.3.10 update for CE 2.2-develop
[TSG-CSL3] 2.2-develop (pr9)
- MFTF version bump and lock file update
[pangolin] MFTF 2.3.11 update for CE 2.2-develop
speedy008
pushed a commit
that referenced
this pull request
Jul 8, 2019
…ine-pr Regression Automation Team Sprint #3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description (*)
Fixed Issues (if relevant)
Manual testing scenarios (*)
Contribution checklist (*)