From 78d6c86762c548f43b0d9bd1adbee19414e4dfd9 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 20 Nov 2024 14:39:52 +0300 Subject: [PATCH] =?utf8?q?[ERP-241]=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B8=D1=80?= =?utf8?q?=D0=BE=D0=B2=D0=BA=D1=83=20=D0=BF=D1=80=D0=BE=D0=B4=D1=83=D0=BA?= =?utf8?q?=D1=82=D0=BE=D0=B2=20=D0=B2=20ProductsClass?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/ProductsClass.php | 30 +++++++++++++++++++++++++-- erp24/views/shift-transfer/update.php | 7 ++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/erp24/records/ProductsClass.php b/erp24/records/ProductsClass.php index fbf54cce..acb9dd84 100755 --- a/erp24/records/ProductsClass.php +++ b/erp24/records/ProductsClass.php @@ -13,8 +13,34 @@ use Yii; class ProductsClass extends \yii\db\ActiveRecord { - public const MARKETPLACE = 'marketplace'; - public const MARKETPLACE_ADDITIONAL = 'marketplace_additional'; + public const HINT_WRAP = 'wrap'; + public const HINT_POTTED = 'potted'; + public const HINT_SERVICES = 'services'; + public const HINT_SERVICES_DELIVERY = 'services_delivery'; + public const HINT_SALUT = 'salut'; + public const HINT_MATRIX = 'matrix'; + public const HINT_MARKETPLACE = 'marketplace'; + public const HINT_MARKETPLACE_ADDITIONAL = 'marketplace_additional'; + public const HINT_RELATED = 'related'; + public const HINT_OTHER_ITEMS = 'other_items'; + + public const MARKETPLACE = 'marketplace'; // TODO: replace with HINT_MARKETPLACE + public const MARKETPLACE_ADDITIONAL = 'marketplace_additional'; // TODO: replace with HINT_MARKETPLACE_ADDITIONAL + + public static function getHints() { + return [ + self::HINT_WRAP => 'Упаковка', + self::HINT_POTTED => 'Горшечка', + self::HINT_SERVICES => 'Услуги', + self::HINT_SERVICES_DELIVERY => 'Услуги по доставке', + self::HINT_SALUT => 'Пиротехника', + self::HINT_MATRIX => 'Матрица', + self::HINT_MARKETPLACE => 'Товары для маркетплейсов', + self::HINT_MARKETPLACE_ADDITIONAL => 'Доп. товары для маркетплейсов', + self::HINT_RELATED => 'Сопутка', + self::HINT_OTHER_ITEMS => 'Номенклатура 1%', + ]; + } /** * {@inheritdoc} diff --git a/erp24/views/shift-transfer/update.php b/erp24/views/shift-transfer/update.php index d073b3f8..17f71f56 100644 --- a/erp24/views/shift-transfer/update.php +++ b/erp24/views/shift-transfer/update.php @@ -9,6 +9,7 @@ use yii\widgets\ActiveForm; use kartik\select2\Select2; use dosamigos\datetimepicker\DateTimePicker; use yii_app\records\ShiftTransfer; +use yii_app\records\ProductsClass; /* @var $isCreate bool */ /* @var $shiftTransfer ShiftTransfer */ @@ -155,11 +156,7 @@ $this->registerCss(' 'name' => 'group_label', 'title' => 'Название группы', 'type' => BaseColumn::TYPE_DROPDOWN, - 'items' => ["wrap"=>"Упаковка","potted"=>"Горшечка", "services"=>"Услуги", - "services_delivery"=>"Услуги по доставке", "salut"=>"Пиротехника", - "matrix"=>"Матрица", "marketplace" => "Товары для маркетплейсов", - "marketplace_additional" => "Доп. товары для маркетплейсов", "related"=>"Сопутка", - "other_items"=>"Номенклатура 1%"], + 'items' => ProductsClass::getHints(), 'value' => function($data) { return $data['group_label'] ?? ''; }, -- 2.39.5