From dfc87b92cbd387a70e81a6a3328b066d583cc595 Mon Sep 17 00:00:00 2001 From: Vladzimir Date: Mon, 14 Jun 2021 14:20:18 +0300 Subject: [PATCH 1/2] Update manufacturer.php --- upload/catalog/model/catalog/manufacturer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload/catalog/model/catalog/manufacturer.php b/upload/catalog/model/catalog/manufacturer.php index 2f7d26554d..b81981a697 100644 --- a/upload/catalog/model/catalog/manufacturer.php +++ b/upload/catalog/model/catalog/manufacturer.php @@ -46,7 +46,7 @@ public function getManufacturers($data = array()) { $manufacturer_data = $this->cache->get('manufacturer.' . (int)$this->config->get('config_language_id').'.'. (int)$this->config->get('config_store_id')); if (!$manufacturer_data) { - $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' && m2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY md.name"); + $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' AND m2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY md.name"); $manufacturer_data = $query->rows; @@ -56,4 +56,4 @@ public function getManufacturers($data = array()) { return $manufacturer_data; } } -} \ No newline at end of file +} From 660a2920a2a9aaff99701d4931875d06f7a4e3e8 Mon Sep 17 00:00:00 2001 From: Vladzimir Date: Tue, 15 Jun 2021 12:16:01 +0300 Subject: [PATCH 2/2] Fix && in sql-query --- upload/catalog/model/catalog/manufacturer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload/catalog/model/catalog/manufacturer.php b/upload/catalog/model/catalog/manufacturer.php index b81981a697..9f6b9b320e 100644 --- a/upload/catalog/model/catalog/manufacturer.php +++ b/upload/catalog/model/catalog/manufacturer.php @@ -1,14 +1,14 @@ db->query("SELECT DISTINCT *, md.name AS name FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' && m.manufacturer_id = '" . (int)$manufacturer_id . "' AND m2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"); + $query = $this->db->query("SELECT DISTINCT *, md.name AS name FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' AND m.manufacturer_id = '" . (int)$manufacturer_id . "' AND m2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"); return $query->row; } public function getManufacturers($data = array()) { if ($data) { - $sql = "SELECT * FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' && m2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"; + $sql = "SELECT * FROM " . DB_PREFIX . "manufacturer m LEFT JOIN " . DB_PREFIX . "manufacturer_to_store m2s ON (m.manufacturer_id = m2s.manufacturer_id) LEFT JOIN " . DB_PREFIX . "manufacturer_description md ON (m.manufacturer_id = md.manufacturer_id) WHERE md.language_id = '" . (int)$this->config->get('config_language_id') . "' AND m2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"; $sort_data = array( 'name',