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

Fixes #10255: base_shipping_discount_tax_compensation_amnt was empty from order onwards #10435

Merged
merged 1 commit into from
Aug 4, 2017

Conversation

AntonEvers
Copy link
Contributor

@AntonEvers AntonEvers commented Aug 4, 2017

Description

Fixed Issues (if relevant)

  1. Invoice grand_total and base_grand_total differ while in the same currency #10255: Invoice grand_total and base_grand_total differ while in the same currency

Manual testing scenarios

  1. see Invoice grand_total and base_grand_total differ while in the same currency #10255 for testing scenario and MySQL dump file

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)

@AntonEvers
Copy link
Contributor Author

AntonEvers commented Aug 4, 2017

Actually I wanted to rename the db fields from base_shipping_discount_tax_compensation_amnt to base_shipping_discount_tax_compensation_amount but that would be backward incompatible...

@orlangur
Copy link
Contributor

orlangur commented Aug 4, 2017

Please check http://devdocs.magento.com/guides/v2.1/contributor-guide/backward-compatible-development/#allowed-code-changes out.

The constant will remain ugly BASE_SHIPPING_DISCOUNT_TAX_COMPENSATION_AMNT but the value and column name can be changed I believe. Unless it was shortened just because there is some limit on DB side or something.

@ishakhsuvarov ishakhsuvarov self-assigned this Aug 4, 2017
@ishakhsuvarov ishakhsuvarov added this to the August 2017 milestone Aug 4, 2017
@magento-team magento-team merged commit a3599fe into magento:develop Aug 4, 2017
magento-team pushed a commit that referenced this pull request Aug 4, 2017
@AntonEvers
Copy link
Contributor Author

@orlangur do you still want me to change the amnt to amount? Even after this PR has been merged?

@orlangur
Copy link
Contributor

orlangur commented Aug 7, 2017

I'm not sure why it was merged as is.

@ishakhsuvarov what do you think about #10435 (comment)? Maybe I'm missing something but if not let's do a fix the right way.

magento-team pushed a commit that referenced this pull request Nov 7, 2017
…pensation_amnt was empty from order onwards #10435
magento-team pushed a commit that referenced this pull request Nov 7, 2017
…pensation_amnt was empty from order onwards #10435
magento-team pushed a commit that referenced this pull request Nov 7, 2017
[Plankton] Fixes
 - MAGETWO-80191: [2.2.x] - Fixes #10255: base_shipping_discount_tax_compensation_amnt was empty from order onwards #10435
 - MAGETWO-80203 [2.2.x]: - FIX for issue 9930 - Asymmetric Transaction Error with ElasticSearch #10610
 - MAGETWO-62981: Cannot save category position after drag&drop (second attempt)
 - MAGETWO-82339: Duplicate Shipment getting created
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.

4 participants