From 6b0f8d0ea944de84dae8cbe6e62b983c9e1980f2 Mon Sep 17 00:00:00 2001
From: Ankur Raiyani <ankurvr7003@gmail.com>
Date: Sat, 2 Jun 2018 09:59:20 +0530
Subject: [PATCH 1/2] Wrong Last orders amount on dashboard #15660

Wrong order amount on dashboard on Last orders listing when having more than one website with different currencies #15660
---
 .../Backend/Block/Widget/Grid/Column/Renderer/Currency.php   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index a9db629f24a87..82c30af830728 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -70,10 +70,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 

From 25948530b20e95d43a9c816b9068aaa20fd1bfe9 Mon Sep 17 00:00:00 2001
From: Ankur Raiyani <ankur@seepossible.com>
Date: Sat, 2 Jun 2018 10:02:58 +0530
Subject: [PATCH 2/2] Backport to 2.1 code

---
 app/code/Magento/Sales/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 236c3a90cd5b2..8b0e5c5444503 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -669,7 +669,7 @@
                 <item name="billing_address" xsi:type="object">BillingAddressAggregator</item>
                 <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item>
                 <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item>
-                <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item>
+                <item name="subtotal" xsi:type="string">sales_order.base_subtotal</item>
                 <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item>
                 <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item>
                 <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item>