Удалил cluster_id из CityStore

diff --git a/erp24/controllers/CityStoreController.php b/erp24/controllers/CityStoreController.php
index 61a4018f228440f7c9c092e12d6ae3a05ae5eadc..e7531f8f96312e60597f2564236cc9584ba24618 100644 (file)
--- 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 031ea3deb939f786afcb1bbd458c17c74f0488bc..6a8e7946718edb90b017505acbfcd183566635f4 100644 (file)
--- 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 f5da7e8f9ec5955c21e3f7ae151b6b94b0fb6c40..b57b90869971a9994ee3568b4401eb585375496f 100755 (executable)
--- 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 305fb1f8632213a1a57695ac800d684203062d4b..16fae388d7ef40c440908cc47f7cbdc021630d01 100644 (file)
--- 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],
     ]) ?>
 
-    <?= $form->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],
-    ]) ?>
 
     <?= $form->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 a52635bee3fc7b997c9b9718ed2a185b1fa48fa5..4d0b47fac1b4a4248d61fac2ad9d0e639fe8497a 100644 (file)
--- 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 7f0f917a002962116a8ab03f694154846dee3306..3d768dc9c1fc24217b69d3b28cf58784d208ed43 100644 (file)
--- 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 8e08fac3e16e000fae20671da7d31e8e495844ef..03ac452b20e1256ae24dc55f12e73e7021bde633 100644 (file)
--- 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',
         ],