Текстовый логотип для витрины сайта

public/admin/controller/setting/setting.php

@@ -750,6 +750,12 @@ class ControllerSettingSetting extends Controller {
 			$data['config_logo'] = $this->config->get('config_logo');
 		}
 
+		if (isset($this->request->post['config_logo_text'])) {
+			$data['config_logo_text'] = $this->request->post['config_logo_text'];
+		} else {
+			$data['config_logo_text'] = $this->config->get('config_logo_text');
+		}
+
 		if (isset($this->request->post['config_logo']) && is_file(DIR_IMAGE . $this->request->post['config_logo'])) {
 			$data['logo'] = $this->model_tool_image->resize($this->request->post['config_logo'], 100, 100);
 		} elseif ($this->config->get('config_logo') && is_file(DIR_IMAGE . $this->config->get('config_logo'))) {

public/admin/language/ru-ru/setting/setting.php

@@ -116,6 +116,7 @@ $_['entry_return_status']              = 'Статус возврата';
 $_['entry_captcha']                    = 'Капча';
 $_['entry_captcha_page']               = 'Страница капчи';
 $_['entry_logo']                       = 'Логотип';
+$_['entry_logo_text']                  = 'Текстовый логотип';
 $_['entry_icon']                       = 'Иконка';
 $_['entry_image_category']             = 'Размер изображений категории';
 $_['entry_image_thumb']                = 'Размер большого изображения товара';

public/admin/view/template/setting/setting.twig

@@ -1093,6 +1093,12 @@
                   <input type="hidden" name="config_logo" value="{{ config_logo }}" id="input-logo" />
                 </div>
               </div>
+              <div class="form-group">
+                <label class="col-sm-2 control-label" for="input-logo-text">{{ entry_logo_text }}</label>
+                <div class="col-sm-10">
+                  <input type="text" name="config_logo_text" value="{{ config_logo_text }}" placeholder="{{ entry_logo_text }}" id="input-logo-text" class="form-control" />
+                </div>
+              </div>
               <div class="form-group">
                 <label class="col-sm-2 control-label" for="input-icon"><span data-toggle="tooltip" title="{{ help_icon }}">{{ entry_icon }}</span></label>
                 <div class="col-sm-10"><a href="" id="thumb-icon" data-toggle="image" class="img-thumbnail"><img src="{{ icon }}" alt="" title="" data-placeholder="{{ placeholder }}" /></a>

public/admin/view/template/setting/store_form.twig

@@ -528,6 +528,12 @@
                   <input type="hidden" name="config_logo" value="{{ config_logo }}" id="input-logo" />
                 </div>
               </div>
+              <div class="form-group">
+                <label class="col-sm-2 control-label" for="input-logo-text">{{ entry_logo_text }}</label>
+                <div class="col-sm-10">
+                  <input type="text" name="config_logo_text" value="{{ config_logo_text }}" placeholder="{{ entry_logo_text }}" id="input-logo-text" class="form-control" />
+                </div>
+              </div>
               <div class="form-group">
                 <label class="col-sm-2 control-label" for="input-icon"><span data-toggle="tooltip" title="{{ help_icon }}">{{ entry_icon }}</span></label>
                 <div class="col-sm-10"><a href="" id="thumb-icon" data-toggle="image" class="img-thumbnail"><img src="{{ icon }}" alt="" title="" data-placeholder="{{ placeholder }}" /></a>

public/store/controller/common/header.php

@@ -44,6 +44,7 @@ foreach(['name','email','telephone','address','open', 'comment'] as $item){
 		$data['direction'] = $this->language->get('direction');
 
 		$data['name'] = $this->config->get('config_name');
+		$data['logo_text'] = $this->config->get('config_logo_text');
 
 		if (is_file(DIR_IMAGE . $this->config->get('config_logo'))) {
 			$data['logo'] = $server . 'image/' . $this->config->get('config_logo');
@@ -117,7 +118,7 @@ foreach(['name','email','telephone','address','open', 'comment'] as $item){
 			}
 		}
 
-		$data['city_list_url'] = 'index.php?route=common/city';
+		$data['city_list_url'] = $this->url->link('common/city');
 
 		return $this->load->view('common/header', $data);
 	}

public/store/view/theme/dominik/template/common/header.twig

@@ -78,7 +78,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-auto"><a class="logo" href="{{ home }}">{{ name|upper }}</a></div>
+				<div class="col-auto"><a class="logo" href="{{ home }}">{% if logo %}<img src="{{ logo }}" alt="{{ logo_text ? logo_text : name }}">{% elseif logo_text %}{{ logo_text }}{% else %}{{ name|upper }}{% endif %}</a></div>
 				<div class="col d-flex justify-content-end">
 
 					<ul class="menu">
@@ -108,4 +108,3 @@
 		</div>
 
 	</header>
-