public/admin/controller/catalog/product.php:1351 — вместо вывода только привязанных к товару атрибутов, теперь получает ВСЕ атрибуты из БД, сгруппированные по группам, и сопоставляет с сохранёнными значениями.
public/admin/view/template/catalog/product_form.twig:494 — вместо таблицы с автокомплитом и кнопками добавления/удаления, теперь статический вывод: группы атрибутов панелями, слева название, справа textarea. JS-код addAttribute/attributeautocomplete удалён. public/admin/model/catalog/product.php:25,183 — в addProduct() и editProduct() добавлена проверка !empty($text) — сохраняются только заполненные textarea, пустые пропускаются.
This commit is contained in:
Konstantin
@@ -1350,28 +1350,64 @@ if (isset($this->request->post['price_3'])) {
|
||||
|
||||
// Attributes
|
||||
$this->load->model('catalog/attribute');
|
||||
$this->load->model('catalog/attribute_group');
|
||||
|
||||
$attribute_groups = $this->model_catalog_attribute_group->getAttributeGroups();
|
||||
|
||||
$saved_attributes = array();
|
||||
|
||||
if (isset($this->request->post['product_attribute'])) {
|
||||
$product_attributes = $this->request->post['product_attribute'];
|
||||
} elseif (isset($this->request->get['product_id'])) {
|
||||
$product_attributes = $this->model_catalog_product->getProductAttributes($this->request->get['product_id']);
|
||||
} else {
|
||||
$product_attributes = array();
|
||||
}
|
||||
$saved_attributes_raw = $this->request->post['product_attribute'];
|
||||
|
||||
$data['product_attributes'] = array();
|
||||
|
||||
foreach ($product_attributes as $product_attribute) {
|
||||
$attribute_info = $this->model_catalog_attribute->getAttribute($product_attribute['attribute_id']);
|
||||
|
||||
if ($attribute_info) {
|
||||
$data['product_attributes'][] = array(
|
||||
'attribute_id' => $product_attribute['attribute_id'],
|
||||
'name' => $attribute_info['name'],
|
||||
'product_attribute_description' => $product_attribute['product_attribute_description']
|
||||
foreach ($saved_attributes_raw as $attr_id => $attr_data) {
|
||||
if (!empty($attr_data['product_attribute_description'])) {
|
||||
$saved_attributes[] = array(
|
||||
'attribute_id' => $attr_id,
|
||||
'product_attribute_description' => $attr_data['product_attribute_description']
|
||||
);
|
||||
}
|
||||
}
|
||||
} elseif (isset($this->request->get['product_id'])) {
|
||||
$saved_attributes = $this->model_catalog_product->getProductAttributes($this->request->get['product_id']);
|
||||
}
|
||||
|
||||
$data['attribute_groups'] = array();
|
||||
|
||||
foreach ($attribute_groups as $attribute_group) {
|
||||
$attributes = $this->model_catalog_attribute->getAttributes(array(
|
||||
'filter_attribute_group_id' => $attribute_group['attribute_group_id'],
|
||||
'sort' => 'a.sort_order',
|
||||
'order' => 'ASC'
|
||||
));
|
||||
|
||||
if (!$attributes) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$group_attributes = array();
|
||||
|
||||
foreach ($attributes as $attribute) {
|
||||
$text_data = array();
|
||||
|
||||
foreach ($saved_attributes as $saved) {
|
||||
if ($saved['attribute_id'] == $attribute['attribute_id']) {
|
||||
$text_data = $saved['product_attribute_description'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$group_attributes[] = array(
|
||||
'attribute_id' => $attribute['attribute_id'],
|
||||
'name' => $attribute['name'],
|
||||
'text' => $text_data
|
||||
);
|
||||
}
|
||||
|
||||
$data['attribute_groups'][] = array(
|
||||
'name' => $attribute_group['name'],
|
||||
'attribute' => $group_attributes
|
||||
);
|
||||
}
|
||||
|
||||
// Options
|
||||
$this->load->model('catalog/option');
|
||||
|
||||
@@ -25,10 +25,8 @@ class ModelCatalogProduct extends Model {
|
||||
if (isset($data['product_attribute'])) {
|
||||
foreach ($data['product_attribute'] as $product_attribute) {
|
||||
if ($product_attribute['attribute_id']) {
|
||||
// Removes duplicates
|
||||
$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "'");
|
||||
|
||||
foreach ($product_attribute['product_attribute_description'] as $language_id => $product_attribute_description) {
|
||||
if (!empty($product_attribute_description['text'])) {
|
||||
$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "' AND language_id = '" . (int)$language_id . "'");
|
||||
|
||||
$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" . $this->db->escape($product_attribute_description['text']) . "'");
|
||||
@@ -36,6 +34,7 @@ class ModelCatalogProduct extends Model {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($data['product_option'])) {
|
||||
foreach ($data['product_option'] as $product_option) {
|
||||
@@ -186,15 +185,14 @@ class ModelCatalogProduct extends Model {
|
||||
if (!empty($data['product_attribute'])) {
|
||||
foreach ($data['product_attribute'] as $product_attribute) {
|
||||
if ($product_attribute['attribute_id']) {
|
||||
// Removes duplicates
|
||||
$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "'");
|
||||
|
||||
foreach ($product_attribute['product_attribute_description'] as $language_id => $product_attribute_description) {
|
||||
if (!empty($product_attribute_description['text'])) {
|
||||
$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" . $this->db->escape($product_attribute_description['text']) . "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->db->query("DELETE FROM " . DB_PREFIX . "product_option WHERE product_id = '" . (int)$product_id . "'");
|
||||
$this->db->query("DELETE FROM " . DB_PREFIX . "product_option_value WHERE product_id = '" . (int)$product_id . "'");
|
||||
|
||||
@@ -492,40 +492,27 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="tab-attribute">
|
||||
<div class="table-responsive">
|
||||
<table id="attribute" class="table table-striped table-bordered table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="text-left">{{ entry_attribute }}</td>
|
||||
<td class="text-left">{{ entry_text }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
{% set attribute_row = 0 %}
|
||||
{% for product_attribute in product_attributes %}
|
||||
<tr id="attribute-row{{ attribute_row }}">
|
||||
<td class="text-left" style="width: 40%;"><input type="text" name="product_attribute[{{ attribute_row }}][name]" value="{{ product_attribute.name }}" placeholder="{{ entry_attribute }}" class="form-control"/> <input type="hidden" name="product_attribute[{{ attribute_row }}][attribute_id]" value="{{ product_attribute.attribute_id }}"/></td>
|
||||
<td class="text-left">{% for language in languages %}
|
||||
<div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}"/></span> <textarea name="product_attribute[{{ attribute_row }}][product_attribute_description][{{ language.language_id }}][text]" rows="5" placeholder="{{ entry_text }}" class="form-control">{{ product_attribute.product_attribute_description[language.language_id] ? product_attribute.product_attribute_description[language.language_id].text }}</textarea>
|
||||
{% for attribute_group in attribute_groups %}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><h4 class="panel-title">{{ attribute_group.name }}</h4></div>
|
||||
<div class="panel-body">
|
||||
{% for attribute in attribute_group.attribute %}
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label" for="input-attribute{{ attribute.attribute_id }}">{{ attribute.name }}</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="hidden" name="product_attribute[{{ attribute.attribute_id }}][attribute_id]" value="{{ attribute.attribute_id }}"/>
|
||||
{% for language in languages %}
|
||||
<div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}"/></span>
|
||||
<textarea name="product_attribute[{{ attribute.attribute_id }}][product_attribute_description][{{ language.language_id }}][text]" rows="3" class="form-control">{{ attribute.text[language.language_id] ? attribute.text[language.language_id].text }}</textarea>
|
||||
</div>
|
||||
{% endfor %}</td>
|
||||
<td class="text-right"><button type="button" onclick="$('#attribute-row{{ attribute_row }}').remove();" data-toggle="tooltip" title="{{ button_remove }}" class="btn btn-danger"><i class="fa fa-minus-circle"></i></button></td>
|
||||
</tr>
|
||||
{% set attribute_row = attribute_row + 1 %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="2"></td>
|
||||
<td class="text-right"><button type="button" onclick="addAttribute();" data-toggle="tooltip" title="{{ button_attribute_add }}" class="btn btn-primary"><i class="fa fa-plus-circle"></i></button></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="tab-pane" id="tab-image">
|
||||
@@ -846,55 +833,6 @@ $('#article-related').delegate('.fa-minus-circle', 'click', function() {
|
||||
$(this).parent().remove();
|
||||
});
|
||||
//--></script>
|
||||
<script type="text/javascript"><!--
|
||||
var attribute_row = {{ attribute_row }};
|
||||
|
||||
function addAttribute() {
|
||||
html = '<tr id="attribute-row' + attribute_row + '">';
|
||||
html += ' <td class="text-left" style="width: 20%;"><input type="text" name="product_attribute[' + attribute_row + '][name]" value="" placeholder="{{ entry_attribute }}" class="form-control" /><input type="hidden" name="product_attribute[' + attribute_row + '][attribute_id]" value="" /></td>';
|
||||
html += ' <td class="text-left">';
|
||||
{% for language in languages %}
|
||||
html += '<div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}" /></span><textarea name="product_attribute[' + attribute_row + '][product_attribute_description][{{ language.language_id }}][text]" rows="5" placeholder="{{ entry_text }}" class="form-control"></textarea></div>';
|
||||
{% endfor %}
|
||||
html += ' </td>';
|
||||
html += ' <td class="text-right"><button type="button" onclick="$(\'#attribute-row' + attribute_row + '\').remove();" data-toggle="tooltip" title="{{ button_remove }}" class="btn btn-danger"><i class="fa fa-minus-circle"></i></button></td>';
|
||||
html += '</tr>';
|
||||
|
||||
$('#attribute tbody').append(html);
|
||||
|
||||
attributeautocomplete(attribute_row);
|
||||
|
||||
attribute_row++;
|
||||
}
|
||||
|
||||
function attributeautocomplete(attribute_row) {
|
||||
$('input[name=\'product_attribute[' + attribute_row + '][name]\']').autocomplete({
|
||||
'source': function(request, response) {
|
||||
$.ajax({
|
||||
url: 'index.php?route=catalog/attribute/autocomplete&user_token={{ user_token }}&filter_name=' + encodeURIComponent(request),
|
||||
dataType: 'json',
|
||||
success: function(json) {
|
||||
response($.map(json, function(item) {
|
||||
return {
|
||||
category: item.attribute_group,
|
||||
label: item.name,
|
||||
value: item.attribute_id
|
||||
}
|
||||
}));
|
||||
}
|
||||
});
|
||||
},
|
||||
'select': function(item) {
|
||||
$('input[name=\'product_attribute[' + attribute_row + '][name]\']').val(item['label']);
|
||||
$('input[name=\'product_attribute[' + attribute_row + '][attribute_id]\']').val(item['value']);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$('#attribute tbody tr').each(function(index, element) {
|
||||
attributeautocomplete(index);
|
||||
});
|
||||
//--></script>
|
||||
|
||||
<script type="text/javascript"><!--
|
||||
var image_row = {{ image_row }};
|
||||
|
||||
Reference in New Issue
Block a user