MC-38025: FPT disappears when switching back to the cart page #31563

engcom-Golf · 2021-01-06T06:54:08Z

Description (*)

Used quote items in weee tax total calculation instead of quote address items

Related Pull Requests

Fixed Issues (if relevant)

Fixes FPT disappears when switching back to the cart page #30250

Manual testing scenarios (*)

See #30250
Expected result:
FPT tax value shouldn't disappear from totals block

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 · 2021-01-06T06:54:11Z

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

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
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-Golf · 2021-01-06T06:57:19Z

@magento run all tests

engcom-Golf · 2021-01-07T10:16:21Z

@magento run all tests

engcom-Kilo · 2021-01-08T13:02:00Z

app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php

    {
-        /** @var $items \Magento\Sales\Model\Order\Item[] */
-        $items = isset($total['address_quote_items']) ? $total['address_quote_items'] : [];
+        $items = isset($total['quote_items']) ? $total['quote_items'] : [];


Please simplify this to $items = $total['quote_items'] ?? [];

engcom-Kilo · 2021-01-08T13:06:39Z

dev/tests/integration/testsuite/Magento/Weee/Model/Total/Quote/CalculateTest.php

+        $quote = $quoteFactory->create();
+        $quoteResource->load($quote, 'multishipping_fpt_quote_id', 'reserved_order_id');
+        $cartId = $quote->getId();
+        $addressFactory = $this->objectManager->get(\Magento\Quote\Model\Quote\AddressFactory::class);


Please simplify FQN.

engcom-Golf · 2021-01-08T13:33:53Z

@magento run all tests

engcom-Bravo · 2021-01-08T14:25:14Z

✔️ QA Passed

Manual testing scenario

Create 2 websites, stores, store views
Set price scope to website catalog > catalog > price > catalog price stope
Configure Fixed Product Taxes as below. stores > config > sales > tax > Fixed Product Taxes
Create an FPT attribute and assign it to the default attribute set
https://docs.magento.com/user-guide/tax/fixed-product-tax-configuration.html#step-2-create-an-fpt-attribute
Create 4 simple products and set the FPT attribute value to Australia
Create 2 bundled products with the following config

Define FPT
Dynamic price = no
set price to 100
bundle options shipped together, all marked as default with price type = fixed
add 2 of the simple products created in the previous step.

Create a user account in the front end. Update the address with Australian address (set country to Australia, country which is used in FPT setup)
Add the 2 bundled products to the cart
Go to cart page and check the FPT is displaying correctly.
Click checkout with multiple addresses or proceed to checkout
Click on back and look at cart page FPT disappears

BEFORE applying changes provided in the PR, the FPT disappeared

AFTER switching to the PR, the FPT is included into the Summary

The order is placed successfully and the FPT is charged

magento-engcom-team · 2021-01-11T08:06:43Z

Hi @coderimus, thank you for the review.
ENGCOM-8612 has been created to process this Pull Request
✳️ @coderimus, could you please add one of the following labels to the Pull Request?

Label	Description
`Auto-Tests: Covered`	All changes in Pull Request is covered by auto-tests
`Auto-Tests: Not Covered`	Changes in Pull Request requires coverage by auto-tests
`Auto-Tests: Not Required`	Changes in Pull Request does not require coverage by auto-tests

zakdma · 2021-01-13T09:26:05Z

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

magento-engcom-team · 2021-01-13T09:28:47Z

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

m2-assistant · 2021-01-13T20:25:59Z

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

m2-community-project bot added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround. labels Jan 6, 2021

magento-engcom-team added Component: Quote Component: Weee Release Line: 2.4 labels Jan 6, 2021

m2-community-project bot added the Progress: pending review label Jan 6, 2021

engcom-Golf force-pushed the MC-38025 branch from 71bc6df to 09fdde4 Compare January 6, 2021 06:56

coderimus self-assigned this Jan 6, 2021

coderimus self-requested a review January 6, 2021 10:00

m2-community-project bot added Progress: review and removed Progress: pending review labels Jan 6, 2021

engcom-Golf force-pushed the MC-38025 branch from 09fdde4 to 6bbf2e5 Compare January 7, 2021 10:15

engcom-Golf requested review from engcom-Kilo and viktorpetryk January 8, 2021 08:29

engcom-Kilo approved these changes Jan 8, 2021

View reviewed changes

m2-community-project bot assigned engcom-Kilo Jan 8, 2021

m2-community-project bot added Progress: ready for testing and removed Progress: review labels Jan 8, 2021

engcom-Bravo self-assigned this Jan 8, 2021

m2-community-project bot added Progress: testing in progress and removed Progress: ready for testing labels Jan 8, 2021

engcom-Golf force-pushed the MC-38025 branch from 6bbf2e5 to 348823f Compare January 8, 2021 13:25

MC-38025: FPT disappears when switching back to the cart page

d523c82

engcom-Golf force-pushed the MC-38025 branch from 348823f to d523c82 Compare January 8, 2021 13:33

engcom-Bravo added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Jan 8, 2021

m2-community-project bot added Progress: ready for testing Progress: testing in progress Progress: extended testing and removed Progress: testing in progress Progress: ready for testing labels Jan 8, 2021

coderimus approved these changes Jan 11, 2021

View reviewed changes

m2-community-project bot added Progress: ready for testing and removed Progress: extended testing Progress: testing in progress labels Jan 11, 2021

coderimus added the Award: test coverage label Jan 12, 2021

magento-engcom-team merged commit fadc995 into magento:2.4-develop Jan 13, 2021

gabrieldagama added the Type: Bug Fix label Mar 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

MC-38025: FPT disappears when switching back to the cart page #31563

MC-38025: FPT disappears when switching back to the cart page #31563

Uh oh!

engcom-Golf commented Jan 6, 2021

Uh oh!

m2-assistant bot commented Jan 6, 2021

Uh oh!

engcom-Golf commented Jan 6, 2021

Uh oh!

engcom-Golf commented Jan 7, 2021

Uh oh!

engcom-Kilo Jan 8, 2021

Uh oh!

engcom-Kilo Jan 8, 2021

Uh oh!

engcom-Golf commented Jan 8, 2021

Uh oh!

engcom-Bravo commented Jan 8, 2021

Uh oh!

magento-engcom-team commented Jan 11, 2021

Uh oh!

zakdma commented Jan 13, 2021

Uh oh!

magento-engcom-team commented Jan 13, 2021

Uh oh!

m2-assistant bot commented Jan 13, 2021

Uh oh!

Uh oh!

MC-38025: FPT disappears when switching back to the cart page #31563

MC-38025: FPT disappears when switching back to the cart page #31563

Uh oh!

Conversation

engcom-Golf commented Jan 6, 2021

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Jan 6, 2021

Uh oh!

engcom-Golf commented Jan 6, 2021

Uh oh!

engcom-Golf commented Jan 7, 2021

Uh oh!

engcom-Kilo Jan 8, 2021

Choose a reason for hiding this comment

Uh oh!

engcom-Kilo Jan 8, 2021

Choose a reason for hiding this comment

Uh oh!

engcom-Golf commented Jan 8, 2021

Uh oh!

engcom-Bravo commented Jan 8, 2021

Manual testing scenario

Uh oh!

magento-engcom-team commented Jan 11, 2021

Uh oh!

zakdma commented Jan 13, 2021

Uh oh!

magento-engcom-team commented Jan 13, 2021

Uh oh!

m2-assistant bot commented Jan 13, 2021

Uh oh!

Uh oh!