MC-40702: Order currency is used instead of bas currency in the shipping label for form

[engcom-Echo]

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

1. Fixes Order currency is used instead of bas currency in the shipping label for form #31891

Manual testing scenarios (*)

1. See Order currency is used instead of bas currency in the shipping label for form #31891

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]

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
13. Semantic Version Checker

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]

@magento run all tests

[zakdma]

This check is too unstable. Any change in formatting will break test
I Suggest extract value and check it

$template = '/<span class="customs-value-currency">\s*?(?<currency>[A-Za-z]+)\s*?<\/span>/';
$matches = [];
preg_match($template, $text, $matches);
$currency = $matches['currency'] ?? null;
assert...

[zakdma]

please use get() for product repository

[zakdma]

add comma

[engcom-Echo]

@magento run all tests

[engcom-Echo]

@magento run Functional Tests CE

[engcom-Oscar]

✔️ QA passed
Tested by next scenario:
Additional currency added (UAH) and set as base currency
Online shipping method enabled ( DHL)
Order placed in USD
Shipping label created for order's shipping in admin
❌ Before:

✔️ After:

[zakdma]

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

[magento-engcom-team]

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

[m2-assistant]

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.