From d490957879ed2656f735f4dc96ba5ac7c5b0728f Mon Sep 17 00:00:00 2001
From: vladfo <fvv2011@gmail.com>
Date: Tue, 8 Oct 2024 15:07:33 +0300
Subject: [PATCH] =?utf8?q?=20=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B8?=
 =?utf8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/views/city_store/_form.php | 80 ++++++++++++++++----------------
 erp24/web/images/info-icon.svg   | 14 +-----
 2 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/erp24/views/city_store/_form.php b/erp24/views/city_store/_form.php
index 1fdb0a6a..97653a58 100644
--- a/erp24/views/city_store/_form.php
+++ b/erp24/views/city_store/_form.php
@@ -29,7 +29,7 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'f_id')
         ->label('FloraPointID магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'FloraPointID магазина']))
         ->widget(Select2::class, [
         'data' => $firms,
@@ -40,7 +40,7 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'firma_id')
         ->label('ID привязанного к магазину юрлица ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID привязанного к магазину юрлица']))
         ->widget(Select2::class, [
         'data' => $firms,
@@ -51,7 +51,7 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'firm_group_id')
         ->label('Firm group ID' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Группа привязанного к магазину юрлица???']))
         ->widget(Select2::class, [
         'data' => $firmsGroups,
@@ -62,7 +62,7 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'firma_group_id')
         ->label('Firma group ID ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Группа привязанного к магазину юрлица???']))
         ->widget(Select2::class, [
         'data' => $firmsGroups,
@@ -73,18 +73,18 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'name')->textInput(['maxlength' => true, 'value' => '', 'id' => 'name-field'])
         ->label('Наименование магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Наименование магазина. Обязательно'])) ?>
 
     <?= $form->field($model, 'name_full')->textInput(['maxlength' => true, 'value' => '', 'id' => 'name-full-field'])
         ->label('Полное наименование ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Наименование магазина. Обязательно'])) ?>
 
     <?= $form->field($model, 'city_id')->label('City ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Выберите город из списка']))->widget(Select2::class, [
         'data' => $cities,
         'options' => ['placeholder' => 'Выберите город'],
@@ -96,182 +96,182 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'setka_id')->textInput(['value' => 1])
         ->label('ID Сетки ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID Сетки'])) ?>
 
     <?= $form->field($model, 'posit')->textInput(['value' => 0])
         ->label('Позиция магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Позиция магазина'])) ?>
 
     <?= $form->field($model, 'square_store')->textInput(['value' => null])
         ->label('Площадь магазина (кв.м) ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Площадь магазина (кв.м)'])) ?>
 
     <?= $form->field($model, 'order_1c')->textInput(['value' => 21])
         ->label('Порядок в 1С ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Порядок в 1С???'])) ?>
 
     <?= $form->field($model, 'url')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('URL магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'URL магазина'])) ?>
 
     <?= $form->field($model, 'adress')->textarea(['rows' => 2, 'value' => '-', 'id' => 'adress-field'])
         ->label('Адрес магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Адрес магазина - ул. Улица д.1'])) ?>
 
     <?= $form->field($model, 'adress_amo')->textInput(['maxlength' => true, 'value' => '-', 'id' => 'adress-amo-field'])
         ->label('Адрес для AmoCRM ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Адрес магазина для амо - самовывоз'])) ?>
 
     <?= $form->field($model, 'adress_sm')->textInput(['maxlength' => true, 'value' => '-', 'id' => 'adress-sm-field'])
         ->label('Короткий адрес магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Короткий адрес магазина'])) ?>
 
     <?= $form->field($model, '2gis')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Ссылка на 2ГИС ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Ссылка на 2ГИС'])) ?>
 
     <?= $form->field($model, 'yamap')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Ссылка на Яндекс.Карты ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Ссылка на Яндекс.Карты'])) ?>
 
     <?= $form->field($model, 'googlemap')->textarea(['rows' => 2, 'value' => '-'])
         ->label('Ссылка на Google Maps ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Ссылка на Google Maps'])) ?>
 
     <?= $form->field($model, 'mapiframe')->textarea(['rows' => 4, 'value' => '-'])
         ->label('Карта магазина в iframe ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Карта магазина в iframe'])) ?>
 
 
     <?= $form->field($model, 'seo_title')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('SEO заголовок ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'SEO заголовок'])) ?>
 
     <?= $form->field($model, 'seo_description')->textarea(['rows' => 2, 'value' => '-'])
         ->label('SEO описание ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'SEO описание'])) ?>
 
     <?= $form->field($model, 'content')->textarea(['rows' => 6, 'value' => '-'])
         ->label('Содержимое - текст ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Содержимое - текст'])) ?>
 
     <?= $form->field($model, 'email')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Email магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Email магазина'])) ?>
 
     <?= $form->field($model, 'tg_chat_id')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('ID чата в Telegram ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID чата в Telegram'])) ?>
 
     <?= $form->field($model, 'h1')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('H1 шаблон для SEO ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'H1 шаблон для SEO'])) ?>
 
     <?= $form->field($model, 'sprav_id')->textInput(['maxlength' => true, 'value' => '0'])
         ->label('ID в справочнике ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID в справочнике'])) ?>
 
     <?= $form->field($model, 'images')->textarea(['rows' => 2, 'value' => '-'])
         ->label('Изображения магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Изображения магазина'])) ?>
 
     <?= $form->field($model, 'visible')->textInput(['value' => 1])
         ->label('Видимость магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Видимость магазина'])) ?>
 
     <?= $form->field($model, 'image_sm')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Путь к маленькой картинке ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Путь к маленькой картинке'])) ?>
 
     <?= $form->field($model, 'image_big')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Путь к большой картинке ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Путь к большой картинке'])) ?>
 
     <?= $form->field($model, 'image2_sm')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Путь к маленькой картинке 2 ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Путь к маленькой картинке 2'])) ?>
 
     <?= $form->field($model, 'image2_big')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Путь к большой картинке 2 ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Путь к большой картинке 2'])) ?>
 
     <?= $form->field($model, 'type_id')->textInput(['value' => 1])
         ->label('Тип магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Тип магазина'])) ?>
 
     <?= $form->field($model, 'sale_plan_avg')->textInput(['value' => 0])
         ->label('Средний план продаж ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Средний план продаж'])) ?>
 
     <?= $form->field($model, 'visitor_day_avg')->textInput(['value' => 0])
         ->label('Среднее количество посетителей в день ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Среднее количество посетителей в день'])) ?>
 
     <?= $form->field($model, 'visitor_avg')->textInput(['value' => 0])
         ->label('Среднее количество посетителей ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Среднее количество посетителей'])) ?>
 
     <?= $form->field($model, 'administrator_id')
         ->label('ID администратора ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID администратора']))
         ->widget(Select2::class, [
         'data' => $administrators,
@@ -282,7 +282,7 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'cluster_id')
         ->label('ID куста ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'ID куста']))
         ->widget(Select2::class, [
         'data' => $clusters,
@@ -293,13 +293,13 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P
     <?= $form->field($model, 'open_date')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('Дата открытия ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'Дата открытия'])) ?>
 
     <?= $form->field($model, 'gps')->textInput(['maxlength' => true, 'value' => '-'])
         ->label('GPS координаты магазина ' . Html::img('@web/images/info-icon.svg', [
     'alt' => 'Info',
-    'style' => 'width: 16px; height: 16px; cursor: pointer;',
+    'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;',
     'data-toggle' => 'tooltip', 'title' => 'GPS координаты магазина в виде 56.275879,44.045422'])) ?>
 
 
diff --git a/erp24/web/images/info-icon.svg b/erp24/web/images/info-icon.svg
index 09ad824e..7484f1ca 100644
--- a/erp24/web/images/info-icon.svg
+++ b/erp24/web/images/info-icon.svg
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 width="800px" height="800px" viewBox="0 0 416.979 416.979"
-	 xml:space="preserve">
-<g>
-	<path d="M356.004,61.156c-81.37-81.47-213.377-81.551-294.848-0.182c-81.47,81.371-81.552,213.379-0.181,294.85
-		c81.369,81.47,213.378,81.551,294.849,0.181C437.293,274.636,437.375,142.626,356.004,61.156z M237.6,340.786
-		c0,3.217-2.607,5.822-5.822,5.822h-46.576c-3.215,0-5.822-2.605-5.822-5.822V167.885c0-3.217,2.607-5.822,5.822-5.822h46.576
-		c3.215,0,5.822,2.604,5.822,5.822V340.786z M208.49,137.901c-18.618,0-33.766-15.146-33.766-33.765
-		c0-18.617,15.147-33.766,33.766-33.766c18.619,0,33.766,15.148,33.766,33.766C242.256,122.755,227.107,137.901,208.49,137.901z"/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="100" height="100" viewBox="0 0 50 50">
+	<path d="M 25 2 C 12.309295 2 2 12.309295 2 25 C 2 37.690705 12.309295 48 25 48 C 37.690705 48 48 37.690705 48 25 C 48 12.309295 37.690705 2 25 2 z M 25 4 C 36.609824 4 46 13.390176 46 25 C 46 36.609824 36.609824 46 25 46 C 13.390176 46 4 36.609824 4 25 C 4 13.390176 13.390176 4 25 4 z M 25 11 A 3 3 0 0 0 22 14 A 3 3 0 0 0 25 17 A 3 3 0 0 0 28 14 A 3 3 0 0 0 25 11 z M 21 21 L 21 23 L 22 23 L 23 23 L 23 36 L 22 36 L 21 36 L 21 38 L 22 38 L 23 38 L 27 38 L 28 38 L 29 38 L 29 36 L 28 36 L 27 36 L 27 21 L 26 21 L 22 21 L 21 21 z"></path>
 </svg>
\ No newline at end of file
-- 
2.39.5