Skip to content

update search #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Serbulenko wants to merge 1 commit into
base: 3.0.4.5
Choose a base branch
from
Open

update search #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions upload/admin/controller/common/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
36 changes: 15 additions & 21 deletions upload/admin/controller/search/search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,48 @@
// * @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');
$this->load->model('search/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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down
1 change: 0 additions & 1 deletion upload/admin/view/javascript/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,5 +286,4 @@ $(function() {
$('.open-close-filter').on('click', function() {
$('#filter-product').toggleClass('show')
});

});
2 changes: 1 addition & 1 deletion upload/admin/view/stylesheet/stylesheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/view/template/search/search.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down