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
+119 -119
View File
@@ -2,69 +2,70 @@
// * @source See SOURCE.txt for source and other copyright.
// * @license GNU General Public License version 3; see LICENSE.txt
class ControllerProductCategory extends Controller {
public function index() {
class ControllerProductCategory extends Controller
{
public function index()
{
$this->load->language('product/category');
$this->load->model('catalog/category');
$this->load->model('catalog/product');
$this->document->addStyle('store/view/theme/dominik/assets/css/swiper-bundle.min.css');
$this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js');
$this->document->addStyle('store/view/theme/dominik/assets/css/swiper-bundle.min.css');
$this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js');
$this->load->model('tool/image');
$data['text_empty'] = $this->language->get('text_empty');
if ($this->config->get('config_noindex_disallow_params')) {
$params = explode ("\r\n", $this->config->get('config_noindex_disallow_params'));
if(!empty($params)) {
$disallow_params = $params;
}
}
if ($this->config->get('config_noindex_disallow_params')) {
$params = explode("\r\n", $this->config->get('config_noindex_disallow_params'));
if (!empty($params)) {
$disallow_params = $params;
}
}
if (isset($this->request->get['filter'])) {
$filter = $this->request->get['filter'];
if (!in_array('filter', $disallow_params, true) && $this->config->get('config_noindex_status')){
$this->document->setRobots('noindex,follow');
}
if (!in_array('filter', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
} else {
$filter = '';
}
if (isset($this->request->get['sort'])) {
$sort = $this->request->get['sort'];
if (!in_array('sort', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
if (!in_array('sort', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
} else {
$sort = 'p.sort_order';
}
if (isset($this->request->get['order'])) {
$order = $this->request->get['order'];
if (!in_array('order', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
if (!in_array('order', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
} else {
$order = 'ASC';
}
if (isset($this->request->get['page'])) {
$page = (int)$this->request->get['page'];
if (!in_array('page', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
$page = (int) $this->request->get['page'];
if (!in_array('page', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
} else {
$page = 1;
}
if (isset($this->request->get['limit'])) {
$limit = (int)$this->request->get['limit'];
if (!in_array('limit', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
$limit = (int) $this->request->get['limit'];
if (!in_array('limit', $disallow_params, true) && $this->config->get('config_noindex_status')) {
$this->document->setRobots('noindex,follow');
}
} else {
$limit = $this->config->get('theme_' . $this->config->get('config_theme') . '_product_limit');
}
@@ -93,15 +94,15 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$path = '';
$parts = explode('_', (string)$this->request->get['path']);
$parts = explode('_', (string) $this->request->get['path']);
$category_id = (int)array_pop($parts);
$category_id = (int) array_pop($parts);
foreach ($parts as $path_id) {
if (!$path) {
$path = (int)$path_id;
$path = (int) $path_id;
} else {
$path .= '_' . (int)$path_id;
$path .= '_' . (int) $path_id;
}
$category_info = $this->model_catalog_category->getCategory($path_id);
@@ -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);
if ($category_info) {
if ($category_info['meta_title']) {
$this->document->setTitle($category_info['meta_title']);
} else {
@@ -154,9 +154,9 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$data['thumb'] = '';
}
$data['description'] = html_entity_decode($category_info['description'], ENT_QUOTES, 'UTF-8');
$data['description'] = html_entity_decode($category_info['description'], ENT_QUOTES, 'UTF-8');
$data['description_bottom'] = html_entity_decode($category_info['description_bottom'], ENT_QUOTES, 'UTF-8');
$data['compare'] = $this->url->link('product/compare');
$data['compare'] = $this->url->link('product/compare');
$url = '';
@@ -187,9 +187,9 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
);
$data['categories'][] = array(
'name' => $result['name'] . ($this->config->get('config_product_count') ? ' (' . $this->model_catalog_product->getTotalProducts($filter_data) . ')' : ''),
'thumb' => $this->model_tool_image->resize($result['image'] ? $result['image'] : 'placeholder.png', 180, 180),
'href' => $this->url->link('product/category', 'path=' . $this->request->get['path'] . '_' . $result['category_id'] . $url)
'name' => $result['name'] . ($this->config->get('config_product_count') ? ' (' . $this->model_catalog_product->getTotalProducts($filter_data) . ')' : ''),
'thumb' => $this->model_tool_image->resize($result['image'] ? $result['image'] : 'placeholder.png', 180, 180),
'href' => $this->url->link('product/category', 'path=' . $this->request->get['path'] . '_' . $result['category_id'] . $url)
);
}
@@ -207,8 +207,9 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$product_total = $this->model_catalog_product->getTotalProducts($filter_data);
$results = $this->model_catalog_product->getProducts($filter_data);
foreach ($results as $result) {
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'));
} else {
@@ -221,12 +222,12 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
$price = false;
}
if (!is_null($result['special']) && (float)$result['special'] >= 0) {
$special = $this->currency->format($this->tax->calculate($result['special'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']);
$tax_price = (float)$result['special'];
if (!is_null($result['special']) && (float) $result['special'] >= 0) {
$special = $this->currency->format($this->tax->calculate($result['special'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']);
$tax_price = (float) $result['special'];
} else {
$special = false;
$tax_price = (float)$result['price'];
$special = false;
$tax_price = (float) $result['price'];
}
if ($this->config->get('config_tax')) {
@@ -236,35 +237,36 @@ $this->document->addScript('store/view/theme/dominik/assets/js/swiper-bundle.js'
}
if ($this->config->get('config_review_status')) {
$rating = (int)$result['rating'];
$rating = (int) $result['rating'];
} else {
$rating = false;
}
$results = $this->model_catalog_product->getProductImages($result['product_id']);
if($results){
$additional_image = $this->model_tool_image->resize($results[0]['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 {
$additional_image = false;
}
$results = $this->model_catalog_product->getProductImages($result['product_id']);
if ($results) {
$additional_image = $this->model_tool_image->resize($results[0]['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 {
$additional_image = false;
}
$data['products'][] = array(
'product_id' => $result['product_id'],
'thumb' => $image,
'additional_thumb' => $additional_image,
'price_n' => $result['price'],
'price_2' => $this->currency->format($this->tax->calculate($result['price_2'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'price_2_n' => $result['price_2'],
'price_3' => $this->currency->format($this->tax->calculate($result['price_3'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'price_3_n' => $result['price_3'],
'min_price' => $this->currency->format($this->tax->calculate(min([$result['price'],$result['price_2']]), $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'name' => $result['name'],
'description' => utf8_substr(trim(strip_tags(html_entity_decode($result['description'], ENT_QUOTES, 'UTF-8'))), 0, $this->config->get('theme_' . $this->config->get('config_theme') . '_product_description_length')) . '..',
'price' => $price,
'special' => $special,
'tax' => $tax,
'minimum' => $result['minimum'] > 0 ? $result['minimum'] : 1,
'rating' => $result['rating'],
'href' => $this->url->link('product/product', 'path=' . $this->request->get['path'] . '&product_id=' . $result['product_id'] . $url)
'product_id' => $result['product_id'],
'thumb' => $image,
'additional_thumb' => $additional_image,
'price_n' => $result['price'],
'price_2' => $this->currency->format($this->tax->calculate($result['price_2'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'price_2_n' => $result['price_2'],
'price_3' => $this->currency->format($this->tax->calculate($result['price_3'], $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'price_3_n' => $result['price_3'],
'min_price' => $this->currency->format($this->tax->calculate(min([$result['price'], $result['price_2']]), $result['tax_class_id'], $this->config->get('config_tax')), $this->session->data['currency']),
'name' => $result['name'],
'description' => utf8_substr(trim(strip_tags(html_entity_decode($result['description'], ENT_QUOTES, 'UTF-8'))), 0, $this->config->get('theme_' . $this->config->get('config_theme') . '_product_description_length')) . '..',
'price' => $price,
'special' => $special,
'tax' => $tax,
'minimum' => $result['minimum'] > 0 ? $result['minimum'] : 1,
'rating' => $result['rating'],
'href' => $this->url->link('product/product', 'path=' . $this->request->get['path'] . '&product_id=' . $result['product_id'])
);
}
@@ -356,7 +358,7 @@ if($results){
sort($limits);
foreach($limits as $value) {
foreach ($limits as $value) {
$data['limits'][] = array(
'text' => $value,
'value' => $value,
@@ -382,70 +384,68 @@ if($results){
$url .= '&limit=' . $this->request->get['limit'];
}
$pagination = new Pagination();
$pagination = new Pagination();
$pagination->total = $product_total;
$pagination->page = $page;
$pagination->page = $page;
$pagination->limit = $limit;
$pagination->url = $this->url->link('product/category', 'path=' . $this->request->get['path'] . $url . '&page={page}');
$pagination->url = $this->url->link('product/category', 'path=' . $this->request->get['path'] . $url . '&page={page}');
$data['pagination'] = $pagination->render();
$data['results'] = sprintf($this->language->get('text_pagination'), ($product_total) ? (($page - 1) * $limit) + 1 : 0, ((($page - 1) * $limit) > ($product_total - $limit)) ? $product_total : ((($page - 1) * $limit) + $limit), $product_total, ceil($product_total / $limit));
if (!$this->config->get('config_canonical_method')) {
// http://googlewebmastercentral.blogspot.com/2011/09/pagination-with-relnext-and-relprev.html
if ($page == 1) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'canonical');
} elseif ($page == 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev');
} else {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page - 1)), 'prev');
}
if (!$this->config->get('config_canonical_method')) {
// http://googlewebmastercentral.blogspot.com/2011/09/pagination-with-relnext-and-relprev.html
if ($page == 1) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'canonical');
} elseif ($page == 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev');
} else {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page - 1)), 'prev');
}
if ($limit && ceil($product_total / $limit) > $page) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next');
}
} else {
if ($limit && ceil($product_total / $limit) > $page) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next');
}
} else {
if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) {
$server = $this->config->get('config_ssl');
} else {
$server = $this->config->get('config_url');
};
if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) {
$server = $this->config->get('config_ssl');
} else {
$server = $this->config->get('config_url');
};
$request_url = rtrim($server, '/') . $this->request->server['REQUEST_URI'];
$canonical_url = $this->url->link('product/category', 'path=' . $category_info['category_id']);
$request_url = rtrim($server, '/') . $this->request->server['REQUEST_URI'];
$canonical_url = $this->url->link('product/category', 'path=' . $category_info['category_id']);
if (($request_url != $canonical_url) || $this->config->get('config_canonical_self')) {
$this->document->addLink($canonical_url, 'canonical');
}
if (($request_url != $canonical_url) || $this->config->get('config_canonical_self')) {
$this->document->addLink($canonical_url, 'canonical');
}
if ($this->config->get('config_add_prevnext')) {
if ($page == 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev');
} elseif ($page > 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page - 1)), 'prev');
}
if ($this->config->get('config_add_prevnext')) {
if ($limit && ceil($product_total / $limit) > $page) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next');
}
}
}
if ($page == 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id']), 'prev');
} elseif ($page > 2) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page - 1)), 'prev');
}
if ($limit && ceil($product_total / $limit) > $page) {
$this->document->addLink($this->url->link('product/category', 'path=' . $category_info['category_id'] . '&page=' . ($page + 1)), 'next');
}
}
}
$data['sort'] = $sort;
$data['sort'] = $sort;
$data['order'] = $order;
$data['limit'] = $limit;
$data['continue'] = $this->url->link('common/home');
$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
$data['content_bottom'] = $this->load->controller('common/content_bottom');
$data['footer'] = $this->load->controller('common/footer');
$data['header'] = $this->load->controller('common/header');
$data['footer'] = $this->load->controller('common/footer');
$data['header'] = $this->load->controller('common/header');
$this->response->setOutput($this->load->view('product/category', $data));
} else {
@@ -486,12 +486,12 @@ if($results){
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');
$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
$data['content_bottom'] = $this->load->controller('common/content_bottom');
$data['footer'] = $this->load->controller('common/footer');
$data['header'] = $this->load->controller('common/header');
$data['footer'] = $this->load->controller('common/footer');
$data['header'] = $this->load->controller('common/header');
$this->response->setOutput($this->load->view('error/not_found', $data));
}