Исправление багов
This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich
parent
b71f6e8efc
commit
8cbe77e354
|
|
@ -53,7 +53,7 @@
|
||||||
"version": "3.5.1",
|
"version": "3.5.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git@github.com:jquery/jquery-dist.git",
|
"url": "https://github.com/jquery/jquery-dist.git",
|
||||||
"reference": "4c0e4becb8263bb5b3e6dadc448d8e7305ef8215"
|
"reference": "4c0e4becb8263bb5b3e6dadc448d8e7305ef8215"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
|
|
@ -351,27 +351,27 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "egulias/email-validator",
|
"name": "egulias/email-validator",
|
||||||
"version": "2.1.25",
|
"version": "3.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/egulias/EmailValidator.git",
|
"url": "https://github.com/egulias/EmailValidator.git",
|
||||||
"reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
|
"reference": "62c3b73c581c834885acf6e120b412b76acc495a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
|
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/62c3b73c581c834885acf6e120b412b76acc495a",
|
||||||
"reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
|
"reference": "62c3b73c581c834885acf6e120b412b76acc495a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"doctrine/lexer": "^1.0.1",
|
"doctrine/lexer": "^1.2",
|
||||||
"php": ">=5.5",
|
"php": ">=7.2",
|
||||||
"symfony/polyfill-intl-idn": "^1.10"
|
"symfony/polyfill-intl-idn": "^1.15"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"dominicsayers/isemail": "^3.0.7",
|
"php-coveralls/php-coveralls": "^2.2",
|
||||||
"phpunit/phpunit": "^4.8.36|^7.5.15",
|
"phpunit/phpunit": "^8.5.8|^9.3.3",
|
||||||
"satooshi/php-coveralls": "^1.0.1"
|
"vimeo/psalm": "^4"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
|
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
|
||||||
|
|
@ -379,7 +379,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.1.x-dev"
|
"dev-master": "3.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -407,7 +407,7 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/egulias/EmailValidator/issues",
|
"issues": "https://github.com/egulias/EmailValidator/issues",
|
||||||
"source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
|
"source": "https://github.com/egulias/EmailValidator/tree/3.1.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -415,7 +415,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-12-29T14:50:06+00:00"
|
"time": "2021-03-07T14:33:28+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ezyang/htmlpurifier",
|
"name": "ezyang/htmlpurifier",
|
||||||
|
|
@ -721,7 +721,7 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.hood.su/mirzaev/yii2/arangodb",
|
"url": "https://git.hood.su/mirzaev/yii2/arangodb",
|
||||||
"reference": "7288baa9593053bc769f6037dd50517079892852"
|
"reference": "1592238e5f8495dd7385848e8d65300ba7940b46"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.0.0",
|
"php": "^8.0.0",
|
||||||
|
|
@ -763,7 +763,7 @@
|
||||||
"ArangoDb",
|
"ArangoDb",
|
||||||
"yii2"
|
"yii2"
|
||||||
],
|
],
|
||||||
"time": "2021-02-23T22:22:04+00:00"
|
"time": "2021-03-15T16:41:18+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "moonlandsoft/yii2-phpexcel",
|
"name": "moonlandsoft/yii2-phpexcel",
|
||||||
|
|
@ -1200,20 +1200,20 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "swiftmailer/swiftmailer",
|
"name": "swiftmailer/swiftmailer",
|
||||||
"version": "v6.2.6",
|
"version": "v6.2.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
||||||
"reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff"
|
"reference": "15f7faf8508e04471f666633addacf54c0ab5933"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d2791ff0b73247cdc2096b14f5580aba40c12bff",
|
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
|
||||||
"reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff",
|
"reference": "15f7faf8508e04471f666633addacf54c0ab5933",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"egulias/email-validator": "^2.0",
|
"egulias/email-validator": "^2.0|^3.1",
|
||||||
"php": ">=7.0.0",
|
"php": ">=7.0.0",
|
||||||
"symfony/polyfill-iconv": "^1.0",
|
"symfony/polyfill-iconv": "^1.0",
|
||||||
"symfony/polyfill-intl-idn": "^1.10",
|
"symfony/polyfill-intl-idn": "^1.10",
|
||||||
|
|
@ -1259,7 +1259,7 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/swiftmailer/swiftmailer/issues",
|
"issues": "https://github.com/swiftmailer/swiftmailer/issues",
|
||||||
"source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.6"
|
"source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -1271,7 +1271,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-03-05T12:08:49+00:00"
|
"time": "2021-03-09T12:30:35+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-iconv",
|
"name": "symfony/polyfill-iconv",
|
||||||
|
|
@ -5219,16 +5219,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
"version": "v5.2.4",
|
"version": "v5.2.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556"
|
"reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
|
"url": "https://api.github.com/repos/symfony/console/zipball/938ebbadae1b0a9c9d1ec313f87f9708609f1b79",
|
||||||
"reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
|
"reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -5296,7 +5296,7 @@
|
||||||
"terminal"
|
"terminal"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/console/tree/v5.2.4"
|
"source": "https://github.com/symfony/console/tree/v5.2.5"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -5312,7 +5312,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-02-23T10:08:49+00:00"
|
"time": "2021-03-06T13:42:15+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/css-selector",
|
"name": "symfony/css-selector",
|
||||||
|
|
@ -6293,16 +6293,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/yaml",
|
"name": "symfony/yaml",
|
||||||
"version": "v5.2.4",
|
"version": "v5.2.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/yaml.git",
|
"url": "https://github.com/symfony/yaml.git",
|
||||||
"reference": "7d6ae0cce3c33965af681a4355f1c4de326ed277"
|
"reference": "298a08ddda623485208506fcee08817807a251dd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/7d6ae0cce3c33965af681a4355f1c4de326ed277",
|
"url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
|
||||||
"reference": "7d6ae0cce3c33965af681a4355f1c4de326ed277",
|
"reference": "298a08ddda623485208506fcee08817807a251dd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -6348,7 +6348,7 @@
|
||||||
"description": "Loads and dumps YAML files",
|
"description": "Loads and dumps YAML files",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/yaml/tree/v5.2.4"
|
"source": "https://github.com/symfony/yaml/tree/v5.2.5"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -6364,7 +6364,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-02-22T15:48:39+00:00"
|
"time": "2021-03-06T07:59:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "theseer/tokenizer",
|
"name": "theseer/tokenizer",
|
||||||
|
|
@ -6418,30 +6418,35 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webmozart/assert",
|
"name": "webmozart/assert",
|
||||||
"version": "1.9.1",
|
"version": "1.10.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/webmozarts/assert.git",
|
"url": "https://github.com/webmozarts/assert.git",
|
||||||
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
|
"reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
|
"url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
|
||||||
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
|
"reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.3.3 || ^7.0 || ^8.0",
|
"php": "^7.2 || ^8.0",
|
||||||
"symfony/polyfill-ctype": "^1.8"
|
"symfony/polyfill-ctype": "^1.8"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpstan/phpstan": "<0.12.20",
|
"phpstan/phpstan": "<0.12.20",
|
||||||
"vimeo/psalm": "<3.9.1"
|
"vimeo/psalm": "<4.6.1 || 4.6.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
|
"phpunit/phpunit": "^8.5.13"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.10-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Webmozart\\Assert\\": "src/"
|
"Webmozart\\Assert\\": "src/"
|
||||||
|
|
@ -6465,9 +6470,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/webmozarts/assert/issues",
|
"issues": "https://github.com/webmozarts/assert/issues",
|
||||||
"source": "https://github.com/webmozarts/assert/tree/1.9.1"
|
"source": "https://github.com/webmozarts/assert/tree/1.10.0"
|
||||||
},
|
},
|
||||||
"time": "2020-07-08T17:02:28+00:00"
|
"time": "2021-03-09T10:59:23+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "yiisoft/yii2-debug",
|
"name": "yiisoft/yii2-debug",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<a id="notification_button" class="text-dark d-flex h-100 mr-2" title="Уведомления" role="button" data-toggle="dropdown" data-offset="-100%p + 100%" onclick="return notification_stream();">
|
<a id="notification_button" class="text-dark d-flex h-100 mr-2" title="Уведомления" role="button" data-toggle="dropdown" data-offset="-100%p + 100%" onclick="return notification_stream();">
|
||||||
<?
|
<?php
|
||||||
if (empty($notifications_new_amount) || $notifications_new_amount < 1) {
|
if (empty($notifications_new_amount) || $notifications_new_amount < 1) {
|
||||||
// Новые уведомления не найдены
|
// Новые уведомления не найдены
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ use app\models\Product;
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-auto mx-0">
|
<div class="row mt-auto mx-0">
|
||||||
<p class="ml-0">Время для повышения релевантности в поисковиках</p>
|
<p class="ml-0">Время для повышения релевантности в поисковиках</p>
|
||||||
<time class="ml-auto"><?= empty($row->jrnl) ? '' : date('H:i d.m.Y', end($row->jrnl)['date']); ?></time>
|
<time class="ml-auto"></time>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,8 @@ $panel ?? $panel = 'profile_panel_monitoring_input_search_history';
|
||||||
<?php
|
<?php
|
||||||
foreach ($search_history as $row) {
|
foreach ($search_history as $row) {
|
||||||
// Инициализация
|
// Инициализация
|
||||||
$date = empty($row->jrnl) ? '' : date('H:i d.m.Y', end($row->jrnl)['date']);
|
$time = $row->jrnl;
|
||||||
|
$date = empty($row->jrnl) ? '' : date('H:i d.m.Y', end($time)['date']);
|
||||||
|
|
||||||
echo <<<HTML
|
echo <<<HTML
|
||||||
<div class="row py-1">
|
<div class="row py-1">
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@ $panel ?? $panel = 'profile_panel_supplies_input_import';
|
||||||
]);
|
]);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<? //$form->field($model, 'group', ['options' => ['class' => "mb-3"]])->dropDownList($groups ?? ['Нет данных']); ?>
|
|
||||||
<?= $form->field($model, 'file', ['enableLabel' => false])->fileInput(['multiple' => true, 'class' => 'mb-2', 'onChange' => 'page_profile_supplies_import_excel(this.parentElement.parentElement, \'profile_panel_supplies_input_import\')']) ?>
|
<?= $form->field($model, 'file', ['enableLabel' => false])->fileInput(['multiple' => true, 'class' => 'mb-2', 'onChange' => 'page_profile_supplies_import_excel(this.parentElement.parentElement, \'profile_panel_supplies_input_import\')']) ?>
|
||||||
|
|
||||||
<?= $form->errorSummary($model, ['header' => 'В документе были допущены ошибки:' /*, 'footer' => 'Исправьте их и попробуйте снова'*/]); ?>
|
<?= $form->errorSummary($model, ['header' => 'В документе были допущены ошибки:' /*, 'footer' => 'Исправьте их и попробуйте снова'*/]); ?>
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,8 @@ if (isset($history) && $history) {
|
||||||
|
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
// Инициализация
|
// Инициализация
|
||||||
$date = empty($row->jrnl) ? '' : date('H:i d.m.Y', end($row->jrnl)['date']);
|
$time = $row->jrnl;
|
||||||
|
$date = empty($row->jrnl) ? '' : date('H:i d.m.Y', end($time)['date']);
|
||||||
|
|
||||||
echo <<<HTML
|
echo <<<HTML
|
||||||
<a class="dropdown-item d-flex button_white text-dark" href="/search?type=product&q=$row->text">$row->text<span class="ml-auto">$date</span></a>
|
<a class="dropdown-item d-flex button_white text-dark" href="/search?type=product&q=$row->text">$row->text<span class="ml-auto">$date</span></a>
|
||||||
|
|
@ -48,3 +49,4 @@ if (isset($history) && $history) {
|
||||||
<p class="m-0 py-2 d-flex justify-content-center">Ничего не найдено</p>
|
<p class="m-0 py-2 d-flex justify-content-center">Ничего не найдено</p>
|
||||||
HTML;
|
HTML;
|
||||||
}
|
}
|
||||||
|
?>
|
||||||
|
|
|
||||||
Reference in New Issue