mirzaev/skillparts
mirzaev
/
skillparts
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Доработка

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2022-02-07 14:50:21 +10:00
parent 24f079f622
commit e941fbd782
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirzaev/skillparts/system/controllers/ProductController.php
View File

@ -64,9 +64,7 @@ class ProductController extends Controller
!yii::$app->user->isGuest
&& (yii::$app->user->identity->type === 'administrator'
|| yii::$app->user->identity->type === 'moderator')
) {
return true;
}
) return true;
return false;
}

10
mirzaev/skillparts/system/models/Supply.php
View File

@ -466,6 +466,8 @@ class Supply extends Product implements ProductInterface, OfferInterface
// Инициализация буфера документов
$_row = [];
// Инициализация статуса ошибки
$error = false;
// Запись артикула (каталожного номера) в буфер
$_row['catn'] = $_supply;
@ -607,7 +609,8 @@ class Supply extends Product implements ProductInterface, OfferInterface
// Отправка уведомления
Notification::_write("Не удалось создать новый товар: $supply->catn", account: '@authorized');
return false;
// Запись статуса об ошибке
$error = true;
}
}
@ -626,7 +629,12 @@ class Supply extends Product implements ProductInterface, OfferInterface
// Добавление ошибок
foreach ($supply->errors as $attribute => $error) $this->addError($attribute, $error);
// Запись статуса об ошибке
$error = true;
}
return !$error;
};
// Запись поставки

2
mirzaev/skillparts/system/models/Warehouse.php
View File

@ -181,7 +181,7 @@ class Warehouse extends Document
// Инициализация
$list = [];
$cities = Dellin::read(9999, order: ['dellin.data.name' => 'DESC']);
$cities = Dellin::read(limit: 9999, order: ['dellin.data.name' => 'DESC']);
foreach ($cities as $city) {
// Перебор городов

26
mirzaev/skillparts/system/views/product/index.php
View File

@ -114,10 +114,10 @@ use app\models\Product;
}
?>
</div>
<div class="ml-4 px-3 d-flex flex-column w-50"> <?php if (
!yii::$app->user->isGuest
&& yii::$app->user->identity->type === 'administrator'
) : ?>
<div class="ml-4 px-3 d-flex flex-column w-50">
<?php if (!yii::$app->user->isGuest
&& (yii::$app->user->identity->type === 'administrator'
|| yii::$app->user->identity->type === 'moderator')) : ?>
<nav class="row my-2 py-2 px-3 rounded product_admin_menu">
<a id="product_info_admin_connect" class="mr-2 h-100 text-dark d-flex" title="Подсоединить аналог" role="button" onclick="return product_panel_connect('<?= $model['catn'] ?>');">
<i class="fas fa-plus-square my-auto"></i>
@ -210,18 +210,17 @@ use app\models\Product;
<?php else : ?>
<p id="description_<?= $model['catn'] ?>" class="mt-0 ml-0 text-break product_description"><?= $model['prod'] ?? 'Без описания' ?></p>
<?php endif ?>
<p class="mt-0">
<?php
// foreach ($model['catn'] ?? [] as $catn) {
// echo <<<HTML
// $catn
// HTML;
// }
?>
</p>
</div>
<?php
if (
!yii::$app->user->isGuest
&& (yii::$app->user->identity->type === 'administrator'
|| yii::$app->user->identity->type === 'moderator')
) {
// Инициализация артикула
$catn = $model['catn'];
if (isset($model['stts']) && $model['stts'] === 'active') {
// Товар активен
@ -235,6 +234,7 @@ use app\models\Product;
<button class="row btn button_green button_clean" onclick="return product_panel_product_stts('$catn', 'active');">Активировать</button>
HTML;
}
}
?>
</div>
</div>