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

[BackPort] resolve typos and correct variable names #19280

Merged

Conversation

viral-wagento
Copy link
Contributor

@viral-wagento viral-wagento commented Nov 20, 2018

Description

Fixed typos and added proper variable names in below files:
Original PR: #19288

app/code/Magento/Sales/Model/Order.php
app/code/Magento/Sales/etc/adminhtml/system.xml

Manual testing scenarios

  1. app/code/Magento/Sales/Model/Order.php
    Line:668 - replaced $hasActinFlag to $hasActionFlag
    Line:688 - replaced $dueAmountCondition to $hasDueAmount
    Line:690 - replaced $creditmemos to $creditMemos

  2. app/code/Magento/Sales/etc/adminhtml/system.xml
    Line:52 - replaced Allow Zero GrandTotal to Allow Zero GrandTotal for Credit Memos
    Line:54 - replaced Allow Zero GrandTotal for Creditmemo to Allow Zero GrandTotal for Credit Memos

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)

@magento-engcom-team magento-engcom-team added Partner: Wagento Pull Request is created by partner Wagento partners-contribution Pull Request is created by Magento Partner labels Nov 20, 2018
@VladimirZaets VladimirZaets self-assigned this Nov 20, 2018
@sivaschenko
Copy link
Member

Hi @viral-wagento thanks for your contribution, can you please forwardport this pull request to 2.3 as well.

Original pull request #16005

@VladimirZaets
Copy link
Contributor

Hi @viral-wagento. Thanks for the collaboration. Please add the translation for "Allow Zero GrandTotal for Credit Memos" and "Allow Zero GrandTotal for Credit Memos" phrases to en_US.csv

@viral-wagento viral-wagento self-assigned this Nov 20, 2018
@orlangur orlangur assigned orlangur and unassigned viral-wagento Nov 21, 2018
@orlangur
Copy link
Contributor

Unfortunately, we can't accept such Pull Requests to 2.2 release line, all code cleanup like typos, spelling mistakes, etc should be delivered to 2.3 release line. For more information, please, refer to Magento Code Contributions Guide.

@orlangur orlangur closed this Nov 21, 2018
@viral-wagento viral-wagento reopened this Dec 12, 2018
@viral-wagento viral-wagento changed the title resolve typos and correct variable names [BackPort] ]resolve typos and correct variable names Dec 12, 2018
@viral-wagento viral-wagento changed the title [BackPort] ]resolve typos and correct variable names [BackPort] resolve typos and correct variable names Dec 12, 2018
@VladimirZaets
Copy link
Contributor

Hi @viral-wagento. As @orlangur said above firstly PR should be delivered to 2.3 Magento branch. Please create PR to 2.3 Magento branch.

@orlangur
Copy link
Contributor

@VladimirZaets it is already merged to 2.3 in #19288.

I would accept this one to 2.2 as it contains not just typo fixes but also missing translations.

@magento-engcom-team
Copy link
Contributor

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

@magento-engcom-team
Copy link
Contributor

Hi @viral-wagento. Thank you for your contribution.
We will aim to release these changes as part of 2.2.8.
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.

@viral-wagento
Copy link
Contributor Author

@magento-engcom-team @sidolov
This has already been developed and merged in 2.3 release line.
#19288
Thanks!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cleanup Component: Sales Partner: Wagento Pull Request is created by partner Wagento partners-contribution Pull Request is created by Magento Partner Progress: accept Release Line: 2.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants