Merge pull request #11235 from mnastalski/backend-orders-performance

Prevent unnecessary Order objects from being created in Admin Orders
PrestaShop · Nov 20, 2018 · 37eb002 · 37eb002
2 parents 22c5347 + 5898022
commit 37eb002
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
@@ -186,9 +186,14 @@ public function __construct()
 
     public static function setOrderCurrency($echo, $tr)
     {
-        $order = new Order($tr['id_order']);
+        if (!empty($tr['id_currency'])) {
+            $idCurrency = (int) $tr['id_currency'];
+        } else {
+            $order = new Order($tr['id_order']);
+            $idCurrency = (int) $order->id_currency;
+        }
 
-        return Tools::displayPrice($echo, (int) $order->id_currency);
+        return Tools::displayPrice($echo, $idCurrency);
     }
 
     public function initPageHeaderToolbar()