Skip to content

MC-30626: Custom Option with Percent price is converted to a currency twice #30807

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 8 commits into from
Nov 28, 2020
Merged

MC-30626: Custom Option with Percent price is converted to a currency twice #30807

merged 8 commits into from
Nov 28, 2020

Conversation

engcom-Echo
Copy link
Contributor

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Custom Option with Percent price is converted to a currency twice #26432

Manual testing scenarios (*)

See: #26432

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 Nov 5, 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.

⚠️ 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

@engcom-Echo engcom-Echo 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 Nov 5, 2020
@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@engcom-Echo engcom-Echo marked this pull request as draft November 6, 2020 07:22
@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@engcom-Echo engcom-Echo marked this pull request as ready for review November 6, 2020 10:43
engcom-Kilo
engcom-Kilo suggested changes Nov 10, 2020
View reviewed changes
app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php Outdated
* @param null|array $context
* @return AmountInterface
*/
public function getCustomRoundAmount($amount, $context = [])
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no getCustomRoundAmount in CustomOptionPriceInterface. Please consider to find other solution.

...ode/Magento/Catalog/Test/Mftf/Test/StorefrontCheckCustomOptionPriceDifferentCurrencyTest.xml Outdated
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPageOnStorefront">
<argument name="product" value="$createProduct$"/>
</actionGroup>
<seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '12.3')}}" stepKey="checkPriceProductOptionUSD"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please create ActionGroup for this action.

@engcom-Echo engcom-Echo force-pushed the MC-30626 branch 2 times, most recently from 85a54f3 to 5de62c7 Compare November 11, 2020 11:05
@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@engcom-Echo
Copy link
Contributor Author

@magento run Functional Tests B2B

@engcom-Echo
Copy link
Contributor Author

@magento run all tests

@magento-engcom-team
Copy link
Contributor

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

@engcom-Bravo engcom-Bravo self-assigned this Nov 23, 2020
@engcom-Bravo
Copy link
Contributor

✔️ QA Passed

Manual testing scenario

  1. From Admin, create a Simple Product with a base price of 100, and a Custom option which adds 50% to the base price
    cust_option
  2. Go to Stores - Configuration - General - Currency Setup and assert that Euro is checked in Allowed Currencies
    euro_allowed
  3. Go to Stores - Currency Rates and set Rate, for example, 2 EUR to 1 USD
    rates
  4. Go to Storefront, and open the previously created Simple Products page
  5. Change the Stores currency to EUR - Euro
    web_curr
  6. Check the Custom option calculation

BEFORE applying changes provided in this PR, the Custom options was calculated wrong: Base price + Custom option price + Custom option price one more time
before_currency

AFTER switching to the PR, the Custom option price is calculated correctly, only once
after_currency

The order can be placed successfully and all the prices are displayed correctly in order Details
order_total

@ihor-sviziev
Copy link
Contributor

@engcom-Bravo seems like you missed to move this PR forward?

@engcom-Bravo engcom-Bravo added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Nov 25, 2020
@engcom-Foxtrot engcom-Foxtrot self-assigned this Nov 25, 2020
@engcom-Echo
Copy link
Contributor Author

@magento run Integration Tests

@zakdma
Copy link
Contributor

zakdma commented Nov 26, 2020

@magento import code to https://github.com/magento-tsg/magento2ce

@magento-engcom-team
Copy link
Contributor

@zakdma the branch with code successfully imported intomagento-tsg/magento2ce repository. Branch name: imported-magento-magento2-30807.

@engcom-Foxtrot
Copy link
Contributor

@magento run all tests

@magento-engcom-team magento-engcom-team merged commit d0564c1 into magento:2.4-develop Nov 28, 2020
@m2-assistant
Copy link

m2-assistant bot commented Nov 28, 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

@viktorpetryk viktorpetryk viktorpetryk approved these changes

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

@gabrieldagama gabrieldagama gabrieldagama approved these changes

@zakdma zakdma Awaiting requested review from zakdma

@engcom-Kilo engcom-Kilo Awaiting requested review from engcom-Kilo

Assignees

@viktorpetryk viktorpetryk

@ihor-sviziev ihor-sviziev

@gabrieldagama gabrieldagama

@engcom-Bravo engcom-Bravo

@engcom-Foxtrot engcom-Foxtrot

@engcom-Kilo engcom-Kilo

Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Award: MFTF test coverage Component: Catalog Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: extended testing 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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Custom Option with Percent price is converted to a currency twice
9 participants
@engcom-Echo @magento-engcom-team @engcom-Bravo @ihor-sviziev @zakdma @engcom-Foxtrot @viktorpetryk @gabrieldagama @engcom-Kilo