Fix UI/JS syntax, CRON parameters, and version compatibility across controllers and views
This commit is contained in:
parent
cfb0ac7181
commit
68bfe23709
|
|
@ -20,29 +20,29 @@ class Header extends \Opencart\System\Engine\Controller {
|
|||
|
||||
$style = '<style type="text/css">#nat-ecosystem-menu .fa-rocket, #nat-ecosystem-menu .fa-shuttle-space { color: #ec741c !important; } #nat-ecosystem-menu .fa-rocket:before, #nat-ecosystem-menu .fa-shuttle-space:before { content: "\\f197" !important; display: inline-block; transform: rotate(270deg); }</style>';
|
||||
|
||||
$js = "
|
||||
$js = '
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var nav = document.querySelector('header .nav.pull-right, #header .nav.pull-right, ul.nav.navbar-nav.navbar-right, ul.navbar-nav.ms-auto');
|
||||
document.addEventListener("DOMContentLoaded", function() {
|
||||
var nav = document.querySelector("header .nav.pull-right, #header .nav.pull-right, ul.nav.navbar-nav.navbar-right, ul.navbar-nav.ms-auto");
|
||||
if (nav) {
|
||||
var menu = document.getElementById('nat-ecosystem-menu');
|
||||
var menu = document.getElementById("nat-ecosystem-menu");
|
||||
if (!menu) {
|
||||
var li = document.createElement('li');
|
||||
li.id = 'nat-ecosystem-menu';
|
||||
li.className = 'nav-item dropdown';
|
||||
li.innerHTML = '<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fa-solid fa-shuttle-space fa-rotate-270" style="color:#ec741c;"></i> <span class="d-none d-md-inline">[NAT]</span></a><ul class="dropdown-menu dropdown-menu-end" id="nat-ecosystem-list"><li class="dropdown-header">Ecosystem [NAT]</li></ul>';
|
||||
var li = document.createElement("li");
|
||||
li.id = "nat-ecosystem-menu";
|
||||
li.className = "nav-item dropdown";
|
||||
li.innerHTML = \'<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fa-solid fa-shuttle-space fa-rotate-270" style="color:#ec741c;"></i> <span class="d-none d-md-inline">[NAT]</span></a><ul class="dropdown-menu dropdown-menu-end" id="nat-ecosystem-list"><li class="dropdown-header">Ecosystem [NAT]</li></ul>\';
|
||||
nav.insertBefore(li, nav.firstChild);
|
||||
}
|
||||
var list = document.getElementById('nat-ecosystem-list');
|
||||
if (list && !list.querySelector('a[href*="catalog_optimizer_nat"]')) {
|
||||
var item = document.createElement('li');
|
||||
item.innerHTML = '<a class="dropdown-item" href="' + '" + '" . $href . "' + '"' + '><i class="fa-solid fa-angle-right me-1"></i> " . $name . "</a>';
|
||||
var list = document.getElementById("nat-ecosystem-list");
|
||||
if (list && !list.querySelector(\'a[href*="catalog_optimizer_nat"]\')) {
|
||||
var item = document.createElement("li");
|
||||
item.innerHTML = \'<a class="dropdown-item" href="' . addslashes($href) . '"><i class="fa-solid fa-angle-right me-1"></i> ' . addslashes($name) . '</a>\';
|
||||
list.appendChild(item);
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
";
|
||||
';
|
||||
|
||||
if (strpos($output, '</head>') !== false) {
|
||||
$output = str_replace('</head>', $style . "\n</head>", $output);
|
||||
|
|
|
|||
|
|
@ -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[] = '<a href="'.$url.'" target="_blank" data-toggle="tooltip"><b>'.$path['name'].'</b></a>';
|
||||
}
|
||||
$name_link = implode(' <i class="fa fa-angle-right" style="color:#ccc; margin: 0 4px;"></i> ', $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 = '<a href="'.$url.'" target="_blank"><b>'.$row['name'].'</b> <i class="fa fa-external-link"></i></a>';
|
||||
|
||||
$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 = '<a href="'.$url.'" target="_blank" data-toggle="tooltip"><b>'.$row['name'].'</b> <span class="text-muted">(ID ' . (int)$row['product_id'] . ')</span> <i class="fa fa-external-link"></i></a>';
|
||||
|
||||
$c_stat = $row['status'] ? '<span class="text-success">'.$lang['ajax_enabled'].'</span>' : '<span class="text-danger">'.$lang['ajax_disabled'].'</span>';
|
||||
|
|
@ -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) ? '<span class="text-muted">'.$lang['ajax_no_change'].'</span>' : 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');
|
||||
|
|
|
|||
|
|
@ -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%; }
|
||||
</style>
|
||||
<div id="content">
|
||||
<div class="page-header">
|
||||
|
|
@ -388,7 +404,7 @@ body.nat-dark-mode .nat-license-input-group .form-control {
|
|||
<div class="card-header"><h3 class="card-title fs-5 mb-0"><i class="fa-solid fa-pencil"></i> {{ text_edit }}</h3></div>
|
||||
<div class="card-body">
|
||||
|
||||
<form action="{{ action }}" method="post" enctype="multipart/form-data" id="form-module" data-oc-toggle="ajax">
|
||||
<form action="{{ action }}" method="post" enctype="multipart/form-data" id="form-module">
|
||||
{% if not is_licensed %}
|
||||
<div class="row" style="margin-top: 30px; margin-bottom: 50px;">
|
||||
<div class="col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
|
||||
|
|
@ -926,6 +942,11 @@ body.nat-dark-mode .nat-license-input-group .form-control {
|
|||
<select name="module_catalog_optimizer_nat_cron_prod_disable_out" class="form-control input-sm" style="margin-bottom:10px;">
|
||||
<option value="0" {% if module_catalog_optimizer_nat_cron_prod_disable_out == '0' %}selected{% endif %}>{{ text_opt_stat_ign }}</option>
|
||||
<option value="1" {% if module_catalog_optimizer_nat_cron_prod_disable_out == '1' %}selected{% endif %}>{{ text_opt_stat_off }}</option>
|
||||
</select>
|
||||
<label>{{ entry_prod_price_zero_qty_zero }}</label>
|
||||
<select name="module_catalog_optimizer_nat_cron_prod_price_zero_qty_zero" class="form-control input-sm" style="margin-bottom:10px;">
|
||||
<option value="0" {% if module_catalog_optimizer_nat_cron_prod_price_zero_qty_zero == '0' %}selected{% endif %}>{{ text_opt_stat_ign }}</option>
|
||||
<option value="1" {% if module_catalog_optimizer_nat_cron_prod_price_zero_qty_zero == '1' %}selected{% endif %}>{{ text_opt_stat_off }}</option>
|
||||
</select>
|
||||
<label>{{ entry_prod_price_zero_status }}</label>
|
||||
<select name="module_catalog_optimizer_nat_cron_prod_price_zero_status" class="form-control input-sm" style="margin-bottom:10px;">
|
||||
|
|
@ -1116,6 +1137,27 @@ body.nat-dark-mode .nat-license-input-group .form-control {
|
|||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
// Polyfill for Bootstrap 5 $.fn.button('loading'/'reset')
|
||||
if (typeof $.fn.button === 'undefined') {
|
||||
$.fn.button = function(state) {
|
||||
return this.each(function() {
|
||||
var $el = $(this);
|
||||
if (state === 'loading') {
|
||||
$el.data('original-html', $el.html());
|
||||
$el.prop('disabled', true).addClass('disabled');
|
||||
if (!$el.find('.fa-spinner').length) {
|
||||
$el.prepend('<i class="fa fa-spinner fa-spin me-1"></i> ');
|
||||
}
|
||||
} else if (state === 'reset') {
|
||||
$el.prop('disabled', false).removeClass('disabled');
|
||||
var orig = $el.data('original-html');
|
||||
if (orig) {
|
||||
$el.html(orig);
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
$(function () { $('[data-bs-toggle="tooltip"]').tooltip(); });
|
||||
|
||||
$('.select-all').on('click', function(e) { e.preventDefault(); $(this).parent().next('.well').find(':checkbox').prop('checked', true); });
|
||||
|
|
@ -1366,6 +1408,7 @@ function runAjaxProcess(type, is_execute, $btn) {
|
|||
data.stock_status = $('#prod_stock_status').val();
|
||||
data.price_zero_status = $('#prod_price_zero_status').val();
|
||||
data.price_zero_stock_status = $('#prod_price_zero_stock_status').val();
|
||||
data.price_zero_qty_zero = $('#prod_price_zero_qty_zero').val();
|
||||
data.main_category_mode = $('#prod_main_category_mode').val();
|
||||
data.filter_main_category = $('#prod_filter_main_category').val() || 'all';
|
||||
data.filter_cats = $('.filter-prod-cat:checked').map(function(){ return this.value; }).get();
|
||||
|
|
@ -1450,7 +1493,7 @@ $('.btn-sim-clean').on('click', function() {
|
|||
return;
|
||||
}
|
||||
$('#wrap-merge-attr-groups-panel').slideDown();
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning').addClass('btn-success');
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning btn-success btn-primary').addClass('btn-success');
|
||||
$('#btn-exec-clean i').attr('class', 'fa fa-compress');
|
||||
$('#text-btn-exec-clean').html('Перенести все атрибуты в выбранную главную группу');
|
||||
$('#wrap-dl-file-opt').hide();
|
||||
|
|
@ -1462,13 +1505,13 @@ $('.btn-sim-clean').on('click', function() {
|
|||
$('#wrap-dl-file-opt').hide();
|
||||
} else if (t == 'missing_main_category') {
|
||||
$('#wrap-merge-attr-groups-panel').hide();
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-success').addClass('btn-warning');
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning btn-success btn-primary').addClass('btn-warning');
|
||||
$('#btn-exec-clean i').attr('class', 'fa fa-sitemap');
|
||||
$('#text-btn-exec-clean').html('{{ text_assign_main_cat_perm|default("Назначить главные категории выбранным товарам")|escape("js") }}');
|
||||
$('#wrap-dl-file-opt').hide();
|
||||
} else {
|
||||
$('#wrap-merge-attr-groups-panel').hide();
|
||||
$('#btn-exec-clean').removeClass('btn-warning btn-success').addClass('btn-danger');
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning btn-success btn-primary').addClass('btn-danger');
|
||||
$('#btn-exec-clean i').attr('class', 'fa-solid fa-fire');
|
||||
if (t == 'downloads') {
|
||||
$('#wrap-dl-file-opt').show();
|
||||
|
|
@ -1513,28 +1556,29 @@ $('#log_limit').on('change', function() {
|
|||
if (savedTab) {
|
||||
var $link = $mainTabs.find('a[href="' + savedTab + '"]');
|
||||
if ($link.length) {
|
||||
$mainTabs.find('li.active').removeClass('active');
|
||||
$mainTabs.find('a').closest('li').removeClass('active');
|
||||
$('.tab-content .tab-pane.active').removeClass('active');
|
||||
$link.closest('li').addClass('active');
|
||||
$(savedTab).addClass('active');
|
||||
$mainTabs.find('.nav-link, li').removeClass('active');
|
||||
$('.tab-content .tab-pane').removeClass('show active');
|
||||
$link.addClass('active').closest('li').addClass('active');
|
||||
$(savedTab).addClass('show active');
|
||||
tabExists = true;
|
||||
}
|
||||
}
|
||||
if (!tabExists) {
|
||||
var $firstLink = $mainTabs.find('a[data-toggle="tab"]').first();
|
||||
var $firstLink = $mainTabs.find('a[data-toggle="tab"], a[data-bs-toggle="tab"]').first();
|
||||
if ($firstLink.length) {
|
||||
var firstTabId = $firstLink.attr('href');
|
||||
$mainTabs.find('li.active').removeClass('active');
|
||||
$mainTabs.find('a').closest('li').removeClass('active');
|
||||
$('.tab-content .tab-pane.active').removeClass('active');
|
||||
$firstLink.closest('li').addClass('active');
|
||||
$(firstTabId).addClass('active');
|
||||
$mainTabs.find('.nav-link, li').removeClass('active');
|
||||
$('.tab-content .tab-pane').removeClass('show active');
|
||||
$firstLink.addClass('active').closest('li').addClass('active');
|
||||
$(firstTabId).addClass('show active');
|
||||
}
|
||||
}
|
||||
|
||||
$mainTabs.on('shown.bs.tab', 'a[data-toggle="tab"]', function() {
|
||||
localStorage.setItem(STORAGE_KEY, $(this).attr('href'));
|
||||
$mainTabs.on('shown.bs.tab', 'a', function() {
|
||||
var href = $(this).attr('href');
|
||||
if (href && href.indexOf('#') === 0) {
|
||||
localStorage.setItem(STORAGE_KEY, href);
|
||||
}
|
||||
});
|
||||
})();
|
||||
|
||||
|
|
@ -1558,7 +1602,7 @@ $('.btn-toggle-merge-groups').on('click', function() {
|
|||
$('#wrap-cleanup').fadeIn(200);
|
||||
$('#wrap-merge-attr-groups-panel').slideDown();
|
||||
$('#details-clean').hide();
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning').addClass('btn-success');
|
||||
$('#btn-exec-clean').removeClass('btn-danger btn-warning btn-success btn-primary').addClass('btn-success');
|
||||
$('#btn-exec-clean i').attr('class', 'fa fa-compress');
|
||||
$('#text-btn-exec-clean').html('Перенести все атрибуты в выбранную главную группу');
|
||||
$('#wrap-dl-file-opt').hide();
|
||||
|
|
@ -1623,10 +1667,7 @@ function natPurgeAllModuleData() {
|
|||
error: function() {
|
||||
window.location.href = 'index.php?route={{ module_route }}&user_token={{ user_token }}';
|
||||
}
|
||||
});
|
||||
}}';setTimeout(function(){b.innerHTML=o},2000)};
|
||||
if(navigator.clipboard&&window.isSecureContext){navigator.clipboard.writeText(t).then(ok)}
|
||||
else{var a=document.createElement('textarea');a.value=t;a.style.position='fixed';a.style.left='-9999px';document.body.appendChild(a);a.select();try{document.execCommand('copy');ok()}catch(e){}document.body.removeChild(a)}
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{{ footer }}
|
||||
|
|
@ -164,7 +164,7 @@ class CatalogOptimizerNat extends \Opencart\System\Engine\Controller {
|
|||
}
|
||||
|
||||
private function processProducts($settings) {
|
||||
$sort_order = isset($settings['module_catalog_optimizer_nat_cron_prod_sort_order']) ? (int)$settings['module_catalog_optimizer_nat_cron_prod_sort_order'] : 0;
|
||||
$sort_order = !empty($settings['module_catalog_optimizer_nat_cron_prod_sort_order']) ? (int)$settings['module_catalog_optimizer_nat_cron_prod_sort_order'] : (!empty($settings['module_catalog_optimizer_nat_prod_sort_order']) ? (int)$settings['module_catalog_optimizer_nat_prod_sort_order'] : 0);
|
||||
$disable_out = isset($settings['module_catalog_optimizer_nat_cron_prod_disable_out']) ? (int)$settings['module_catalog_optimizer_nat_cron_prod_disable_out'] : 0;
|
||||
$stock_status = isset($settings['module_catalog_optimizer_nat_cron_prod_stock_status']) ? (int)$settings['module_catalog_optimizer_nat_cron_prod_stock_status'] : 0;
|
||||
$price_zero_status = isset($settings['module_catalog_optimizer_nat_cron_prod_price_zero_status']) ? (int)$settings['module_catalog_optimizer_nat_cron_prod_price_zero_status'] : 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue