MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view > creditmemo grid for subtotal & Shipping and Handling fee

[engcom-Echo]

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

1. Fixes Wrong currency symbol in creditmemo_grid & sales_order_view > creditmemo grid for subtotal & Shipping and Handling fee #22662

Manual testing scenarios (*)

See : #22662

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

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

[ihor-sviziev]

Suggested change

	private $order;
	private $orderRepository;

[ihor-sviziev]

1. Looks like here we can use ?? here

Suggested change

	$currencyCode = isset($item['order_currency_code'])
	? $item['order_currency_code']
	: $this->order->get($item['order_id'])->getOrderCurrencyCode();
	$currencyCode = $item['order_currency_code'] ?? $this->order->get($item['order_id'])->getOrderCurrencyCode();

2. Loading objects in the loop is a really heavy operation and not recommended. Can we load all needed orders at once? Or maybe we can do that when preparing dataSource?

[engcom-Echo]

1. Thanks.
2. Will do

[ihor-sviziev]

Suggested change

	$this->order = $order ?: \Magento\Framework\App\ObjectManager::getInstance()
	$this->orderRepository = $orderRepository ?? \Magento\Framework\App\ObjectManager::getInstance()

[ihor-sviziev]

Suggested change

	protected $orderMock;
	private $orderRepositoryMock;

[engcom-Echo]

@magento run all tests

[ihor-sviziev]

I still believe we can iterate all the orders and get all needed info with a single request instead of loading each order in the loop. Please update the solution

[ihor-sviziev]

Suggested change

	private $orderRepository;
	private $orderRepositoryMock;

[ihor-sviziev]

Suggested change

	'order' => $this->orderRepository,
	'orderRepository' => $this->orderRepositoryMock,

[ihor-sviziev]

Suggested change

	public function testPrepareDataSource(
	$itemName,
	$oldItemValue,
	$newItemValue,
	$orderCurrencyCode
	): void {
	public function testPrepareDataSource(
	string $itemName,
	string $oldItemValue,
	string $newItemValue,
	?string $orderCurrencyCode
	): void {

[dmitriyprime]

@magento i am working on it

[zakdma]

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

[magento-engcom-team]

@zakdma, an error occurred during the Pull Request import.

[magento-engcom-team]

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

[engcom-Bravo]

✔️ QA Passed

Manual testing scenario

1. From Admin Panel, go to Stores - All Stores and create a second Website, Store, Store View
2. Go to Stores - Configuration and change the Scope for the previously created second Store View
3. Go to General - Currency Setup and add Ukrainian Hryvnia to Allowed Currencies
4. Change the Default Display Currency to Ukrainian Hryvnia. Save Config
5. Go to Stores - Currency Rates and set 2 for UAH. Save Currency Rates
6. Create an order from the second Store, where the currency is UAH
7. From Admin Panel, go to Sales - Orders. Create an Invoice for the previously created order
8. Create a Credit Memo for the previously created order
9. Open Orders Grid.
10. Click Columns and check Subtotal and Shipping and Handling
11. Observe the Currency symbol in Grand Total (Base), Subtotal and Shipping and Handling columns
    The currency symbol is Dollar $
    
12. Go to Sales - Credit Memos grid and observe Currency symbol in Refund, Subtotal and Shipping and Handling columns
    The currency symbol is Dollar $
    

AFTER applying changes provided in the PR the Currency symbol in the Credit Memo grid is displayed correctly

[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.