From 709e221625cc2e5ba40e2554ab2440b0e47fec48 Mon Sep 17 00:00:00 2001 From: Artem Serbulenko Date: Mon, 8 Jun 2026 01:05:59 +0300 Subject: [PATCH] update search --- upload/admin/controller/common/header.php | 6 ++-- upload/admin/controller/search/search.php | 36 ++++++++----------- upload/admin/view/javascript/common.js | 1 - upload/admin/view/stylesheet/stylesheet.css | 2 +- upload/admin/view/template/search/search.twig | 4 +-- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/upload/admin/controller/common/header.php b/upload/admin/controller/common/header.php index bd233c20..c9a69e81 100644 --- a/upload/admin/controller/common/header.php +++ b/upload/admin/controller/common/header.php @@ -82,10 +82,10 @@ public function index() { 'href' => $result['url'] ); } - } - - $data['search'] = $this->load->controller('search/search'); + $data['search'] = $this->load->controller('search/search'); + } + return $this->load->view('common/header', $data); } } diff --git a/upload/admin/controller/search/search.php b/upload/admin/controller/search/search.php index b0ff41ac..74b88287 100644 --- a/upload/admin/controller/search/search.php +++ b/upload/admin/controller/search/search.php @@ -3,21 +3,15 @@ // * @license GNU General Public License version 3; see LICENSE.txt class ControllerSearchSearch extends Controller { - public function index() { - if(empty($this->session->data['user_token'])) { - return; - } - + public function index() { $this->load->language('search/search'); - - $data = array(); - + $data['user_token'] = $this->session->data['user_token']; return $this->load->view('search/search', $data); } - public function search(){ + public function search() { $this->load->language('search/search'); $this->load->model('tool/image'); @@ -25,32 +19,32 @@ public function search(){ $data['user_token'] = $this->session->data['user_token']; - if(!empty($this->request->get['query'])) { + if (!empty($this->request->get['query'])) { $_data['query'] = $this->request->get['query']; } else { $json['error'] = $this->language->get('text_empty_query'); } - if(!empty($this->request->get['search-option'])) { + if (!empty($this->request->get['search-option'])) { $search_option = $this->request->get['search-option']; } else { $search_option = 'catalog'; } - if(!empty($json['error'])) { + if (!empty($json['error'])) { $this->response->setOutput(json_encode($json)); return; } $data['no_image'] = $this->model_tool_image->resize('no_image.png', 30, 30); - switch($search_option) { + switch ($search_option) { case 'catalog': // Get products $data['products'] = $this->model_search_search->getProducts($_data); - foreach($data['products'] as $key => $product){ - if(!empty($product['image'])) { + foreach ($data['products'] as $key => $product) { + if (!empty($product['image'])) { $data['products'][$key]['image'] = $this->model_tool_image->resize($product['image'], 30, 30); } else { $data['products'][$key]['image'] = $this->model_tool_image->resize('no_image.png', 30, 30); @@ -62,8 +56,8 @@ public function search(){ // Get categories $data['categories'] = $this->model_search_search->getCategories($_data); - foreach($data['categories'] as $key => $category){ - if(!empty($category['image'])) { + foreach ($data['categories'] as $key => $category) { + if (!empty($category['image'])) { $data['categories'][$key]['image'] = $this->model_tool_image->resize($category['image'], 30, 30); } else { $data['categories'][$key]['image'] = $this->model_tool_image->resize('no_image.png', 30, 30); @@ -75,8 +69,8 @@ public function search(){ // Get manufacturers $data['manufacturers'] = $this->model_search_search->getManufacturers($_data); - foreach($data['manufacturers'] as $key => $manufacturer){ - if(!empty($manufacturer['image'])) { + foreach ($data['manufacturers'] as $key => $manufacturer) { + if (!empty($manufacturer['image'])) { $data['manufacturers'][$key]['image'] = $this->model_tool_image->resize($manufacturer['image'], 30, 30); } else { $data['manufacturers'][$key]['image'] = $this->model_tool_image->resize('no_image.png', 30, 30); @@ -91,7 +85,7 @@ public function search(){ case 'customers': $data['customers'] = $this->model_search_search->getCustomers($_data); - foreach($data['customers'] as $key => $customer) { + foreach ($data['customers'] as $key => $customer) { $data['customers'][$key]['url'] = $this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=' . $customer['customer_id'], true); } @@ -101,7 +95,7 @@ public function search(){ case 'orders': $data['orders'] = $this->model_search_search->getOrders($_data); - foreach($data['orders'] as $key => $order) { + foreach ($data['orders'] as $key => $order) { $data['orders'][$key]['url'] = $this->url->link('sale/order/info', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $order['order_id'], true); } diff --git a/upload/admin/view/javascript/common.js b/upload/admin/view/javascript/common.js index 9ffef2bf..c382e7ee 100644 --- a/upload/admin/view/javascript/common.js +++ b/upload/admin/view/javascript/common.js @@ -286,5 +286,4 @@ $(function() { $('.open-close-filter').on('click', function() { $('#filter-product').toggleClass('show') }); - }); diff --git a/upload/admin/view/stylesheet/stylesheet.css b/upload/admin/view/stylesheet/stylesheet.css index 293a4b3b..36de5090 100644 --- a/upload/admin/view/stylesheet/stylesheet.css +++ b/upload/admin/view/stylesheet/stylesheet.css @@ -260,7 +260,7 @@ input[type="checkbox"]:checked::after, .checkbox input[type="checkbox"]:checked: #oc-search ul li a span {margin-left:8px} #oc-search ul li a{cursor:pointer} #oc-search-div{padding-left:1px !important;padding-right:0 !important;padding-top:8px !important} -#oc-search-result {display:none;position:absolute;margin:2px 0 0;background-color:#fff;border-radius:var(--border-radius-1);box-shadow:0 6px 12px rgba(0, 0, 0, 0.3);background-clip:padding-box;z-index:999;} +#oc-search-result {display:none;position:absolute;margin:2px 0 0;background-color:#fff;border-radius:var(--border-radius-1);box-shadow:0 6px 12px rgba(0, 0, 0, 0.3);background-clip:padding-box;z-index:999;min-width:100%} #oc-search-result ul {margin:0 15px 10px;padding:0} #oc-search-result ul .result-header {margin:15px 0;font-weight:700;white-space:nowrap} #oc-search-result ul li {list-style:none} diff --git a/upload/admin/view/template/search/search.twig b/upload/admin/view/template/search/search.twig index c1925201..a344db4a 100644 --- a/upload/admin/view/template/search/search.twig +++ b/upload/admin/view/template/search/search.twig @@ -34,14 +34,14 @@ } if($.support.leadingWhitespace == false) { - return false; + return false; } $('#loader-search').css('display', 'block'); $.ajax({ type: 'get', - url: 'index.php?route=search/search/search' + '&user_token={{ user_token }}', + url: 'index.php?route=search/search/search&user_token={{ user_token }}', data: $('#oc-search').serialize(), dataType: 'json', success:function(json){