From 68bfe2370920c48d6b90b48c15266d30facc3ffd Mon Sep 17 00:00:00 2001 From: nertyog Date: Mon, 12 Oct 2026 05:36:01 +0300 Subject: [PATCH] Fix UI/JS syntax, CRON parameters, and version compatibility across controllers and views --- .../admin/controller/event/header.php | 26 +++--- .../module/catalog_optimizer_nat.php | 50 +++-------- .../module/catalog_optimizer_nat.twig | 85 ++++++++++++++----- .../module/catalog_optimizer_nat.php | 2 +- 4 files changed, 88 insertions(+), 75 deletions(-) diff --git a/upload/extension/catalog_optimizer_nat/admin/controller/event/header.php b/upload/extension/catalog_optimizer_nat/admin/controller/event/header.php index 13b44c8..4bb7290 100644 --- a/upload/extension/catalog_optimizer_nat/admin/controller/event/header.php +++ b/upload/extension/catalog_optimizer_nat/admin/controller/event/header.php @@ -20,29 +20,29 @@ class Header extends \Opencart\System\Engine\Controller { $style = ''; - $js = " + $js = ' - "; + '; if (strpos($output, '') !== false) { $output = str_replace('', $style . "\n", $output); diff --git a/upload/extension/catalog_optimizer_nat/admin/controller/module/catalog_optimizer_nat.php b/upload/extension/catalog_optimizer_nat/admin/controller/module/catalog_optimizer_nat.php index 21ae44e..b383642 100644 --- a/upload/extension/catalog_optimizer_nat/admin/controller/module/catalog_optimizer_nat.php +++ b/upload/extension/catalog_optimizer_nat/admin/controller/module/catalog_optimizer_nat.php @@ -193,7 +193,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { 'menu_position', 'license', 'log_limit', 'show_unchanged', 'cron_key', 'cat_threshold', 'cat_action', 'cat_exclude', 'cat_cond_status', 'cat_cond_qty', 'cat_exc_prod', 'brand_threshold', 'brand_action', 'brand_exclude', 'brand_cond_status', 'brand_cond_qty', 'brand_exc_prod', 'brand_target_field', - 'prod_out_stock_status', 'prod_out_sort_order', 'prod_disable_out', + 'prod_out_stock_status', 'prod_out_sort_order', 'prod_sort_order', 'prod_disable_out', 'prod_price_zero_status', 'prod_price_zero_stock_status', 'prod_price_zero_qty_zero', 'cron_prod_price_zero_qty_zero', 'prod_main_category_mode', 'cron_categories', 'cron_brands', 'cron_products', 'cron_cleanup', 'cron_cat_cond_status', 'cron_cat_cond_qty', 'cron_cat_exc_prod', 'cron_cat_threshold', 'cron_cat_action', 'cron_cat_exclude', @@ -323,7 +323,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { $breadcrumb = array(); foreach ($path_query->rows as $path) { - $url = htmlspecialchars_decode($this->url->link('catalog/category/edit', 'user_token=' . $this->session->data['user_token'] . '&category_id=' . (int)$path['path_id'], true)); + $url = htmlspecialchars_decode($this->url->link('catalog/category' . $sep . 'form', 'user_token=' . $this->session->data['user_token'] . '&category_id=' . (int)$path['path_id'], true)); $breadcrumb[] = ''.$path['name'].''; } $name_link = implode(' ', $breadcrumb); @@ -354,17 +354,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { } if ($is_execute) $this->cache->delete('category'); - if ($type == 'merge_attribute_groups') { - $data_groups = array(); - $ag_query = $this->db->query("SELECT ag.attribute_group_id, agd.name FROM `" . DB_PREFIX . "attribute_group` ag LEFT JOIN `" . DB_PREFIX . "attribute_group_description` agd ON (ag.attribute_group_id = agd.attribute_group_id AND agd.language_id = '" . (int)$this->config->get('config_language_id') . "') ORDER BY agd.name ASC"); - foreach ($ag_query->rows as $ag_row) { - $data_groups[] = array( - 'attribute_group_id' => $ag_row['attribute_group_id'], - 'name' => $ag_row['name'] ? $ag_row['name'] : ('ID ' . $ag_row['attribute_group_id']) - ); - } - $json['attribute_groups'] = $data_groups; - } + $json['success'] = true; $this->response->addHeader('Content-Type: application/json'); $this->response->setOutput(json_encode($json)); } @@ -407,7 +397,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { foreach ($query->rows as $row) { if (in_array($row['manufacturer_id'], $exclude_ids)) continue; - $url = htmlspecialchars_decode($this->url->link('catalog/manufacturer/edit', 'user_token=' . $this->session->data['user_token'] . '&manufacturer_id=' . (int)$row['manufacturer_id'], true)); + $url = htmlspecialchars_decode($this->url->link('catalog/manufacturer' . $sep . 'form', 'user_token=' . $this->session->data['user_token'] . '&manufacturer_id=' . (int)$row['manufacturer_id'], true)); $name_link = ''.$row['name'].' '; $will_be_active = $row['current_state']; @@ -448,17 +438,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { } } if ($is_execute) $this->cache->delete('manufacturer'); - if ($type == 'merge_attribute_groups') { - $data_groups = array(); - $ag_query = $this->db->query("SELECT ag.attribute_group_id, agd.name FROM `" . DB_PREFIX . "attribute_group` ag LEFT JOIN `" . DB_PREFIX . "attribute_group_description` agd ON (ag.attribute_group_id = agd.attribute_group_id AND agd.language_id = '" . (int)$this->config->get('config_language_id') . "') ORDER BY agd.name ASC"); - foreach ($ag_query->rows as $ag_row) { - $data_groups[] = array( - 'attribute_group_id' => $ag_row['attribute_group_id'], - 'name' => $ag_row['name'] ? $ag_row['name'] : ('ID ' . $ag_row['attribute_group_id']) - ); - } - $json['attribute_groups'] = $data_groups; - } + $json['success'] = true; $this->response->addHeader('Content-Type: application/json'); $this->response->setOutput(json_encode($json)); } @@ -517,7 +497,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { } foreach ($query->rows as $row) { - $url = htmlspecialchars_decode($this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['product_id'], true)); + $url = htmlspecialchars_decode($this->url->link('catalog/product' . $sep . 'form', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['product_id'], true)); $name_link = ''.$row['name'].' (ID ' . (int)$row['product_id'] . ') '; $c_stat = $row['status'] ? ''.$lang['ajax_enabled'].'' : ''.$lang['ajax_disabled'].''; @@ -587,17 +567,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { $json['log'][] = array('name' => $name_link, 'qty' => $row['quantity'], 'current' => $current_full, 'future' => empty($future) ? ''.$lang['ajax_no_change'].'' : implode(' | ', $future)); } if ($is_execute) $this->cache->delete('product'); - if ($type == 'merge_attribute_groups') { - $data_groups = array(); - $ag_query = $this->db->query("SELECT ag.attribute_group_id, agd.name FROM `" . DB_PREFIX . "attribute_group` ag LEFT JOIN `" . DB_PREFIX . "attribute_group_description` agd ON (ag.attribute_group_id = agd.attribute_group_id AND agd.language_id = '" . (int)$this->config->get('config_language_id') . "') ORDER BY agd.name ASC"); - foreach ($ag_query->rows as $ag_row) { - $data_groups[] = array( - 'attribute_group_id' => $ag_row['attribute_group_id'], - 'name' => $ag_row['name'] ? $ag_row['name'] : ('ID ' . $ag_row['attribute_group_id']) - ); - } - $json['attribute_groups'] = $data_groups; - } + $json['success'] = true; $this->response->addHeader('Content-Type: application/json'); $this->response->setOutput(json_encode($json)); } @@ -657,7 +627,8 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { } if ($has_main_category || !$is_execute) { - $query = $this->db->query("SELECT DISTINCT p.product_id, pd.name FROM `" . DB_PREFIX . "product` p JOIN `" . DB_PREFIX . "product_to_category` ptc ON (p.product_id = ptc.product_id) LEFT JOIN `" . DB_PREFIX . "product_description` pd ON (p.product_id = pd.product_id AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "') WHERE p.product_id NOT IN (SELECT DISTINCT product_id FROM `" . DB_PREFIX . "product_to_category` WHERE main_category = 1)"); + $where_sub = $has_main_category ? " WHERE p.product_id NOT IN (SELECT DISTINCT product_id FROM `" . DB_PREFIX . "product_to_category` WHERE main_category = 1)" : ""; + $query = $this->db->query("SELECT DISTINCT p.product_id, pd.name FROM `" . DB_PREFIX . "product` p JOIN `" . DB_PREFIX . "product_to_category` ptc ON (p.product_id = ptc.product_id) LEFT JOIN `" . DB_PREFIX . "product_description` pd ON (p.product_id = pd.product_id AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "')" . $where_sub); foreach ($query->rows as $row) { $pid = (int)$row['product_id']; $deepest_query = $this->db->query("SELECT ptc.category_id, cd.name, (SELECT MAX(cp.level) FROM `" . DB_PREFIX . "category_path` cp WHERE cp.category_id = ptc.category_id) as depth FROM `" . DB_PREFIX . "product_to_category` ptc LEFT JOIN `" . DB_PREFIX . "category_description` cd ON (ptc.category_id = cd.category_id AND cd.language_id = '" . (int)$this->config->get('config_language_id') . "') WHERE ptc.product_id = '" . (int)$pid . "' ORDER BY depth DESC, ptc.category_id DESC LIMIT 1"); @@ -1068,7 +1039,8 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller { } rmdir($temp_dir); - $download_url = $this->url->link('extension/module/catalog_optimizer_nat/download_zip', 'user_token=' . $this->session->data['user_token'] . '&file=' . basename($zip_file), true); + $sep = $this->getSeparator(); + $download_url = $this->url->link('extension/catalog_optimizer_nat/module/catalog_optimizer_nat' . $sep . 'download_zip', 'user_token=' . $this->session->data['user_token'] . '&file=' . basename($zip_file), true); $json['download_link'] = str_replace('&', '&', $download_url); $this->response->addHeader('Content-Type: application/json'); diff --git a/upload/extension/catalog_optimizer_nat/admin/view/template/module/catalog_optimizer_nat.twig b/upload/extension/catalog_optimizer_nat/admin/view/template/module/catalog_optimizer_nat.twig index 4d1e385..d7c4e03 100644 --- a/upload/extension/catalog_optimizer_nat/admin/view/template/module/catalog_optimizer_nat.twig +++ b/upload/extension/catalog_optimizer_nat/admin/view/template/module/catalog_optimizer_nat.twig @@ -361,6 +361,22 @@ body.nat-dark-mode .nat-license-input-group .form-control { border-color: #475569 !important; color: #f8fafc !important; } +/* Bootstrap 5 compatibility styles for OC 4 */ +.btn-default { background-color: #e2e8f0; border-color: #cbd5e1; color: #334155; } +.btn-default:hover { background-color: #cbd5e1; color: #1e293b; } +.well { min-height: 20px; padding: 19px; margin-bottom: 20px; background-color: #f8fafc; border: 1px solid #e2e8f0; border-radius: 4px; } +.label { display: inline-block; padding: .2em .6em .3em; font-size: 75%; font-weight: 700; line-height: 1; text-align: center; white-space: nowrap; vertical-align: baseline; border-radius: .25em; color: #fff; } +.label-success { background-color: #10b981; } +.label-danger { background-color: #ef4444; } +.label-warning { background-color: #f59e0b; } +.label-default { background-color: #64748b; } +.pull-right { float: right !important; } +.text-right { text-align: right !important; } +.panel { margin-bottom: 20px; background-color: #fff; border: 1px solid #e2e8f0; border-radius: 4px; box-shadow: 0 1px 1px rgba(0,0,0,.05); } +.panel-default > .panel-heading { color: #334155; background-color: #f8fafc; border-color: #e2e8f0; padding: 10px 15px; border-bottom: 1px solid #e2e8f0; } +.panel-body { padding: 15px; } +.btn-block { display: block; width: 100%; } +.col-md-offset-3 { margin-left: 25%; }