Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion upload/admin/controller/catalog/manufacturer.php
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,4 @@ public function autocomplete() {
$this->response->addHeader('Content-Type: application/json');
$this->response->setOutput(json_encode($json));
}
}
}
23 changes: 16 additions & 7 deletions upload/admin/model/catalog/manufacturer.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public function addManufacturer($data) {

$this->cache->delete('manufacturer');

$this->clearSeoCache();

return $manufacturer_id;
}

Expand Down Expand Up @@ -92,8 +94,6 @@ public function editManufacturer($manufacturer_id, $data) {
foreach ($data['product_related'] as $related_id) {
$this->db->query("DELETE FROM " . DB_PREFIX . "product_related_mn WHERE manufacturer_id = '" . (int)$manufacturer_id . "' AND product_id = '" . (int)$related_id . "'");
$this->db->query("INSERT INTO " . DB_PREFIX . "product_related_mn SET manufacturer_id = '" . (int)$manufacturer_id . "', product_id = '" . (int)$related_id . "'");


}
}

Expand All @@ -103,8 +103,6 @@ public function editManufacturer($manufacturer_id, $data) {
foreach ($data['article_related'] as $related_id) {
$this->db->query("DELETE FROM " . DB_PREFIX . "article_related_mn WHERE manufacturer_id = '" . (int)$manufacturer_id . "' AND article_id = '" . (int)$related_id . "'");
$this->db->query("INSERT INTO " . DB_PREFIX . "article_related_mn SET manufacturer_id = '" . (int)$manufacturer_id . "', article_id = '" . (int)$related_id . "'");


}
}

Expand All @@ -121,6 +119,8 @@ public function editManufacturer($manufacturer_id, $data) {
}

$this->cache->delete('manufacturer');

$this->clearSeoCache();
}

public function deleteManufacturer($manufacturer_id) {
Expand All @@ -133,6 +133,8 @@ public function deleteManufacturer($manufacturer_id) {
$this->db->query("DELETE FROM `" . DB_PREFIX . "article_related_mn` WHERE manufacturer_id = '" . (int)$manufacturer_id . "'");

$this->cache->delete('manufacturer');

$this->clearSeoCache();
}

public function getManufacturer($manufacturer_id) {
Expand All @@ -150,6 +152,7 @@ public function getManufacturers($data = array()) {

$sort_data = array(
'name',
'noindex',
'sort_order'
);

Expand Down Expand Up @@ -226,7 +229,7 @@ public function getTotalManufacturers() {
return $query->row['total'];
}

public function getManufacturerDescriptions($manufacturer_id) {
public function getManufacturerDescriptions($manufacturer_id) {
$manufacturer_description_data = array();
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "manufacturer_description WHERE manufacturer_id = '" . (int)$manufacturer_id . "'");
foreach ($query->rows as $result) {
Expand Down Expand Up @@ -263,5 +266,11 @@ public function getArticleRelated($manufacturer_id) {
}

return $article_related_data;
}
}
}

private function clearSeoCache() {
if ($this->config->get('config_seo_pro') && $this->config->get('config_seo_url_cache')) {
$this->cache->delete('seopro');
}
}
}
33 changes: 16 additions & 17 deletions upload/admin/view/template/catalog/manufacturer_form.twig
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<form action="{{ action }}" method="post" enctype="multipart/form-data" id="form-manufacturer" class="form-horizontal">
<ul class="nav nav-tabs">
<li class="active"><a href="#tab-general" data-toggle="tab">{{ tab_general }}</a></li>
<li><a href="#tab-data" data-toggle="tab">{{ tab_data }}</a></li>
<li><a href="#tab-data" data-toggle="tab">{{ tab_data }}</a></li>
<li><a href="#tab-seo" data-toggle="tab">{{ tab_seo }}</a></li>
<li><a href="#tab-related" data-toggle="tab">{{ tab_related }}</a></li>
<li><a href="#tab-design" data-toggle="tab">{{ tab_design }}</a></li>
<li><a href="#tab-related" data-toggle="tab">{{ tab_related }}</a></li>
<li><a href="#tab-design" data-toggle="tab">{{ tab_design }}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab-general">
<div class="form-group required">
<div class="tab-pane active" id="tab-general">
<div class="form-group required">
<label class="col-sm-2 control-label" for="input-name">{{ entry_name }}</label>
<div class="col-sm-10">
<input type="text" name="name" value="{{ name }}" placeholder="{{ entry_name }}" id="input-name" class="form-control" />
Expand All @@ -49,7 +49,7 @@
<div class="tab-content">
{% for language in languages %}
<div class="tab-pane" id="language{{ language.language_id }}">
<div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-meta-h1{{ language.language_id }}">{{ entry_meta_h1 }}</label>
<div class="col-sm-10">
<input type="text" name="manufacturer_description[{{ language.language_id }}][meta_h1]" value="{{ manufacturer_description[language.language_id] ? manufacturer_description[language.language_id].meta_h1 }}" placeholder="{{ entry_meta_h1 }}" id="input-meta-h1{{ language.language_id }}" class="form-control" />
Expand All @@ -73,7 +73,7 @@
<textarea name="manufacturer_description[{{ language.language_id }}][meta_keyword]" rows="5" placeholder="{{ entry_meta_keyword }}" id="input-meta-keyword{{ language.language_id }}" class="form-control">{{ manufacturer_description[language.language_id] ? manufacturer_description[language.language_id].meta_keyword }}</textarea>
</div>
</div>
<div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-description{{ language.language_id }}">{{ entry_description }}</label>
<div class="col-sm-10">
<textarea name="manufacturer_description[{{ language.language_id }}][description]" placeholder="{{ entry_description }}" id="input-description{{ language.language_id }}" data-toggle="summernote" data-lang="{{ summernote }}" class="form-control">{{ manufacturer_description[language.language_id] ? manufacturer_description[language.language_id].description }}</textarea>
Expand All @@ -83,9 +83,9 @@
{% endfor %}
</div>
</div>
<div class="tab-pane" id="tab-data">
<div class="tab-pane" id="tab-data">
<div class="form-group">
<label class="col-sm-2 control-label">{{ entry_store }}</label>
<label class="col-sm-2 control-label">{{ entry_store }}</label>
<div class="col-sm-10">
<div class="well well-sm" style="height: 150px; overflow: auto;"> {% for store in stores %}
<div class="checkbox">
Expand Down Expand Up @@ -140,7 +140,7 @@
</tbody>
</table>
</div>
<div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-noindex">{{ entry_noindex }}</label>
<div class="col-sm-10">
<select name="noindex" id="input-noindex" class="form-control">
Expand All @@ -153,10 +153,10 @@
{% endif %}
</select>
</div>
</div>
</div>
</div>
<div class="tab-pane" id="tab-related">
<div class="form-group">
<div class="tab-pane" id="tab-related">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-product-related"><span data-toggle="tooltip" title="{{ help_related }}">{{ entry_related_mn }}</span></label>
<div class="col-sm-10">
<input type="text" name="product_related_input" value="" placeholder="{{ entry_related_mn }}" id="input-product-related" class="form-control" />
Expand All @@ -166,8 +166,8 @@
</div>
{% endfor %}</div>
</div>
</div>
<div class="form-group">
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-article-related"><span data-toggle="tooltip" title="{{ help_related }}">{{ entry_related_article }}</span></label>
<div class="col-sm-10">
<input type="text" name="article_related_input" value="" placeholder="{{ entry_related_article }}" id="input-article-related" class="form-control" />
Expand All @@ -179,7 +179,7 @@
</div>
</div>
</div>
<div class="tab-pane" id="tab-design">
<div class="tab-pane" id="tab-design">
<div class="table-responsive">
<table class="table table-bordered table-hover">
<thead>
Expand All @@ -189,7 +189,6 @@
</tr>
</thead>
<tbody>

{% for store in stores %}
<tr>
<td class="text-left">{{ store.name }}</td>
Expand Down