webdesby/dominik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Выровнял табуляция

Browse Source
This commit is contained in:
Konstantin
2026-05-30 14:59:57 +03:00
parent 6a847ab7b5
commit 2a14f5ac3c
3 changed files with 304 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/store/controller/product/category.php
+7 -7
View File
@@ -2,8 +2,10 @@
// * @source See SOURCE.txt for source and other copyright. // * @source See SOURCE.txt for source and other copyright.
// * @license GNU General Public License version 3; see LICENSE.txt // * @license GNU General Public License version 3; see LICENSE.txt
class ControllerProductCategory extends Controller { class ControllerProductCategory extends Controller
public function index() { {
public function index()
{
$this->load->language('product/category'); $this->load->language('product/category');
$this->load->model('catalog/category'); $this->load->model('catalog/category');
@@ -14,7 +16,6 @@ $this->document->addStyle('store/view/theme/dominik/assets/css/swiper-bundle.min
$this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'); $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js');
$this->load->model('tool/image'); $this->load->model('tool/image');
$data['text_empty'] = $this->language->get('text_empty'); $data['text_empty'] = $this->language->get('text_empty');
if ($this->config->get('config_noindex_disallow_params')) { if ($this->config->get('config_noindex_disallow_params')) {
@@ -120,7 +121,6 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$category_info = $this->model_catalog_category->getCategory($category_id); $category_info = $this->model_catalog_category->getCategory($category_id);
if ($category_info) { if ($category_info) {
if ($category_info['meta_title']) { if ($category_info['meta_title']) {
$this->document->setTitle($category_info['meta_title']); $this->document->setTitle($category_info['meta_title']);
} else { } else {
@@ -209,6 +209,7 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$results = $this->model_catalog_product->getProducts($filter_data); $results = $this->model_catalog_product->getProducts($filter_data);
foreach ($results as $result) { foreach ($results as $result) {
if ($result['image']) { if ($result['image']) {
$image = $this->model_tool_image->resize($result['image'], $this->config->get('theme_' . $this->config->get('config_theme') . '_image_product_width'), $this->config->get('theme_' . $this->config->get('config_theme') . '_image_product_height')); $image = $this->model_tool_image->resize($result['image'], $this->config->get('theme_' . $this->config->get('config_theme') . '_image_product_width'), $this->config->get('theme_' . $this->config->get('config_theme') . '_image_product_height'));
} else { } else {
@@ -247,6 +248,7 @@ if($results){
} else { } else {
$additional_image = false; $additional_image = false;
} }
$data['products'][] = array( $data['products'][] = array(
'product_id' => $result['product_id'], 'product_id' => $result['product_id'],
'thumb' => $image, 'thumb' => $image,
@@ -264,7 +266,7 @@ if($results){
'tax' => $tax, 'tax' => $tax,
'minimum' => $result['minimum'] > 0 ? $result['minimum'] : 1, 'minimum' => $result['minimum'] > 0 ? $result['minimum'] : 1,
'rating' => $result['rating'], 'rating' => $result['rating'],
'href' => $this->url->link('product/product', 'path=' . $this->request->get['path'] . '&product_id=' . $result['product_id'] . $url) 'href' => $this->url->link('product/product', 'path=' . $this->request->get['path'] . '&product_id=' . $result['product_id'])
); );
} }
@@ -406,7 +408,6 @@ if($results){
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next'); $this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next');
} }
} else { } else {
if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) { if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) {
$server = $this->config->get('config_ssl'); $server = $this->config->get('config_ssl');
} else { } else {
@@ -421,7 +422,6 @@ if($results){
} }
if ($this->config->get('config_add_prevnext')) { if ($this->config->get('config_add_prevnext')) {
if ($page == 2) { if ($page == 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev'); $this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev');
} elseif ($page > 2) { } elseif ($page > 2) {
public/store/model/catalog/product.php
+121 -82
View File
@@ -2,13 +2,16 @@
// * @source See SOURCE.txt for source and other copyright. // * @source See SOURCE.txt for source and other copyright.
// * @license GNU General Public License version 3; see LICENSE.txt // * @license GNU General Public License version 3; see LICENSE.txt
class ModelCatalogProduct extends Model { class ModelCatalogProduct extends Model
public function updateViewed($product_id) { {
$this->db->query("UPDATE " . DB_PREFIX . "product SET viewed = (viewed + 1) WHERE product_id = '" . (int)$product_id . "'"); public function updateViewed($product_id)
{
$this->db->query('UPDATE ' . DB_PREFIX . "product SET viewed = (viewed + 1) WHERE product_id = '" . (int) $product_id . "'");
} }
public function getProduct($product_id) { public function getProduct($product_id)
$query = $this->db->query("SELECT DISTINCT *, COALESCE(pp.price, p.price) AS price, COALESCE(pp.price_2, p.price_2) AS price_2, COALESCE(pp.price_3, p.price_3) AS price_3, pd.name AS name, p.image, p.noindex AS noindex, m.name AS manufacturer, (SELECT price FROM " . DB_PREFIX . "product_discount pd2 WHERE pd2.product_id = p.product_id AND pd2.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND pd2.quantity = '1' AND ((pd2.date_start = '0000-00-00' OR pd2.date_start < NOW()) AND (pd2.date_end = '0000-00-00' OR pd2.date_end > NOW())) ORDER BY pd2.priority ASC, pd2.price ASC LIMIT 1) AS discount, (SELECT price FROM " . DB_PREFIX . "product_special ps WHERE ps.product_id = p.product_id AND ps.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) ORDER BY ps.priority ASC, ps.price ASC LIMIT 1) AS special, (SELECT points FROM " . DB_PREFIX . "product_reward pr WHERE pr.product_id = p.product_id AND pr.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "') AS reward, (SELECT ss.name FROM " . DB_PREFIX . "stock_status ss WHERE ss.stock_status_id = p.stock_status_id AND ss.language_id = '" . (int)$this->config->get('config_language_id') . "') AS stock_status, (SELECT wcd.unit FROM " . DB_PREFIX . "weight_class_description wcd WHERE p.weight_class_id = wcd.weight_class_id AND wcd.language_id = '" . (int)$this->config->get('config_language_id') . "') AS weight_class, (SELECT lcd.unit FROM " . DB_PREFIX . "length_class_description lcd WHERE p.length_class_id = lcd.length_class_id AND lcd.language_id = '" . (int)$this->config->get('config_language_id') . "') AS length_class, (SELECT AVG(rating) AS total FROM " . DB_PREFIX . "review r1 WHERE r1.product_id = p.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating, (SELECT COUNT(*) AS total FROM " . DB_PREFIX . "review r2 WHERE r2.product_id = p.product_id AND r2.status = '1' GROUP BY r2.product_id) AS reviews, p.sort_order FROM " . DB_PREFIX . "product p LEFT JOIN " . DB_PREFIX . "product_description pd ON (p.product_id = pd.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) LEFT JOIN " . DB_PREFIX . "manufacturer m ON (p.manufacturer_id = m.manufacturer_id) LEFT JOIN " . DB_PREFIX . "product_prices pp ON (p.product_id = pp.product_id AND pp.store_id = '" . (int)$this->config->get('config_store_id') . "') WHERE p.product_id = '" . (int)$product_id . "' AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"); {
$query = $this->db->query('SELECT DISTINCT *, COALESCE(pp.price, p.price) AS price, COALESCE(pp.price_2, p.price_2) AS price_2, COALESCE(pp.price_3, p.price_3) AS price_3, pd.name AS name, p.image, p.noindex AS noindex, m.name AS manufacturer, (SELECT price FROM ' . DB_PREFIX . "product_discount pd2 WHERE pd2.product_id = p.product_id AND pd2.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND pd2.quantity = '1' AND ((pd2.date_start = '0000-00-00' OR pd2.date_start < NOW()) AND (pd2.date_end = '0000-00-00' OR pd2.date_end > NOW())) ORDER BY pd2.priority ASC, pd2.price ASC LIMIT 1) AS discount, (SELECT price FROM " . DB_PREFIX . "product_special ps WHERE ps.product_id = p.product_id AND ps.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) ORDER BY ps.priority ASC, ps.price ASC LIMIT 1) AS special, (SELECT points FROM " . DB_PREFIX . "product_reward pr WHERE pr.product_id = p.product_id AND pr.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "') AS reward, (SELECT ss.name FROM " . DB_PREFIX . "stock_status ss WHERE ss.stock_status_id = p.stock_status_id AND ss.language_id = '" . (int) $this->config->get('config_language_id') . "') AS stock_status, (SELECT wcd.unit FROM " . DB_PREFIX . "weight_class_description wcd WHERE p.weight_class_id = wcd.weight_class_id AND wcd.language_id = '" . (int) $this->config->get('config_language_id') . "') AS weight_class, (SELECT lcd.unit FROM " . DB_PREFIX . "length_class_description lcd WHERE p.length_class_id = lcd.length_class_id AND lcd.language_id = '" . (int) $this->config->get('config_language_id') . "') AS length_class, (SELECT AVG(rating) AS total FROM " . DB_PREFIX . "review r1 WHERE r1.product_id = p.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating, (SELECT COUNT(*) AS total FROM " . DB_PREFIX . "review r2 WHERE r2.product_id = p.product_id AND r2.status = '1' GROUP BY r2.product_id) AS reviews, p.sort_order FROM " . DB_PREFIX . 'product p LEFT JOIN ' . DB_PREFIX . 'product_description pd ON (p.product_id = pd.product_id) LEFT JOIN ' . DB_PREFIX . 'product_to_store p2s ON (p.product_id = p2s.product_id) LEFT JOIN ' . DB_PREFIX . 'manufacturer m ON (p.manufacturer_id = m.manufacturer_id) LEFT JOIN ' . DB_PREFIX . "product_prices pp ON (p.product_id = pp.product_id AND pp.store_id = '" . (int) $this->config->get('config_store_id') . "') WHERE p.product_id = '" . (int) $product_id . "' AND pd.language_id = '" . (int) $this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "'");
if ($query->num_rows) { if ($query->num_rows) {
return array( return array(
@@ -67,26 +70,27 @@ class ModelCatalogProduct extends Model {
} }
} }
public function getProducts($data = array()) { public function getProducts($data = array())
$sql = "SELECT p.product_id, (SELECT AVG(rating) AS total FROM " . DB_PREFIX . "review r1 WHERE r1.product_id = p.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating, (SELECT price FROM " . DB_PREFIX . "product_discount pd2 WHERE pd2.product_id = p.product_id AND pd2.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND pd2.quantity = '1' AND ((pd2.date_start = '0000-00-00' OR pd2.date_start < NOW()) AND (pd2.date_end = '0000-00-00' OR pd2.date_end > NOW())) ORDER BY pd2.priority ASC, pd2.price ASC LIMIT 1) AS discount, (SELECT price FROM " . DB_PREFIX . "product_special ps WHERE ps.product_id = p.product_id AND ps.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) ORDER BY ps.priority ASC, ps.price ASC LIMIT 1) AS special"; {
$sql = 'SELECT p.product_id, (SELECT AVG(rating) AS total FROM ' . DB_PREFIX . "review r1 WHERE r1.product_id = p.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating, (SELECT price FROM " . DB_PREFIX . "product_discount pd2 WHERE pd2.product_id = p.product_id AND pd2.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND pd2.quantity = '1' AND ((pd2.date_start = '0000-00-00' OR pd2.date_start < NOW()) AND (pd2.date_end = '0000-00-00' OR pd2.date_end > NOW())) ORDER BY pd2.priority ASC, pd2.price ASC LIMIT 1) AS discount, (SELECT price FROM " . DB_PREFIX . "product_special ps WHERE ps.product_id = p.product_id AND ps.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) ORDER BY ps.priority ASC, ps.price ASC LIMIT 1) AS special";
if (!empty($data['filter_category_id'])) { if (!empty($data['filter_category_id'])) {
if (!empty($data['filter_sub_category'])) { if (!empty($data['filter_sub_category'])) {
$sql .= " FROM " . DB_PREFIX . "category_path cp LEFT JOIN " . DB_PREFIX . "product_to_category p2c ON (cp.category_id = p2c.category_id)"; $sql .= ' FROM ' . DB_PREFIX . 'category_path cp LEFT JOIN ' . DB_PREFIX . 'product_to_category p2c ON (cp.category_id = p2c.category_id)';
} else { } else {
$sql .= " FROM " . DB_PREFIX . "product_to_category p2c"; $sql .= ' FROM ' . DB_PREFIX . 'product_to_category p2c';
} }
if (!empty($data['filter_filter'])) { if (!empty($data['filter_filter'])) {
$sql .= " LEFT JOIN " . DB_PREFIX . "product_filter pf ON (p2c.product_id = pf.product_id) LEFT JOIN " . DB_PREFIX . "product p ON (pf.product_id = p.product_id)"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product_filter pf ON (p2c.product_id = pf.product_id) LEFT JOIN ' . DB_PREFIX . 'product p ON (pf.product_id = p.product_id)';
} else { } else {
$sql .= " LEFT JOIN " . DB_PREFIX . "product p ON (p2c.product_id = p.product_id)"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product p ON (p2c.product_id = p.product_id)';
} }
} else { } else {
$sql .= " FROM " . DB_PREFIX . "product p"; $sql .= ' FROM ' . DB_PREFIX . 'product p';
} }
$sql .= " LEFT JOIN " . DB_PREFIX . "product_description pd ON (p.product_id = pd.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pd.language_id = '" . (int)$this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product_description pd ON (p.product_id = pd.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pd.language_id = '" . (int) $this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "'";
if (!empty($data['filter_category_id'])) { if (!empty($data['filter_category_id'])) {
if (!empty($data['filter_sub_category'])) { if (!empty($data['filter_sub_category'])) {
@@ -104,12 +108,12 @@ class ModelCatalogProduct extends Model {
$implode[] = (int) $filter_id; $implode[] = (int) $filter_id;
} }
$sql .= " AND pf.filter_id IN (" . implode(',', $implode) . ")"; $sql .= ' AND pf.filter_id IN (' . implode(',', $implode) . ')';
} }
} }
if (!empty($data['filter_name']) || !empty($data['filter_tag'])) { if (!empty($data['filter_name']) || !empty($data['filter_tag'])) {
$sql .= " AND ("; $sql .= ' AND (';
if (!empty($data['filter_name'])) { if (!empty($data['filter_name'])) {
$implode = array(); $implode = array();
@@ -121,7 +125,7 @@ class ModelCatalogProduct extends Model {
} }
if ($implode) { if ($implode) {
$sql .= " " . implode(" AND ", $implode) . ""; $sql .= ' ' . implode(' AND ', $implode) . '';
} }
if (!empty($data['filter_description'])) { if (!empty($data['filter_description'])) {
@@ -130,7 +134,7 @@ class ModelCatalogProduct extends Model {
} }
if (!empty($data['filter_name']) && !empty($data['filter_tag'])) { if (!empty($data['filter_name']) && !empty($data['filter_tag'])) {
$sql .= " OR "; $sql .= ' OR ';
} }
if (!empty($data['filter_tag'])) { if (!empty($data['filter_tag'])) {
@@ -143,7 +147,7 @@ class ModelCatalogProduct extends Model {
} }
if ($implode) { if ($implode) {
$sql .= " " . implode(" AND ", $implode) . ""; $sql .= ' ' . implode(' AND ', $implode) . '';
} }
} }
@@ -157,14 +161,14 @@ class ModelCatalogProduct extends Model {
$sql .= " OR LCASE(p.mpn) = '" . $this->db->escape(utf8_strtolower($data['filter_name'])) . "'"; $sql .= " OR LCASE(p.mpn) = '" . $this->db->escape(utf8_strtolower($data['filter_name'])) . "'";
} }
$sql .= ")"; $sql .= ')';
} }
if (!empty($data['filter_manufacturer_id'])) { if (!empty($data['filter_manufacturer_id'])) {
$sql .= " AND p.manufacturer_id = '" . (int) $data['filter_manufacturer_id'] . "'"; $sql .= " AND p.manufacturer_id = '" . (int) $data['filter_manufacturer_id'] . "'";
} }
$sql .= " GROUP BY p.product_id"; $sql .= ' GROUP BY p.product_id';
$sort_data = array( $sort_data = array(
'pd.name', 'pd.name',
@@ -178,20 +182,20 @@ class ModelCatalogProduct extends Model {
if (isset($data['sort']) && in_array($data['sort'], $sort_data)) { if (isset($data['sort']) && in_array($data['sort'], $sort_data)) {
if ($data['sort'] == 'pd.name' || $data['sort'] == 'p.model') { if ($data['sort'] == 'pd.name' || $data['sort'] == 'p.model') {
$sql .= " ORDER BY LCASE(" . $data['sort'] . ")"; $sql .= ' ORDER BY LCASE(' . $data['sort'] . ')';
} elseif ($data['sort'] == 'p.price') { } elseif ($data['sort'] == 'p.price') {
$sql .= " ORDER BY (CASE WHEN special IS NOT NULL THEN special WHEN discount IS NOT NULL THEN discount ELSE p.price END)"; $sql .= ' ORDER BY (CASE WHEN special IS NOT NULL THEN special WHEN discount IS NOT NULL THEN discount ELSE p.price END)';
} else { } else {
$sql .= " ORDER BY " . $data['sort']; $sql .= ' ORDER BY ' . $data['sort'];
} }
} else { } else {
$sql .= " ORDER BY p.sort_order"; $sql .= ' ORDER BY p.sort_order';
} }
if (isset($data['order']) && ($data['order'] == 'DESC')) { if (isset($data['order']) && ($data['order'] == 'DESC')) {
$sql .= " DESC, LCASE(pd.name) DESC"; $sql .= ' DESC, LCASE(pd.name) DESC';
} else { } else {
$sql .= " ASC, LCASE(pd.name) ASC"; $sql .= ' ASC, LCASE(pd.name) ASC';
} }
if (isset($data['start']) || isset($data['limit'])) { if (isset($data['start']) || isset($data['limit'])) {
@@ -203,7 +207,7 @@ class ModelCatalogProduct extends Model {
$data['limit'] = 20; $data['limit'] = 20;
} }
$sql .= " LIMIT " . (int)$data['start'] . "," . (int)$data['limit']; $sql .= ' LIMIT ' . (int) $data['start'] . ',' . (int) $data['limit'];
} }
$product_data = array(); $product_data = array();
@@ -211,14 +215,19 @@ class ModelCatalogProduct extends Model {
$query = $this->db->query($sql); $query = $this->db->query($sql);
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['product_id']] = $this->getProduct($result['product_id']); $product = $this->getProduct($result['product_id']);
if ($product) {
$product_data[$result['product_id']] = $product;
}
} }
return $product_data; return $product_data;
} }
public function getProductSpecials($data = array()) { public function getProductSpecials($data = array())
$sql = "SELECT DISTINCT ps.product_id, (SELECT AVG(rating) FROM " . DB_PREFIX . "review r1 WHERE r1.product_id = ps.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating FROM " . DB_PREFIX . "product_special ps LEFT JOIN " . DB_PREFIX . "product p ON (ps.product_id = p.product_id) LEFT JOIN " . DB_PREFIX . "product_description pd ON (p.product_id = pd.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' AND ps.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) GROUP BY ps.product_id"; {
$sql = 'SELECT DISTINCT ps.product_id, (SELECT AVG(rating) FROM ' . DB_PREFIX . "review r1 WHERE r1.product_id = ps.product_id AND r1.status = '1' GROUP BY r1.product_id) AS rating FROM " . DB_PREFIX . 'product_special ps LEFT JOIN ' . DB_PREFIX . 'product p ON (ps.product_id = p.product_id) LEFT JOIN ' . DB_PREFIX . 'product_description pd ON (p.product_id = pd.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "' AND ps.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW())) GROUP BY ps.product_id";
$sort_data = array( $sort_data = array(
'pd.name', 'pd.name',
@@ -230,18 +239,18 @@ class ModelCatalogProduct extends Model {
if (isset($data['sort']) && in_array($data['sort'], $sort_data)) { if (isset($data['sort']) && in_array($data['sort'], $sort_data)) {
if ($data['sort'] == 'pd.name' || $data['sort'] == 'p.model') { if ($data['sort'] == 'pd.name' || $data['sort'] == 'p.model') {
$sql .= " ORDER BY LCASE(" . $data['sort'] . ")"; $sql .= ' ORDER BY LCASE(' . $data['sort'] . ')';
} else { } else {
$sql .= " ORDER BY " . $data['sort']; $sql .= ' ORDER BY ' . $data['sort'];
} }
} else { } else {
$sql .= " ORDER BY p.sort_order"; $sql .= ' ORDER BY p.sort_order';
} }
if (isset($data['order']) && ($data['order'] == 'DESC')) { if (isset($data['order']) && ($data['order'] == 'DESC')) {
$sql .= " DESC, LCASE(pd.name) DESC"; $sql .= ' DESC, LCASE(pd.name) DESC';
} else { } else {
$sql .= " ASC, LCASE(pd.name) ASC"; $sql .= ' ASC, LCASE(pd.name) ASC';
} }
if (isset($data['start']) || isset($data['limit'])) { if (isset($data['start']) || isset($data['limit'])) {
@@ -253,7 +262,7 @@ class ModelCatalogProduct extends Model {
$data['limit'] = 20; $data['limit'] = 20;
} }
$sql .= " LIMIT " . (int)$data['start'] . "," . (int)$data['limit']; $sql .= ' LIMIT ' . (int) $data['start'] . ',' . (int) $data['limit'];
} }
$product_data = array(); $product_data = array();
@@ -261,20 +270,29 @@ class ModelCatalogProduct extends Model {
$query = $this->db->query($sql); $query = $this->db->query($sql);
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['product_id']] = $this->getProduct($result['product_id']); $product = $this->getProduct($result['product_id']);
if ($product) {
$product_data[$result['product_id']] = $product;
}
} }
return $product_data; return $product_data;
} }
public function getLatestProducts($limit) { public function getLatestProducts($limit)
{
$product_data = $this->cache->get('product.latest.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit); $product_data = $this->cache->get('product.latest.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit);
if (!$product_data) { if (!$product_data) {
$query = $this->db->query("SELECT p.product_id FROM " . DB_PREFIX . "product p LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY p.date_added DESC LIMIT " . (int)$limit); $query = $this->db->query('SELECT p.product_id FROM ' . DB_PREFIX . 'product p LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "' ORDER BY p.date_added DESC LIMIT " . (int) $limit);
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['product_id']] = $this->getProduct($result['product_id']); $product = $this->getProduct($result['product_id']);
if ($product) {
$product_data[$result['product_id']] = $product;
}
} }
$this->cache->set('product.latest.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data); $this->cache->set('product.latest.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data);
@@ -283,14 +301,19 @@ class ModelCatalogProduct extends Model {
return $product_data; return $product_data;
} }
public function getPopularProducts($limit) { public function getPopularProducts($limit)
{
$product_data = $this->cache->get('product.popular.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit); $product_data = $this->cache->get('product.popular.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit);
if (!$product_data) { if (!$product_data) {
$query = $this->db->query("SELECT p.product_id FROM " . DB_PREFIX . "product p LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY p.viewed DESC, p.date_added DESC LIMIT " . (int)$limit); $query = $this->db->query('SELECT p.product_id FROM ' . DB_PREFIX . 'product p LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "' ORDER BY p.viewed DESC, p.date_added DESC LIMIT " . (int) $limit);
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['product_id']] = $this->getProduct($result['product_id']); $product = $this->getProduct($result['product_id']);
if ($product) {
$product_data[$result['product_id']] = $product;
}
} }
$this->cache->set('product.popular.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data); $this->cache->set('product.popular.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data);
@@ -299,16 +322,21 @@ class ModelCatalogProduct extends Model {
return $product_data; return $product_data;
} }
public function getBestSellerProducts($limit) { public function getBestSellerProducts($limit)
{
$product_data = $this->cache->get('product.bestseller.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit); $product_data = $this->cache->get('product.bestseller.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit);
if (!$product_data) { if (!$product_data) {
$product_data = array(); $product_data = array();
$query = $this->db->query("SELECT op.product_id, SUM(op.quantity) AS total FROM " . DB_PREFIX . "order_product op LEFT JOIN `" . DB_PREFIX . "order` o ON (op.order_id = o.order_id) LEFT JOIN `" . DB_PREFIX . "product` p ON (op.product_id = p.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE o.order_status_id > '0' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' GROUP BY op.product_id ORDER BY total DESC LIMIT " . (int)$limit); $query = $this->db->query('SELECT op.product_id, SUM(op.quantity) AS total FROM ' . DB_PREFIX . 'order_product op LEFT JOIN `' . DB_PREFIX . 'order` o ON (op.order_id = o.order_id) LEFT JOIN `' . DB_PREFIX . 'product` p ON (op.product_id = p.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE o.order_status_id > '0' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "' GROUP BY op.product_id ORDER BY total DESC LIMIT " . (int) $limit);
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['product_id']] = $this->getProduct($result['product_id']); $product = $this->getProduct($result['product_id']);
if ($product) {
$product_data[$result['product_id']] = $product;
}
} }
$this->cache->set('product.bestseller.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data); $this->cache->set('product.bestseller.' . (int) $this->config->get('config_language_id') . '.' . (int) $this->config->get('config_store_id') . '.' . $this->config->get('config_customer_group_id') . '.' . (int) $limit, $product_data);
@@ -317,15 +345,16 @@ class ModelCatalogProduct extends Model {
return $product_data; return $product_data;
} }
public function getProductAttributes($product_id) { public function getProductAttributes($product_id)
{
$product_attribute_group_data = array(); $product_attribute_group_data = array();
$product_attribute_group_query = $this->db->query("SELECT ag.attribute_group_id, agd.name FROM " . DB_PREFIX . "product_attribute pa LEFT JOIN " . DB_PREFIX . "attribute a ON (pa.attribute_id = a.attribute_id) LEFT JOIN " . DB_PREFIX . "attribute_group ag ON (a.attribute_group_id = ag.attribute_group_id) LEFT JOIN " . DB_PREFIX . "attribute_group_description agd ON (ag.attribute_group_id = agd.attribute_group_id) WHERE pa.product_id = '" . (int)$product_id . "' AND agd.language_id = '" . (int)$this->config->get('config_language_id') . "' GROUP BY ag.attribute_group_id ORDER BY ag.sort_order, agd.name"); $product_attribute_group_query = $this->db->query('SELECT ag.attribute_group_id, agd.name FROM ' . DB_PREFIX . 'product_attribute pa LEFT JOIN ' . DB_PREFIX . 'attribute a ON (pa.attribute_id = a.attribute_id) LEFT JOIN ' . DB_PREFIX . 'attribute_group ag ON (a.attribute_group_id = ag.attribute_group_id) LEFT JOIN ' . DB_PREFIX . "attribute_group_description agd ON (ag.attribute_group_id = agd.attribute_group_id) WHERE pa.product_id = '" . (int) $product_id . "' AND agd.language_id = '" . (int) $this->config->get('config_language_id') . "' GROUP BY ag.attribute_group_id ORDER BY ag.sort_order, agd.name");
foreach ($product_attribute_group_query->rows as $product_attribute_group) { foreach ($product_attribute_group_query->rows as $product_attribute_group) {
$product_attribute_data = array(); $product_attribute_data = array();
$product_attribute_query = $this->db->query("SELECT a.attribute_id, ad.name, pa.text FROM " . DB_PREFIX . "product_attribute pa LEFT JOIN " . DB_PREFIX . "attribute a ON (pa.attribute_id = a.attribute_id) LEFT JOIN " . DB_PREFIX . "attribute_description ad ON (a.attribute_id = ad.attribute_id) WHERE pa.product_id = '" . (int)$product_id . "' AND a.attribute_group_id = '" . (int)$product_attribute_group['attribute_group_id'] . "' AND ad.language_id = '" . (int)$this->config->get('config_language_id') . "' AND pa.language_id = '" . (int)$this->config->get('config_language_id') . "' ORDER BY a.sort_order, ad.name"); $product_attribute_query = $this->db->query('SELECT a.attribute_id, ad.name, pa.text FROM ' . DB_PREFIX . 'product_attribute pa LEFT JOIN ' . DB_PREFIX . 'attribute a ON (pa.attribute_id = a.attribute_id) LEFT JOIN ' . DB_PREFIX . "attribute_description ad ON (a.attribute_id = ad.attribute_id) WHERE pa.product_id = '" . (int) $product_id . "' AND a.attribute_group_id = '" . (int) $product_attribute_group['attribute_group_id'] . "' AND ad.language_id = '" . (int) $this->config->get('config_language_id') . "' AND pa.language_id = '" . (int) $this->config->get('config_language_id') . "' ORDER BY a.sort_order, ad.name");
foreach ($product_attribute_query->rows as $product_attribute) { foreach ($product_attribute_query->rows as $product_attribute) {
$product_attribute_data[] = array( $product_attribute_data[] = array(
@@ -345,15 +374,16 @@ class ModelCatalogProduct extends Model {
return $product_attribute_group_data; return $product_attribute_group_data;
} }
public function getProductOptions($product_id) { public function getProductOptions($product_id)
{
$product_option_data = array(); $product_option_data = array();
$product_option_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_option po LEFT JOIN `" . DB_PREFIX . "option` o ON (po.option_id = o.option_id) LEFT JOIN " . DB_PREFIX . "option_description od ON (o.option_id = od.option_id) WHERE po.product_id = '" . (int)$product_id . "' AND od.language_id = '" . (int)$this->config->get('config_language_id') . "' ORDER BY o.sort_order"); $product_option_query = $this->db->query('SELECT * FROM ' . DB_PREFIX . 'product_option po LEFT JOIN `' . DB_PREFIX . 'option` o ON (po.option_id = o.option_id) LEFT JOIN ' . DB_PREFIX . "option_description od ON (o.option_id = od.option_id) WHERE po.product_id = '" . (int) $product_id . "' AND od.language_id = '" . (int) $this->config->get('config_language_id') . "' ORDER BY o.sort_order");
foreach ($product_option_query->rows as $product_option) { foreach ($product_option_query->rows as $product_option) {
$product_option_value_data = array(); $product_option_value_data = array();
$product_option_value_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_option_value pov LEFT JOIN " . DB_PREFIX . "option_value ov ON (pov.option_value_id = ov.option_value_id) LEFT JOIN " . DB_PREFIX . "option_value_description ovd ON (ov.option_value_id = ovd.option_value_id) WHERE pov.product_id = '" . (int)$product_id . "' AND pov.product_option_id = '" . (int)$product_option['product_option_id'] . "' AND ovd.language_id = '" . (int)$this->config->get('config_language_id') . "' ORDER BY ov.sort_order"); $product_option_value_query = $this->db->query('SELECT * FROM ' . DB_PREFIX . 'product_option_value pov LEFT JOIN ' . DB_PREFIX . 'option_value ov ON (pov.option_value_id = ov.option_value_id) LEFT JOIN ' . DB_PREFIX . "option_value_description ovd ON (ov.option_value_id = ovd.option_value_id) WHERE pov.product_id = '" . (int) $product_id . "' AND pov.product_option_id = '" . (int) $product_option['product_option_id'] . "' AND ovd.language_id = '" . (int) $this->config->get('config_language_id') . "' ORDER BY ov.sort_order");
foreach ($product_option_value_query->rows as $product_option_value) { foreach ($product_option_value_query->rows as $product_option_value) {
$product_option_value_data[] = array( $product_option_value_data[] = array(
@@ -384,22 +414,25 @@ class ModelCatalogProduct extends Model {
return $product_option_data; return $product_option_data;
} }
public function getProductDiscounts($product_id) { public function getProductDiscounts($product_id)
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_discount WHERE product_id = '" . (int)$product_id . "' AND customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND quantity > 1 AND ((date_start = '0000-00-00' OR date_start < NOW()) AND (date_end = '0000-00-00' OR date_end > NOW())) ORDER BY quantity ASC, priority ASC, price ASC"); {
$query = $this->db->query('SELECT * FROM ' . DB_PREFIX . "product_discount WHERE product_id = '" . (int) $product_id . "' AND customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND quantity > 1 AND ((date_start = '0000-00-00' OR date_start < NOW()) AND (date_end = '0000-00-00' OR date_end > NOW())) ORDER BY quantity ASC, priority ASC, price ASC");
return $query->rows; return $query->rows;
} }
public function getProductImages($product_id) { public function getProductImages($product_id)
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_image WHERE product_id = '" . (int)$product_id . "' ORDER BY sort_order ASC"); {
$query = $this->db->query('SELECT * FROM ' . DB_PREFIX . "product_image WHERE product_id = '" . (int) $product_id . "' ORDER BY sort_order ASC");
return $query->rows; return $query->rows;
} }
public function getProductRelated($product_id) { public function getProductRelated($product_id)
{
$product_data = array(); $product_data = array();
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_related pr LEFT JOIN " . DB_PREFIX . "product p ON (pr.related_id = p.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pr.product_id = '" . (int)$product_id . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"); $query = $this->db->query('SELECT * FROM ' . DB_PREFIX . 'product_related pr LEFT JOIN ' . DB_PREFIX . 'product p ON (pr.related_id = p.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pr.product_id = '" . (int) $product_id . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "'");
foreach ($query->rows as $result) { foreach ($query->rows as $result) {
$product_data[$result['related_id']] = $this->getProduct($result['related_id']); $product_data[$result['related_id']] = $this->getProduct($result['related_id']);
@@ -408,8 +441,9 @@ class ModelCatalogProduct extends Model {
return $product_data; return $product_data;
} }
public function getProductLayoutId($product_id) { public function getProductLayoutId($product_id)
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_to_layout WHERE product_id = '" . (int)$product_id . "' AND store_id = '" . (int)$this->config->get('config_store_id') . "'"); {
$query = $this->db->query('SELECT * FROM ' . DB_PREFIX . "product_to_layout WHERE product_id = '" . (int) $product_id . "' AND store_id = '" . (int) $this->config->get('config_store_id') . "'");
if ($query->num_rows) { if ($query->num_rows) {
return (int) $query->row['layout_id']; return (int) $query->row['layout_id'];
@@ -418,32 +452,34 @@ class ModelCatalogProduct extends Model {
} }
} }
public function getCategories($product_id) { public function getCategories($product_id)
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_to_category WHERE product_id = '" . (int)$product_id . "'"); {
$query = $this->db->query('SELECT * FROM ' . DB_PREFIX . "product_to_category WHERE product_id = '" . (int) $product_id . "'");
return $query->rows; return $query->rows;
} }
public function getTotalProducts($data = array()) { public function getTotalProducts($data = array())
$sql = "SELECT COUNT(DISTINCT p.product_id) AS total"; {
$sql = 'SELECT COUNT(DISTINCT p.product_id) AS total';
if (!empty($data['filter_category_id'])) { if (!empty($data['filter_category_id'])) {
if (!empty($data['filter_sub_category'])) { if (!empty($data['filter_sub_category'])) {
$sql .= " FROM " . DB_PREFIX . "category_path cp LEFT JOIN " . DB_PREFIX . "product_to_category p2c ON (cp.category_id = p2c.category_id)"; $sql .= ' FROM ' . DB_PREFIX . 'category_path cp LEFT JOIN ' . DB_PREFIX . 'product_to_category p2c ON (cp.category_id = p2c.category_id)';
} else { } else {
$sql .= " FROM " . DB_PREFIX . "product_to_category p2c"; $sql .= ' FROM ' . DB_PREFIX . 'product_to_category p2c';
} }
if (!empty($data['filter_filter'])) { if (!empty($data['filter_filter'])) {
$sql .= " LEFT JOIN " . DB_PREFIX . "product_filter pf ON (p2c.product_id = pf.product_id) LEFT JOIN " . DB_PREFIX . "product p ON (pf.product_id = p.product_id)"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product_filter pf ON (p2c.product_id = pf.product_id) LEFT JOIN ' . DB_PREFIX . 'product p ON (pf.product_id = p.product_id)';
} else { } else {
$sql .= " LEFT JOIN " . DB_PREFIX . "product p ON (p2c.product_id = p.product_id)"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product p ON (p2c.product_id = p.product_id)';
} }
} else { } else {
$sql .= " FROM " . DB_PREFIX . "product p"; $sql .= ' FROM ' . DB_PREFIX . 'product p';
} }
$sql .= " LEFT JOIN " . DB_PREFIX . "product_description pd ON (p.product_id = pd.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pd.language_id = '" . (int)$this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "'"; $sql .= ' LEFT JOIN ' . DB_PREFIX . 'product_description pd ON (p.product_id = pd.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE pd.language_id = '" . (int) $this->config->get('config_language_id') . "' AND p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "'";
if (!empty($data['filter_category_id'])) { if (!empty($data['filter_category_id'])) {
if (!empty($data['filter_sub_category'])) { if (!empty($data['filter_sub_category'])) {
@@ -461,12 +497,12 @@ class ModelCatalogProduct extends Model {
$implode[] = (int) $filter_id; $implode[] = (int) $filter_id;
} }
$sql .= " AND pf.filter_id IN (" . implode(',', $implode) . ")"; $sql .= ' AND pf.filter_id IN (' . implode(',', $implode) . ')';
} }
} }
if (!empty($data['filter_name']) || !empty($data['filter_tag'])) { if (!empty($data['filter_name']) || !empty($data['filter_tag'])) {
$sql .= " AND ("; $sql .= ' AND (';
if (!empty($data['filter_name'])) { if (!empty($data['filter_name'])) {
$implode = array(); $implode = array();
@@ -478,7 +514,7 @@ class ModelCatalogProduct extends Model {
} }
if ($implode) { if ($implode) {
$sql .= " " . implode(" AND ", $implode) . ""; $sql .= ' ' . implode(' AND ', $implode) . '';
} }
if (!empty($data['filter_description'])) { if (!empty($data['filter_description'])) {
@@ -487,7 +523,7 @@ class ModelCatalogProduct extends Model {
} }
if (!empty($data['filter_name']) && !empty($data['filter_tag'])) { if (!empty($data['filter_name']) && !empty($data['filter_tag'])) {
$sql .= " OR "; $sql .= ' OR ';
} }
if (!empty($data['filter_tag'])) { if (!empty($data['filter_tag'])) {
@@ -500,7 +536,7 @@ class ModelCatalogProduct extends Model {
} }
if ($implode) { if ($implode) {
$sql .= " " . implode(" AND ", $implode) . ""; $sql .= ' ' . implode(' AND ', $implode) . '';
} }
} }
@@ -514,7 +550,7 @@ class ModelCatalogProduct extends Model {
$sql .= " OR LCASE(p.mpn) = '" . $this->db->escape(utf8_strtolower($data['filter_name'])) . "'"; $sql .= " OR LCASE(p.mpn) = '" . $this->db->escape(utf8_strtolower($data['filter_name'])) . "'";
} }
$sql .= ")"; $sql .= ')';
} }
if (!empty($data['filter_manufacturer_id'])) { if (!empty($data['filter_manufacturer_id'])) {
@@ -526,20 +562,23 @@ class ModelCatalogProduct extends Model {
return $query->row['total']; return $query->row['total'];
} }
public function getProfile($product_id, $recurring_id) { public function getProfile($product_id, $recurring_id)
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "recurring r JOIN " . DB_PREFIX . "product_recurring pr ON (pr.recurring_id = r.recurring_id AND pr.product_id = '" . (int)$product_id . "') WHERE pr.recurring_id = '" . (int)$recurring_id . "' AND status = '1' AND pr.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "'"); {
$query = $this->db->query('SELECT * FROM ' . DB_PREFIX . 'recurring r JOIN ' . DB_PREFIX . "product_recurring pr ON (pr.recurring_id = r.recurring_id AND pr.product_id = '" . (int) $product_id . "') WHERE pr.recurring_id = '" . (int) $recurring_id . "' AND status = '1' AND pr.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "'");
return $query->row; return $query->row;
} }
public function getProfiles($product_id) { public function getProfiles($product_id)
$query = $this->db->query("SELECT rd.* FROM " . DB_PREFIX . "product_recurring pr JOIN " . DB_PREFIX . "recurring_description rd ON (rd.language_id = " . (int)$this->config->get('config_language_id') . " AND rd.recurring_id = pr.recurring_id) JOIN " . DB_PREFIX . "recurring r ON r.recurring_id = rd.recurring_id WHERE pr.product_id = " . (int)$product_id . " AND status = '1' AND pr.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' ORDER BY sort_order ASC"); {
$query = $this->db->query('SELECT rd.* FROM ' . DB_PREFIX . 'product_recurring pr JOIN ' . DB_PREFIX . 'recurring_description rd ON (rd.language_id = ' . (int) $this->config->get('config_language_id') . ' AND rd.recurring_id = pr.recurring_id) JOIN ' . DB_PREFIX . 'recurring r ON r.recurring_id = rd.recurring_id WHERE pr.product_id = ' . (int) $product_id . " AND status = '1' AND pr.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' ORDER BY sort_order ASC");
return $query->rows; return $query->rows;
} }
public function getTotalProductSpecials() { public function getTotalProductSpecials()
$query = $this->db->query("SELECT COUNT(DISTINCT ps.product_id) AS total FROM " . DB_PREFIX . "product_special ps LEFT JOIN " . DB_PREFIX . "product p ON (ps.product_id = p.product_id) LEFT JOIN " . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' AND ps.customer_group_id = '" . (int)$this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW()))"); {
$query = $this->db->query('SELECT COUNT(DISTINCT ps.product_id) AS total FROM ' . DB_PREFIX . 'product_special ps LEFT JOIN ' . DB_PREFIX . 'product p ON (ps.product_id = p.product_id) LEFT JOIN ' . DB_PREFIX . "product_to_store p2s ON (p.product_id = p2s.product_id) WHERE p.status = '1' AND p.date_available <= NOW() AND p2s.store_id = '" . (int) $this->config->get('config_store_id') . "' AND ps.customer_group_id = '" . (int) $this->config->get('config_customer_group_id') . "' AND ((ps.date_start = '0000-00-00' OR ps.date_start < NOW()) AND (ps.date_end = '0000-00-00' OR ps.date_end > NOW()))");
if (isset($query->row['total'])) { if (isset($query->row['total'])) {
return $query->row['total']; return $query->row['total'];
storage/modification/index.html
-10
View File
@@ -1,10 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Untitled Document</title>
</head>
<body>
</body>
</html>