fixed typos for zero order credit memo feature #19288

viral-wagento · 2018-11-21T06:07:53Z

Description

Fixed typos and added proper variable names in below files:

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

Manual testing scenarios

Changes done as below:

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
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 · 2018-11-21T06:08:02Z

Hi @viral-wagento. 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 PR changes
@magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

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

viral-wagento · 2018-11-21T08:53:11Z

@sivaschenko , can you please look into this?
Travis CI build gave below error:
No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
Thanks!

VladimirZaets · 2018-11-21T10:13:38Z

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

VladimirZaets · 2018-11-21T10:16:01Z

@viral-wagento The build on Travis was terminated. It's some infrastructure problem, so don't worry about it. Thanks

orlangur

Please revert wrong changes and squash all into single commit.

orlangur · 2018-11-21T11:38:23Z

app/code/Magento/Sales/etc/adminhtml/system.xml

@@ -49,9 +49,9 @@
                </field>
            </group>
            <group id="zerograndtotal_creditmemo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Allow Zero GrandTotal</label>
+                <label>Allow Zero GrandTotal for Credit Memos</label>


This is not needed - understandable from context

I think we should add label - 'Allow Zero GrandTotal for Credit Memos'
because if we have only label - 'Allow Zero GrandTotoal' - how can one understand about what we are talking?

It is fine from your point that - I will name filed - 'Allow Zero GrandTotal' - that is understandable.

@orlangur , once you respond, i will commit my changes

@viral-wagento it was just fine: "Allow Zero GrandTotal" for [potential] group of fields, "Allow Zero GrandTotal for Creditmemo" for specific one.

@orlangur
Ohh, I have updated my changes earlier, let me know if any.
Thanks!

@viral-wagento to summarize: changes in app/code/Magento/Sales/etc/adminhtml/system.xml are not needed, changes creditmemo -> credit memo are not needed, please squash all needed changes into a single commit and force push.

@orlangur Do you think it should be "Allow Zero GrandTotal" or "Allow Zero GrandTotal for Credit Memos" in system xmk? @viral-wagento can you please also remove unused translation from csv, once decided with system.xml

@orlangur and @sivaschenko
once system.xml changes are finalised from both of you, i will do changes in system.xml and its respected changes in translation csv.
Thanks!

@sivaschenko should not be changed: "Allow Zero GrandTotal" for group, "Allow Zero GrandTotal for Credit Memos" for field.

Done, as per your last comment - @orlangur

orlangur · 2018-11-21T11:39:11Z

app/code/Magento/Sales/etc/adminhtml/system.xml

                <field id="allow_zero_grandtotal" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Allow Zero GrandTotal for Creditmemo</label>
+                    <label>Allow Zero GrandTotal for Credit Memos</label>


There are hundreds of "reditmemo" occurrences in code, including csv files. Please revert "credtimemo" -> "credit memo" changes.

orlangur · 2018-11-21T11:40:05Z

app/code/Magento/Sales/i18n/en_US.csv

 "%name,","%name,"
-"Thank you f


Please generate csv properly so that quotes remain in place.

orlangur · 2018-11-23T08:58:10Z

@magento-engcom-team give me 2.3-develop instance

magento-engcom-team · 2018-11-23T08:58:12Z

Hi @orlangur. Thank you for your request. I'm working on Magento 2.3-develop instance for you

magento-engcom-team · 2018-11-23T08:58:39Z

Hi @orlangur, here is your Magento instance.
Admin access: https://i-19288-2-3-develop.instances.magento-community.engineering/admin
Login: admin Password: 123123q
Instance will be terminated in up to 3 hours.

orlangur · 2018-11-26T16:22:44Z

app/code/Magento/Sales/Model/Order.php

        //case when paid amount is refunded and order has creditmemo created
-
-        $creditmemos = ($this->getCreditmemosCollection() === false) ?
+        $creditMemos = ($this->getCreditmemosCollection() === false) ?


@viral-wagento please revert changes in app/code/Magento/Sales/Model/Order.php related to credit memos too.

@orlangur
Done

@viral-wagento please check https://github.com/magento/magento2/pull/19288/files to see all items which are not done, apply changes and then squash them into a single commit.

@viral-wagento almost there: https://github.com/magento/magento2/pull/19288/files

Please remove unneeded space "credit memo" -> "creditmemo" and squash changes into a single commit performing a force push.

@orlangur Ok, so i should do this change 'Allow Zero GrandTotal for Credit memo' => 'Allow Zero GrandTotal for Creditmemo' - in system.xml and csv file. Right?

@viral-wagento and in comment

// Case when Adjustment Fee (adjustment_negative) has been used for first credit memo

@orlangur , okay going to change there too.
But then what about Retrieve order credit memo (refund) availability Retrieve credit memo for zero total refunded availability. and Retrieve credit memo for zero total availability.
Should i change - credit memo => creditmemo here?

They are function description

@viral-wagento thanks! No need to change, as they were there before, not really worth fixing.

Changes look good to me now, please squash them into a single commit. Talk to me if you need any assistance with that.

orlangur

Great @viral-wagento !

magento-engcom-team · 2018-12-06T17:06:38Z

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

magento-engcom-team · 2018-12-09T20:52:04Z

Hi @viral-wagento. Thank you for your contribution.
We will aim to release these changes as part of 2.3.1.
Please check the release notes for final confirmation.

magento-engcom-team added Partner: Wagento Pull Request is created by partner Wagento partners-contribution Pull Request is created by Magento Partner Component: Sales Release Line: 2.3 labels Nov 21, 2018

orlangur self-assigned this Nov 21, 2018

VladimirZaets self-assigned this Nov 21, 2018

VladimirZaets added the Progress: needs update label Nov 21, 2018

orlangur requested changes Nov 21, 2018

View reviewed changes

sivaschenko self-assigned this Nov 26, 2018

orlangur reviewed Nov 26, 2018

View reviewed changes

fixed typos for zero ordertotal creditmemo feature

6918011

viral-wagento force-pushed the feature-creditmemo-typos branch from 83aaeb6 to 6918011 Compare November 29, 2018 11:17

orlangur approved these changes Nov 29, 2018

View reviewed changes

sidolov removed the Progress: needs update label Dec 6, 2018

sidolov approved these changes Dec 6, 2018

View reviewed changes

magento-engcom-team assigned sidolov Dec 6, 2018

magento-engcom-team added this to the Release: 2.3.1 milestone Dec 6, 2018

magento-engcom-team added the Progress: accept label Dec 7, 2018

magento-engcom-team merged commit 6918011 into magento:2.3-develop Dec 9, 2018

magento-engcom-team pushed a commit that referenced this pull request Dec 9, 2018

ENGCOM-3631: fixed typos for zero order credit memo feature #19288

07d43a8

viral-wagento mentioned this pull request Dec 12, 2018

[BackPort] resolve typos and correct variable names #19280

Merged

4 tasks

fixed typos for zero order credit memo feature #19288

fixed typos for zero order credit memo feature #19288

Uh oh!

Conversation

viral-wagento commented Nov 21, 2018

Description

Manual testing scenarios

Contribution checklist (*)

Uh oh!

magento-engcom-team commented Nov 21, 2018

Uh oh!

viral-wagento commented Nov 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VladimirZaets commented Nov 21, 2018

Uh oh!

VladimirZaets commented Nov 21, 2018

Uh oh!

orlangur left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

viral-wagento Nov 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

orlangur commented Nov 23, 2018

Uh oh!

magento-engcom-team commented Nov 23, 2018

Uh oh!

magento-engcom-team commented Nov 23, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

viral-wagento Nov 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

viral-wagento Nov 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

orlangur left a comment

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Dec 6, 2018

Uh oh!

magento-engcom-team commented Dec 9, 2018

Uh oh!

Uh oh!

viral-wagento commented Nov 21, 2018 •

edited

Loading

viral-wagento Nov 21, 2018 •

edited

Loading

viral-wagento Nov 28, 2018 •

edited

Loading

viral-wagento Nov 28, 2018 •

edited

Loading