Switched from LEFT to RIGHT JOIN in extension/dashboard/map model

opencart · May 19, 2024 · 811fc05 · 811fc05
1 parent 52ad507
commit 811fc05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {