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.

Sign up for GitHub

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

Jump to bottom

100% Discount cart rule results in Tax invoiced #30853 #31556

Closed
wants to merge 4 commits into from
Closed

100% Discount cart rule results in Tax invoiced #30853 #31556

wants to merge 4 commits into from

Conversation

engcom-Hotel
Copy link
Contributor

Description (*)

#30853

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes 100% Discount cart rule results in Tax invoiced #30853

Manual testing scenarios (*)

  1. 100% Discount cart rule results in Tax invoiced #30853

Questions or comments

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 are green)

@m2-assistant
Copy link

m2-assistant bot commented Jan 5, 2021

Hi @engcom-Hotel. 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 give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@m2-community-project m2-community-project bot added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Jan 5, 2021
@engcom-Hotel
Copy link
Contributor Author

@magento run all tests

@engcom-Hotel engcom-Hotel self-assigned this Jan 5, 2021
@engcom-Hotel
Copy link
Contributor Author

@magento run Functional Tests B2B, Functional Tests EE

@engcom-Hotel
Copy link
Contributor Author

@magento run Functional Tests B2B

3 similar comments
@engcom-Hotel
Copy link
Contributor Author

@magento run Functional Tests B2B

@engcom-Hotel
Copy link
Contributor Author

@magento run Functional Tests B2B

@engcom-Hotel
Copy link
Contributor Author

@magento run Functional Tests B2B

@gabrieldagama
Copy link
Contributor

@magento give me 2.4 instance with edition ee

@magento-deployment-service
Copy link

Hi @gabrieldagama. Thank you for your request. I'm working on Magento instance for you.

@magento-deployment-service
Copy link

Hi @gabrieldagama, here is your Magento Instance: https://64ce9709faeaa016984a05f5bf432de9-2-4.instances.magento-community.engineering
Admin access: https://64ce9709faeaa016984a05f5bf432de9-2-4.instances.magento-community.engineering/admin_d76e
Login: 6a691642
Password: 1a3262f4d4ec

@barryvdh
Copy link
Contributor

I've applied this fix but it's still generating Invoices with incorrect values on 2.3.6. Also with 99% discount.

@barryvdh barryvdh mentioned this pull request Jan 21, 2021
Closed
5 tasks
@engcom-Hotel engcom-Hotel removed their assignment Feb 26, 2021
gabrieldagama
gabrieldagama suggested changes Mar 2, 2021
View reviewed changes
app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php Outdated
Comment on lines 121 to 127
$grandTotal = $invoice->getGrandTotal() + $invoice->getDiscountAmount() < 0.0001
? 0 : $invoice->getGrandTotal() + $totalTax + $totalDiscountTaxCompensation;
$baseGrandTotal = $invoice->getBaseGrandTotal() + $invoice->getBaseDiscountAmount() < 0.0001
? 0 : $invoice->getBaseGrandTotal() + $baseTotalTax + $baseTotalDiscountTaxCompensation;

$invoice->setGrandTotal($grandTotal);
$invoice->setBaseGrandTotal($baseGrandTotal);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such a solution would just work if the Tax totals is the last to run, but depending on sort order is not great, I recommend looking at \Magento\Sales\Model\Order\Invoice\Total\Shipping line 41 and 42, that is where the shipping cost is bein added to the grand total.

@HenKun HenKun mentioned this pull request Mar 10, 2021
Closed
5 tasks
@m2-community-project m2-community-project bot added the Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. label Mar 25, 2021
@engcom-Foxtrot
Copy link
Contributor

The solution should be fully reworked. The issue seems to be caused by tax, discount, and discount_tax_compensation_amount incorrect calculation.

@gabrieldagama
Copy link
Contributor

@magento run all tests

@gabrieldagama
Copy link
Contributor

@magento run WebAPI Tests, Functional Tests B2B

@hostep
Copy link
Contributor

hostep commented May 4, 2021

Before this gets merged, please confirm that this is still needed on the latest 2.4-develop branch, because I think it doesn't anymore: #30853 (comment)

@engcom-Alfa
Copy link
Contributor

Hi All, thanks for your contribution over here!

Checked the linked Github issue #30853, and it has already been fixed with the help of internal Jira ticket by the internal team.

We have the older commit links of this ticket here - 533ec2e

Hence, closing this PR currently.
In case of any further clarifications on this, please do comment in the same ticket.
If you feel like, require to do more changes/modifications/fixes coverage, you may report a new PR as well.

Thanks!

@engcom-Alfa engcom-Alfa closed this Aug 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabrieldagama gabrieldagama gabrieldagama requested changes

Assignees

@gabrieldagama gabrieldagama

Labels
Component: Sales Component: SalesRule Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

100% Discount cart rule results in Tax invoiced
7 participants
@engcom-Hotel @gabrieldagama @barryvdh @engcom-Foxtrot @hostep @engcom-Alfa @magento-engcom-team