Панель управления
-
+
-
\ No newline at end of file
+
+user->identity->type === 'administrator'
+ || yii::$app->user->identity->type === 'moderator'
+) : ?>
+
+
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/search/index.php b/mirzaev/skillparts/system/views/search/index.php
index 30dc211..30bd0fe 100644
--- a/mirzaev/skillparts/system/views/search/index.php
+++ b/mirzaev/skillparts/system/views/search/index.php
@@ -9,7 +9,7 @@
\ No newline at end of file
+
+
+user->identity->type === 'administrator'
+ || yii::$app->user->identity->type === 'moderator'
+) : ?>
+
+
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/css/pages/product.css b/mirzaev/skillparts/system/web/css/pages/product.css
index a5db4a6..66645d2 100644
--- a/mirzaev/skillparts/system/web/css/pages/product.css
+++ b/mirzaev/skillparts/system/web/css/pages/product.css
@@ -30,4 +30,8 @@
#page_product #product_slider>.product_slider_preview>label:focus>img {
cursor: pointer;
filter: brightness(0.8) contrast(1.3);
+}
+
+#page_product article .product_description {
+ display: contents;
}
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/img/.gitignore b/mirzaev/skillparts/system/web/img/.gitignore
index b784184..61872d3 100644
--- a/mirzaev/skillparts/system/web/img/.gitignore
+++ b/mirzaev/skillparts/system/web/img/.gitignore
@@ -1 +1,2 @@
-/supplies
\ No newline at end of file
+/supplies
+/products
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/img/covers/h150/product_new.png b/mirzaev/skillparts/system/web/img/covers/h150/product_new.png
new file mode 100644
index 0000000..c7194bb
Binary files /dev/null and b/mirzaev/skillparts/system/web/img/covers/h150/product_new.png differ
diff --git a/mirzaev/skillparts/system/web/img/covers/product_new.png b/mirzaev/skillparts/system/web/img/covers/product_new.png
new file mode 100644
index 0000000..24482ed
Binary files /dev/null and b/mirzaev/skillparts/system/web/img/covers/product_new.png differ
diff --git a/mirzaev/skillparts/system/web/js/cart.js b/mirzaev/skillparts/system/web/js/cart.js
index e58bc62..ff745f7 100644
--- a/mirzaev/skillparts/system/web/js/cart.js
+++ b/mirzaev/skillparts/system/web/js/cart.js
@@ -61,7 +61,6 @@ function cart_pay() {
* Управление чекбоксами
*/
function cart_list_checkbox(target) {
-
// Инициализация
let elements = document.getElementsByClassName('cart_list_target');
let reg = /^\w+_([^_]*)$/;
diff --git a/mirzaev/skillparts/system/web/js/product.js b/mirzaev/skillparts/system/web/js/product.js
new file mode 100644
index 0000000..17385a8
--- /dev/null
+++ b/mirzaev/skillparts/system/web/js/product.js
@@ -0,0 +1,36 @@
+function product_response_success(data, status) {
+ product_response(data, status);
+}
+
+function product_response_error(data, status) {
+ // Инициализация
+ data = data.responseJSON;
+
+ product_response(data, status);
+}
+
+function product_response(data, status) {
+ // Основной блок
+ if (data.main !== undefined) {
+ // Инициализация
+ main = document.getElementsByTagName('main')[0];
+
+ // Обновление документа
+ main.innerHTML = data.main;
+
+ // Реинициализация
+ reinitialization(main);
+ };
+
+ // Перенаправление
+ if (data.redirect !== undefined) {
+ // Перенаправление
+ history.pushState({}, document.title, data.redirect);
+ };
+
+ // CSRF-токен
+ if (data._csrf !== undefined) {
+ // Обновление документа
+ $('meta[name=csrf-token]').prop("content", data._csrf);
+ };
+}
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/js/product_panel.js b/mirzaev/skillparts/system/web/js/product_panel.js
new file mode 100644
index 0000000..f6870bd
--- /dev/null
+++ b/mirzaev/skillparts/system/web/js/product_panel.js
@@ -0,0 +1,181 @@
+function product_panel_title_edit(catn, element) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ element.innerHTML = '';
+
+ element.removeAttribute('onclick');
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_title_save(catn, element) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ // Инициализация
+ let text = element.children[0].value;
+
+ // Обновление заголовка (предзагрузка)
+ element.innerHTML = text;
+
+ // Запись аттрибута (предзагрузка)
+ element.setAttribute('onclick', 'return product_panel_title_edit(\'' + catn + '\', this);');
+
+ $.ajax({
+ url: '/product/' + catn + '/edit/title',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken(),
+ 'text': text
+ },
+ success: function (data, status) {
+ // Заголовок
+ if (data.name !== undefined && element !== null && element !== undefined) {
+ // Обновление заголовка
+ element.innerHTML = data.name;
+
+ // Запись аттрибута
+ element.setAttribute('onclick', 'return product_panel_title_edit(\'' + catn + '\', this);');
+ };
+
+ product_response_success(data, status);
+ },
+ error: product_response_error
+ });
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_catn_edit(catn, element, redirect = false) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ element.innerHTML = '';
+
+ element.removeAttribute('onclick');
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_catn_save(catn, element, redirect = false) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ // Инициализация
+ let text = element.children[0].value;
+
+ // Обновление заголовка (предзагрузка)
+ element.innerHTML = text;
+
+ // Запись аттрибута (предзагрузка)
+ element.setAttribute('onclick', 'return product_panel_catn_edit(\'' + catn + '\', this);');
+
+ $.ajax({
+ url: '/product/' + catn + '/edit/catn',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken(),
+ 'text': text
+ },
+ success: function (data, status) {
+ // Заголовок
+ if (data.catn !== undefined && element !== null && element !== undefined) {
+ if (redirect) {
+ // Перенаправление
+ history.pushState({}, '/product/' + catn, '/product/' + data.catn);
+ }
+ };
+
+ product_response_success(data, status);
+ },
+ error: product_response_error
+ });
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_description_edit(catn, element) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ element.innerHTML = '';
+
+ element.removeAttribute('onclick');
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_description_save(catn, element) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ // Инициализация
+ let text = element.children[0].value;
+
+ // Обновление заголовка (предзагрузка)
+ element.innerHTML = text;
+
+ // Запись аттрибута (предзагрузка)
+ element.setAttribute('onclick', 'return product_panel_description_edit(\'' + catn + '\', this);');
+
+ $.ajax({
+ url: '/product/' + catn + '/edit/desc',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken(),
+ 'text': text
+ },
+ success: function (data, status) {
+ // Заголовок
+ if (data.description !== undefined && element !== null && element !== undefined) {
+ // Обновление заголовка
+ element.innerHTML = data.description;
+
+ // Запись аттрибута
+ element.setAttribute('onclick', 'return product_panel_description_edit(\'' + catn + '\', this);');
+ };
+
+ product_response_success(data, status);
+ },
+ error: product_response_error
+ });
+
+ return false;
+ }
+
+ return true;
+}
+
+function product_panel_images_write(catn, element) {
+ if (catn !== null && catn !== undefined && element !== null && element !== undefined) {
+ // Инициализация
+ let data = new FormData();
+
+ data.append('_csrf', yii.getCsrfToken());
+ for (i = 0; i < element.files.length; i++) {
+ data.append('images[' + i + ']', element.files[i]);
+ }
+
+ $.ajax({
+ url: '/product/' + catn + '/write/image',
+ type: 'post',
+ dataType: 'json',
+ processData: false,
+ contentType: false,
+ data: data,
+ success: product_response_success,
+ error: product_response_error
+ });
+
+ return false;
+ }
+
+ return true;
+}
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/js/profile.js b/mirzaev/skillparts/system/web/js/profile.js
index 2975953..6d191c1 100644
--- a/mirzaev/skillparts/system/web/js/profile.js
+++ b/mirzaev/skillparts/system/web/js/profile.js
@@ -48,9 +48,9 @@ function page_profile_supplies_import_excel(form, panel) {
url: '/profile/import',
type: 'post',
dataType: 'json',
- data: form,
processData: false,
contentType: false,
+ data: form,
success: page_profile_response_success,
error: page_profile_response_error
});
diff --git a/mirzaev/skillparts/system/web/js/profile_trusted.js b/mirzaev/skillparts/system/web/js/profile_panel.js
similarity index 75%
rename from mirzaev/skillparts/system/web/js/profile_trusted.js
rename to mirzaev/skillparts/system/web/js/profile_panel.js
index ee104c3..8d4c80c 100644
--- a/mirzaev/skillparts/system/web/js/profile_trusted.js
+++ b/mirzaev/skillparts/system/web/js/profile_panel.js
@@ -1,4 +1,4 @@
-function page_profile_trusted_notification_create(form, html = 0) {
+function page_profile_panel_notification_create(form, html = 0) {
if (form == undefined) {
form = {
'_csrf': yii.getCsrfToken()
@@ -13,10 +13,10 @@ function page_profile_trusted_notification_create(form, html = 0) {
});
}
- return page_profile_trusted_write(form);
+ return page_profile_panel_write(form);
}
-function page_profile_trusted_settings(form, panel) {
+function page_profile_panel_settings(form, panel) {
if (form == undefined) {
form = {
'_csrf': yii.getCsrfToken()
@@ -34,12 +34,12 @@ function page_profile_trusted_settings(form, panel) {
});
}
- return page_profile_trusted_write(form);
+ return page_profile_panel_write(form);
}
-function page_profile_trusted_write (form) {
+function page_profile_panel_write (form) {
$.ajax({
- url: '/profile/trusted',
+ url: '/profile/panel',
type: 'post',
dataType: 'json',
data: form,
- />
+ />
- />
+ />
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/profile/supplies.php b/mirzaev/skillparts/system/views/profile/supplies.php
index 95b74a5..0d54e5f 100644
--- a/mirzaev/skillparts/system/views/profile/supplies.php
+++ b/mirzaev/skillparts/system/views/profile/supplies.php
@@ -51,7 +51,7 @@ $panel ?? $panel = 'profile_panel_supplies_input_import';
]);
?>
- 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\')']) ?>
+ field($model, 'file_excel', ['enableLabel' => false])->fileInput(['multiple' => true, 'class' => 'mb-2', 'onChange' => 'page_profile_supplies_import_excel(this.parentElement.parentElement, \'profile_panel_supplies_input_import\')']) ?>
errorSummary($model, ['header' => 'В документе были допущены ошибки:' /*, 'footer' => 'Исправьте их и попробуйте снова'*/]); ?>
@@ -63,4 +63,10 @@ $panel ?? $panel = 'profile_panel_supplies_input_import';
Отправка уведомления
'form_profile_trusted_notifications', + 'id' => 'form_profile_panel_notifications', 'action' => false, 'fieldConfig' => [ 'template' => '{label}{input}' @@ -62,17 +62,17 @@ $panel ?? $panel = 'profile_panel_trusted_input_notifications'; field($model_notifications, 'text', ['options' => ['class' => "mb-3"]])->textarea(); ?> - 'submitNotification', 'onclick' => 'page_profile_trusted_notification_create(this.parentElement);', 'class' => 'flex-grow-1 mr-2 btn button_white button_clean']) ?> - 'submitNotification', 'onclick' => 'page_profile_trusted_notification_create(this.parentElement, 1);', 'class' => 'flex-grow-1 mr-2 btn button_white button_clean']) ?> + 'submitNotification', 'onclick' => 'page_profile_panel_notification_create(this.parentElement);', 'class' => 'flex-grow-1 mr-2 btn button_white button_clean']) ?> + 'submitNotification', 'onclick' => 'page_profile_panel_notification_create(this.parentElement, 1);', 'class' => 'flex-grow-1 mr-2 btn button_white button_clean']) ?>
'form_profile_trusted_settings_search_period',
+ 'id' => 'form_profile_panel_settings_search_period',
'action' => false,
'fieldConfig' => [
'template' => '{label}{input}',
@@ -86,14 +86,14 @@ $panel ?? $panel = 'profile_panel_trusted_input_notifications';
errorSummary($model_settings, ['header' => 'Получены ошибки:']) ?>
- field($model_settings, 'search_period', ['options' => ['class' => "mb-1"]])->textInput(['value' => $model_settings['search_period'], 'onChange' => 'page_profile_trusted_settings(this.parentElement.parentElement, \'profile_panel_trusted_input_settings\')']); ?>
+ field($model_settings, 'search_period', ['options' => ['class' => "mb-1"]])->textInput(['value' => $model_settings['search_period'], 'onChange' => 'page_profile_panel_settings(this.parentElement.parentElement, \'profile_panel_panel_input_settings\')']); ?>
Время которое надо ждать для повторного поиска в секундах
'form_profile_trusted_settings_search_connect_keep',
+ 'id' => 'form_profile_panel_settings_search_connect_keep',
'action' => false,
'fieldConfig' => [
'template' => '{label}{input}',
@@ -128,7 +128,7 @@ $panel ?? $panel = 'profile_panel_trusted_input_notifications';
}
?>
- field($model_settings, 'search_connect_keep', ['options' => ['class' => "mb-1"]])->dropDownList($list, ['onChange' => 'page_profile_trusted_settings(this.parentElement.parentElement, \'profile_panel_trusted_input_settings\')']); ?>
+ field($model_settings, 'search_connect_keep', ['options' => ['class' => "mb-1"]])->dropDownList($list, ['onChange' => 'page_profile_panel_settings(this.parentElement.parentElement, \'profile_panel_panel_input_settings\')']); ?>
Удерживать открытое соединение до истечения срока блокировки поиска?
При малой задержке позволяет снизить время загрузки страницы, но при большой будет казаться, что сайт завис
@@ -142,4 +142,4 @@ $panel ?? $panel = 'profile_panel_trusted_input_notifications';
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/profile/sidebar.php b/mirzaev/skillparts/system/views/profile/sidebar.php
index 2e8848a..c36d980 100644
--- a/mirzaev/skillparts/system/views/profile/sidebar.php
+++ b/mirzaev/skillparts/system/views/profile/sidebar.php
@@ -18,11 +18,14 @@ use app\models\SupplyEdgeProduct;
-
user->identity->trst) {
+ if (
+ yii::$app->user->identity->type === 'administrator'
+ || yii::$app->user->identity->type === 'moderator'
+ ) {
// Пользователь является доверенным
// Инициализация
- $targetUrl = '/profile/trusted';
+ $targetUrl = '/profile/panel';
if ('/' . yii::$app->request->pathInfo === $targetUrl) {
// Запрошена та же страница от которой послан запрос (текущая)
@@ -35,7 +38,7 @@ use app\models\SupplyEdgeProduct;
} else {
echo <<
- Панель управления
+ Панель управления
HTML;
}
@@ -43,19 +46,21 @@ use app\models\SupplyEdgeProduct;
?>
- request->pathInfo === $targetUrl = '/profile/supplies' - || '/' . yii::$app->request->pathInfo === $targetUrl = '/profile/import' - ) { - // Запрошена та же страница от которой послан запрос (текущая) + if (yii::$app->user->identity->agnt) { + if ( + '/' . yii::$app->request->pathInfo === $targetUrl = '/profile/supplies' + || '/' . yii::$app->request->pathInfo === $targetUrl = '/profile/import' + ) { + // Запрошена та же страница от которой послан запрос (текущая) - echo <<Поставки HTML; - } else { - echo <<Поставки HTML; + } } ?> @@ -96,21 +101,24 @@ use app\models\SupplyEdgeProduct; ?>
-
- Загрузок с аккаунта:
- -
-
- Товары:
- -
-
- Поставки:
- -
-
+ user->identity->agnt) : ?>
+
+ Связано поставок:
- -
+
+ Загрузок с аккаунта:
++
+
+
+ Товары:
+ +
+
+ Поставки:
+ +
+
+
Связано поставок:
+ +