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

When searching for the title if search for all the segments that has … #16093

Merged
merged 1 commit into from
Jun 29, 2018

Conversation

rsantellan
Copy link
Contributor

@rsantellan rsantellan commented Jun 13, 2018

Description

Making Fix missing discount label in checkout compatible with custom discounts.
Based on this pull request: #13141 I change the compare method for searching all the totals that has the discount name making it possible to use a custom module discount that shows there.

Fixed Issues (if relevant)

  1. Not found.

Manual testing scenarios

  1. Create a custom discount in a new module.
  2. Make the discount apply

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 on Travis CI are green)

…a discount title making it possible displaying custom discounts.
@magento-cicd2
Copy link
Contributor

magento-cicd2 commented Jun 13, 2018

CLA assistant check
All committers have signed the CLA.

@magento-engcom-team
Copy link
Contributor

Hi @rsantellan. 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-engcom-team give me test instance - deploy test instance based on Pull Request changes
  • @magento-engcom-team give me new test instance - deploy NEW test instance based on Pull Request changes
  • @magento-engcom-team give me {$VERSION} instance - deploy Vanilla Magento instance for Issue or Pull Request

For more details, please, review the Magento Contributor Assistant documentation

@ishakhsuvarov
Copy link
Contributor

Hi @rsantellan Thank you for contributing

Please sign CLA with the github account having email same as on the commit.
Thanks

@VladimirZaets
Copy link
Contributor

Hi @rsantellan, please, sign CLA, otherwise, we can't process your pull request

@VladimirZaets VladimirZaets self-assigned this Jun 22, 2018
@rsantellan
Copy link
Contributor Author

@VladimirZaets I already sign it, it appears marked like this.

image

Regards

@ishakhsuvarov
Copy link
Contributor

Hi @rsantellan
GitHub doesn't recognize that commits were made from your account. As you can see here https://github.com/magento/magento2/pull/16093/commits commit is marked with your name but not linked to the account. This may be the reason CLA doesn't work correctly.

To fix this please try adding the email you have in the git config to the github account.

@rsantellan
Copy link
Contributor Author

Hi @ishakhsuvarov,

Should I recommit after making the change of the config values ? I never have to do this.

Regards

@rsantellan
Copy link
Contributor Author

@ishakhsuvarov I understand now what I have to do!
I added the email to the Github account, should I sign again the CLA?
Thanks

@ishakhsuvarov
Copy link
Contributor

@rsantellan Yes, please sign it again. It should work now.
Please note, it may have a short delay before status is updated in the Pull Request.

@magento-engcom-team
Copy link
Contributor

@rsantellan thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

@magento-engcom-team magento-engcom-team merged commit 5c3ff9c into magento:2.2-develop Jun 29, 2018
@magento-engcom-team
Copy link
Contributor

Hi @rsantellan. Thank you for your contribution.
The changes from your Pull Request should be available with the upcoming 2.2.6 release.
Please check the release notes for final confirmation.

Please, consider to port this solution to 2.3 release line.
You may use Porting tool to port commits automatically.

@rsantellan
Copy link
Contributor Author

Hi @magento-engcom-team I use the porting tool.
screenshot-2018-6-29 pr porting tool

But I don't know how the send the new pull request?
image

Should I dowload the 2.3-branch and apply the fixes manually ?

@rsantellan rsantellan mentioned this pull request Jun 29, 2018
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants