From 26df7f166df50c6ed93f5224f03946b436027729 Mon Sep 17 00:00:00 2001 From: vladfo Date: Thu, 17 Oct 2024 17:27:08 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20cluster?= =?utf8?q?=5Fid=20=D0=B8=D0=B7=20CityStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/CityStoreController.php | 6 ++---- ..._alter_table_city_store_add_column_square_store.php | 2 +- erp24/records/CityStore.php | 10 ++-------- erp24/views/city_store/_form.php | 10 ---------- erp24/views/city_store/create.php | 2 -- erp24/views/city_store/update.php | 2 -- erp24/views/city_store/view.php | 1 - 7 files changed, 5 insertions(+), 28 deletions(-) diff --git a/erp24/controllers/CityStoreController.php b/erp24/controllers/CityStoreController.php index 61a4018f..e7531f8f 100644 --- a/erp24/controllers/CityStoreController.php +++ b/erp24/controllers/CityStoreController.php @@ -92,7 +92,7 @@ class CityStoreController extends Controller // Получаем данные для формы $cities = ArrayHelper::map(City::find()->select(['city_name_ru', 'id_city'])->asArray()->all(), 'id_city', 'city_name_ru'); $firms = ArrayHelper::map(Firms::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); - $clusters = ArrayHelper::map(Cluster::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); + $administrators = ArrayHelper::map(Admin::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); $firmsGroups = ArrayHelper::map((new Query())->select(['id', 'name'])->from('firms_group')->all(), 'id', 'name'); @@ -110,7 +110,6 @@ class CityStoreController extends Controller 'model' => $model, 'cities' => $cities, 'firms' => $firms, - 'clusters' => $clusters, 'administrators' => $administrators, 'firmsGroups' => $firmsGroups, ]); @@ -130,7 +129,7 @@ class CityStoreController extends Controller // Получаем данные для формы $cities = ArrayHelper::map(City::find()->select(['city_name_ru', 'id_city'])->asArray()->all(), 'id_city', 'city_name_ru'); $firms = ArrayHelper::map(Firms::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); - $clusters = ArrayHelper::map(Cluster::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); + $administrators = ArrayHelper::map(Admin::find()->select(['id', 'name'])->asArray()->all(), 'id', 'name'); $firmsGroups = ArrayHelper::map((new Query())->select(['id', 'name'])->from('firms_group')->all(), 'id', 'name'); @@ -142,7 +141,6 @@ class CityStoreController extends Controller 'model' => $model, 'cities' => $cities, 'firms' => $firms, - 'clusters' => $clusters, 'administrators' => $administrators, 'firmsGroups' => $firmsGroups, ]); diff --git a/erp24/migrations/m230905_161723_alter_table_city_store_add_column_square_store.php b/erp24/migrations/m230905_161723_alter_table_city_store_add_column_square_store.php index 031ea3de..6a8e7946 100644 --- a/erp24/migrations/m230905_161723_alter_table_city_store_add_column_square_store.php +++ b/erp24/migrations/m230905_161723_alter_table_city_store_add_column_square_store.php @@ -14,7 +14,7 @@ class m230905_161723_alter_table_city_store_add_column_square_store extends Migr */ public function safeUp() { - $this->addColumn(self::TABLE_NAME, 'square_store', $this->integer(100)->null()->after('cluster_id')); + $this->addColumn(self::TABLE_NAME, 'square_store', $this->integer(100)->null()->after('administrator_id')); } /** diff --git a/erp24/records/CityStore.php b/erp24/records/CityStore.php index f5da7e8f..b57b9086 100755 --- a/erp24/records/CityStore.php +++ b/erp24/records/CityStore.php @@ -49,7 +49,6 @@ use Yii; * @property int $visitor_day_avg * @property int $visitor_avg * @property int $administrator_id - * @property int $cluster_id * @property string|null $open_date * @property string $gps GPS координаты магазина */ @@ -112,7 +111,6 @@ class CityStore extends ActiveRecord 'visitor_day_avg', 'visitor_avg', 'administrator_id', - 'cluster_id', 'gps' ], 'required' @@ -134,7 +132,7 @@ class CityStore extends ActiveRecord 'visitor_day_avg', 'visitor_avg', 'administrator_id', - 'cluster_id' + ], 'integer' ], @@ -231,7 +229,6 @@ class CityStore extends ActiveRecord 'visitor_day_avg' => 'Visitor Day Avg', 'visitor_avg' => 'Visitor Avg', 'administrator_id' => 'Administrator ID', - 'cluster_id' => 'Куст', 'open_date' => 'Open Date', 'gps' => 'Gps', ]; @@ -343,10 +340,7 @@ class CityStore extends ActiveRecord return $this->hasOne(City::class, ['id_city' => 'city_id']); } - public function getCluster() - { - return $this->hasOne(Cluster::class, ['id' => 'cluster_id']); - } + public function getAdministrator() { diff --git a/erp24/views/city_store/_form.php b/erp24/views/city_store/_form.php index 305fb1f8..16fae388 100644 --- a/erp24/views/city_store/_form.php +++ b/erp24/views/city_store/_form.php @@ -279,16 +279,6 @@ $this->registerJsFile('/js/city-store/index.js', ['position' => \yii\web\View::P 'pluginOptions' => ['allowClear' => true], ]) ?> - field($model, 'cluster_id') - ->label('ID куста ' . Html::img('@web/images/info-icon.svg', [ - 'alt' => 'Info', - 'style' => 'width: 16px; height: 16px; margin-left:7px; cursor: pointer;', - 'data-toggle' => 'tooltip', 'title' => 'ID куста'])) - ->widget(Select2::class, [ - 'data' => $clusters, - 'options' => ['placeholder' => 'Выберите куст', 'value' => $model->cluster_id ?? 1], - 'pluginOptions' => ['allowClear' => true], - ]) ?> field($model, 'open_date')->textInput(['maxlength' => true, 'value' => '-']) ->label('Дата открытия ' . Html::img('@web/images/info-icon.svg', [ diff --git a/erp24/views/city_store/create.php b/erp24/views/city_store/create.php index a52635be..4d0b47fa 100644 --- a/erp24/views/city_store/create.php +++ b/erp24/views/city_store/create.php @@ -7,7 +7,6 @@ use yii\helpers\Url; /** @var yii_app\records\CityStore $model */ /** @var array $cities */ /** @var array $firms */ -/** @var array $clusters */ /** @var array $administrators */ /** @var array $firmsGroups */ @@ -23,7 +22,6 @@ $this->params['breadcrumbs'][] = $this->title; 'model' => $model, 'cities' => $cities, 'firms' => $firms, - 'clusters' => $clusters, 'administrators' => $administrators, 'firmsGroups' => $firmsGroups, ]) ?> diff --git a/erp24/views/city_store/update.php b/erp24/views/city_store/update.php index 7f0f917a..3d768dc9 100644 --- a/erp24/views/city_store/update.php +++ b/erp24/views/city_store/update.php @@ -7,7 +7,6 @@ use yii\helpers\Url; /** @var yii_app\records\CityStore $model */ /** @var array $cities */ /** @var array $firms */ -/** @var array $clusters */ /** @var array $administrators */ /** @var array $firmsGroups */ @@ -24,7 +23,6 @@ $this->params['breadcrumbs'][] = 'Update'; 'model' => $model, 'cities' => $cities, 'firms' => $firms, - 'clusters' => $clusters, 'administrators' => $administrators, 'firmsGroups' => $firmsGroups, ]) ?> diff --git a/erp24/views/city_store/view.php b/erp24/views/city_store/view.php index 8e08fac3..03ac452b 100644 --- a/erp24/views/city_store/view.php +++ b/erp24/views/city_store/view.php @@ -61,7 +61,6 @@ $this->params['breadcrumbs'][] = $this->title; 'visitor_day_avg', 'visitor_avg', 'administrator_id', - 'cluster_id', 'open_date', 'gps', ], -- 2.39.5