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

Issues/35545 #35725

Closed
wants to merge 2 commits into from
Closed

Issues/35545 #35725

wants to merge 2 commits into from

Conversation

artskirk
Copy link

@artskirk artskirk commented Jul 5, 2022

Issue #35545 Total discount is displayed ignoring discount applied on Shipping amount in GraphQL response, while on UI - discount amount is displayed including the discount applied on shipping amount.

Description (*)

I have removed redundant code in graphQl resolver and use already calculated discounts instead.

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes magento/magento2#<issue_number>

Manual testing scenarios (*)

  1. Create cart Price Rule Specific Coupon, Actions - 100 % discount and Apply to shipping amount - yes, Free shipping - For Shipments with matching items

image

  1. Front-end - login as customer - Add product to cart and select Flat rate shipping methods.
  2. Apply discount
  3. Run the cart graphql query
{
  cart(cart_id: "{{CART_ID}}") {
    email    
    items {
      id
      product {
        name
        sku
      }
      quantity
    }    
    selected_payment_method {
      code
      title
    }
    applied_coupons {
      code
    }
    prices {
      grand_total {
        value
        currency
      }
      discounts {
        label
        amount {            
            value
            currency
        }        
      }
    }
  }
}

Capture

Expected Result: Total discount includes discount applied on Shipping amount

@m2-assistant
Copy link

m2-assistant bot commented Jul 5, 2022

Hi @artskirk. Thank you for your contribution
Here are 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
  13. Semantic Version Checker

You can find more information about the builds here

ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, 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, join the Community Contributions Triage session to discuss the appropriate ticket.

✏️ 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 the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label Jul 5, 2022
@artskirk
Copy link
Author

artskirk commented Jul 7, 2022

@magento run all tests

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

@manavluhar
Copy link
Contributor

Hi @artskirk, as per the automated test results, you may need to update test methods. Also, Sign the Adobe CLA for proceeding for further reviews

@artskirk
Copy link
Author

artskirk commented Aug 2, 2022

Hi @artskirk, as per the automated test results, you may need to update test methods. Also, Sign the Adobe CLA for proceeding for further reviews

CLA Signed

@engcom-Charlie
Copy link
Contributor

Hi @artskirk,

Thank you for your contribution!

Can you please resolve the conflicts so that we can move ahead on this PR.

Thank you!

@engcom-Charlie
Copy link
Contributor

Internal team worked on the issue mentioned in this PR.

The implemented changes of this issue are committed in this commit revision.

The changes will be available in magento 2.4.6 release. Hence currently closing this PR.

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: P2 A defect with this priority could have functionality issues which are not to expectations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants