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

Author: engcom-Echo

app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php

@@ -380,7 +380,7 @@ public function getContentTypes()
     public function getCustomValueCurrencyCode()
     {
         $orderInfo = $this->getShipment()->getOrder();
-        return $orderInfo->getBaseCurrency()->getCurrencyCode();
+        return $orderInfo->getOrderCurrency()->getCurrencyCode();
     }
 
     /**

dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Shipping\Block\Adminhtml\Order;
 
 use Magento\Backend\Block\Template;
@@ -28,12 +30,19 @@ class AddToPackageTest extends TestCase
      */
     private $orderRepository;
 
-    /** @var ObjectManagerInterface */
+    /**
+     * @var ObjectManagerInterface
+     */
     private $objectManager;
 
-    /** @var Registry */
+    /**
+     * @var Registry
+     */
     private $registry;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -42,30 +51,43 @@ protected function setUp(): void
     }
 
     /**
-     * Loads order entity by provided order increment ID.
+     * Test that Packaging popup renders
      *
-     * @param string $incrementId
-     * @return OrderInterface
+     * @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data.php
      */
-    private function getOrderByIncrementId(string $incrementId) : OrderInterface
+    public function testGetCommentsHtml(): void
     {
-        /** @var SearchCriteria $searchCriteria */
-        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
-            ->addFilter('increment_id', $incrementId)
-            ->create();
-
-        $items = $this->orderRepository->getList($searchCriteria)
-            ->getItems();
+        $expectedNeedle = "packaging.setItemQtyCallback(function(itemId){
+            var item = $$('[name=\"shipment[items]['+itemId+']\"]')[0],
+                itemTitle = $('order_item_' + itemId + '_title');
+            if (!itemTitle && !item) {
+                return 0;
+            }
+            if (item && !isNaN(item.value)) {
+                return item.value;
+            }
+        });";
+        $this->assertStringContainsString($expectedNeedle, $this->getHtml());
+    }
 
-        return array_pop($items);
+    /**
+     * Verify currency code on custom value field
+     *
+     * @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data_different_currency_code.php
+     */
+    public function testGetCurrencyCodeCustomValue ()
+    {
+        $expectedCurrencyCode = '<span class="customs-value-currency">
+                                        FR                                    </span>';
+        $this->assertStringContainsString($expectedCurrencyCode, $this->getHtml());
     }
 
     /**
-     * Test that Packaging popup renders
+     * Get html for packaging popup
      *
-     * @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data.php
+     * @return string
      */
-    public function testGetCommentsHtml()
+    private function getHtml()
     {
         /** @var Template $block */
         $block = $this->objectManager->get(Packaging::class);
@@ -78,17 +100,26 @@ public function testGetCommentsHtml()
         $this->registry->register('current_shipment', $shipment);
 
         $block->setTemplate('Magento_Shipping::order/packaging/popup.phtml');
-        $html = $block->toHtml();
-        $expectedNeedle = "packaging.setItemQtyCallback(function(itemId){
-            var item = $$('[name=\"shipment[items]['+itemId+']\"]')[0],
-                itemTitle = $('order_item_' + itemId + '_title');
-            if (!itemTitle && !item) {
-                return 0;
-            }
-            if (item && !isNaN(item.value)) {
-                return item.value;
-            }
-        });";
-        $this->assertStringContainsString($expectedNeedle, $html);
+
+        return $block->toHtml();
+    }
+
+    /**
+     * Loads order entity by provided order increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrderByIncrementId(string $incrementId) : OrderInterface
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+
+        $items = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
     }
 }

dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_different_currency_code.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Framework\DB\Transaction;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Transaction $transaction */
+$transaction = $objectManager->get(Transaction::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple');
+/** @var Order $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+$order->setShippingDescription('UPS Next Day Air')
+    ->setShippingMethod('ups_11')
+    ->setOrderCurrencyCode('FR')
+    ->setShippingAmount(0)
+    ->setCouponCode('1234567890')
+    ->setDiscountDescription('1234567890');
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
+
+$shipmentItems = [];
+foreach ($order->getItems() as $orderItem) {
+    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$tracking = [
+    'carrier_code' => 'ups',
+    'title' => 'United Parcel Service',
+    'number' => '987654321'
+];
+
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);
+$shipment->register();
+$transaction->addObject($shipment)->addObject($order)->save();

dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_different_currency_code_rollback.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer_rollback.php');