From 811fc05153442bb9c40446e57539d2149509094c Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Sun, 19 May 2024 13:26:11 -0400 Subject: [PATCH] Switched from LEFT to RIGHT JOIN in extension/dashboard/map model --- upload/admin/controller/extension/dashboard/map.php | 2 +- upload/admin/model/extension/dashboard/map.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upload/admin/controller/extension/dashboard/map.php b/upload/admin/controller/extension/dashboard/map.php index e3c168080..7e9bad6ca 100644 --- a/upload/admin/controller/extension/dashboard/map.php +++ b/upload/admin/controller/extension/dashboard/map.php @@ -128,7 +128,7 @@ public function map(): void { $results = $this->model_extension_dashboard_map->getTotalOrdersByCountry(); foreach ($results as $result) { - $json[$result['iso_code_2']] = [ + $json[strtolower($result['iso_code_2'])] = [ 'total' => $result['total'], 'amount' => $this->currency->format($result['amount'], $this->config->get('config_currency')) ]; diff --git a/upload/admin/model/extension/dashboard/map.php b/upload/admin/model/extension/dashboard/map.php index 75fe4f9f4..07d7e54e7 100644 --- a/upload/admin/model/extension/dashboard/map.php +++ b/upload/admin/model/extension/dashboard/map.php @@ -13,7 +13,7 @@ public function getTotalOrdersByCountry(): array { } if ($implode) { - $query = $this->db->query("SELECT COUNT(*) AS `total`, SUM(`o`.`total`) AS `amount`, LCASE(`c`.`iso_code_2`) AS `iso_code_2` FROM `" . DB_PREFIX . "order` `o` LEFT JOIN `" . DB_PREFIX . "country` `c` ON (`o`.`payment_country_id` = `c`.`country_id`) WHERE `o`.`order_status_id` IN(" . implode(',', $implode) . ") GROUP BY `o`.`payment_country_id`"); + $query = $this->db->query("SELECT COUNT(*) AS `total`, SUM(`o`.`total`) AS `amount`, LCASE(`c`.`iso_code_2`) AS `iso_code_2` FROM `" . DB_PREFIX . "order` `o` RIGHT JOIN `" . DB_PREFIX . "country` `c` ON (`o`.`payment_country_id` = `c`.`country_id`) WHERE (" . implode(" OR ", $implode) . ") GROUP BY `o`.`payment_country_id`"); return $query->rows; } else {