Skip to content

Discount applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)' #28839

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
Merged
merged 3 commits into from
Jul 16, 2020
Merged

Discount applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)' #28839

merged 3 commits into from
Jul 16, 2020

Conversation

engcom-Echo
Copy link
Contributor

Description (*)

Fixed Issues (if relevant)

  1. Fixes Discount is not applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)'. #26723

Manual testing scenarios (*)

  1. See Discount is not applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)'. #26723

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 Jun 22, 2020

Hi @engcom-Echo. 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.

@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@engcom-Echo engcom-Echo requested a review from ihor-sviziev June 23, 2020 07:48
ihor-sviziev
ihor-sviziev requested changes Jun 23, 2020
View reviewed changes
Copy link
Contributor

@ihor-sviziev ihor-sviziev left a comment

Choose a reason for hiding this comment

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

Hi @engcom-Echo,
Could you cover your changes with some types of tests?

@ghost ghost assigned ihor-sviziev Jun 23, 2020
@ihor-sviziev ihor-sviziev added the Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests label Jun 23, 2020
@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@bradleybrecher
Copy link
Contributor

@magento give me 2.3.5-p1 instance

@magento-engcom-team
Copy link
Contributor

Hi @bradleybrecher. Thank you for your request. I'm working on Magento 2.3.5-p1 instance for you

@magento-engcom-team
Copy link
Contributor

Hi @bradleybrecher, here is your Magento instance.
Admin access: https://i-28839-2-3-5-p1.instances.magento-community.engineering/admin_b5c8
Login: f3937c7c Password: 93183be11336
Instance will be terminated in up to 3 hours.

ihor-sviziev
ihor-sviziev requested changes Jun 24, 2020
View reviewed changes
app/code/Magento/SalesRule/Model/Validator.php Outdated
* @param Rule $rule
* @return float
*/
private function getDiscountQtyAllItemsBuyXGetYAction($quote, $rule)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we define argument & return types here?

@engcom-Echo engcom-Echo force-pushed the discount-applying-on-shipping-amount branch from a998ee1 to 3b33889 Compare June 25, 2020 07:02
@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@engcom-Echo engcom-Echo requested a review from ihor-sviziev June 25, 2020 10:00
@ghost ghost removed the Progress: needs update label Jun 25, 2020
@ihor-sviziev ihor-sviziev added Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Progress: needs update and removed Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests labels Jun 25, 2020
@ihor-sviziev ihor-sviziev added the Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. label Jun 25, 2020
@magento-engcom-team
Copy link
Contributor

Hi @ihor-sviziev, thank you for the review.
ENGCOM-7746 has been created to process this Pull Request

@engcom-Delta engcom-Delta self-assigned this Jun 26, 2020
@engcom-Delta
Copy link
Contributor

✔️ QA passed
Manual testing scenario:

  • Create simple product with Price=89$
  • Create Cart Price Rules

image
image

  • Go to storefront
  • Add 3 simple products to cart
  • Go to Shopping Cart page

Before:
✔️ Third product is free
❌ Shipping for third product is remain and added to Order Total. Discount include only product price(89$)
image

After:
✔️ Third product is free
✔️ Shipping for third product is free and discount include product price(89$) + shipping price(5$)
image

@engcom-Kilo engcom-Kilo self-assigned this Jun 26, 2020
engcom-Kilo
engcom-Kilo reviewed Jun 26, 2020
View reviewed changes
@engcom-Kilo engcom-Kilo added the QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) label Jun 30, 2020
@engcom-Delta engcom-Delta added QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope and removed QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) labels Jun 30, 2020
@ghost ghost added Progress: accept and removed Progress: extended testing Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Jun 30, 2020
@slavvka slavvka added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S1 Affects critical data or functionality and forces users to employ a workaround. labels Jul 6, 2020
@slavvka slavvka added this to the 2.4.1 milestone Jul 6, 2020
@magento-engcom-team magento-engcom-team mentioned this pull request Jul 16, 2020
Closed
magento-engcom-team pushed a commit that referenced this pull request Jul 16, 2020
@slavvka
ENGCOM-7746: Discount applying on Shipping Amount for the rule 'Buy X…
a21b3c3 
… get Y free (discount amount is Y)' #28839
@magento-engcom-team magento-engcom-team merged commit c62267f into magento:2.4-develop Jul 16, 2020
@m2-assistant
Copy link

m2-assistant bot commented Jul 16, 2020

Hi @engcom-Echo, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@engcom-Kilo engcom-Kilo engcom-Kilo left review comments

@ihor-sviziev ihor-sviziev ihor-sviziev approved these changes

Assignees

@ihor-sviziev ihor-sviziev

@engcom-Delta engcom-Delta

@engcom-Kilo engcom-Kilo

Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Component: SalesRule Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S1 Affects critical data or functionality and forces users to employ a workaround.
Projects
Pull Requests Dashboard
Archived in project
Milestone
2.4.1
Development

Successfully merging this pull request may close these issues.

Discount is not applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)'.
7 participants
@engcom-Echo @bradleybrecher @magento-engcom-team @engcom-Delta @ihor-sviziev @engcom-Kilo @slavvka