Karnovsky A · Karnovsky A
Showing 6 changed files Show diff stats
common/modules/product/models/Category.php
common/modules/product/models/import.php → common/modules/product/models/Import.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariantTypeSearch.php
common/modules/product/views/manage/import-process.php
console/controllers/ImportController.php
@@ -8,6 +8,7 @@ use common\components\artboxtree\ArtboxTreeHelper;
 use common\modules\relation\relationBehavior;
 use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
 use Yii;
+use yii\base\ErrorException;
 /**
  * This is the model class for table "category".
@@ -28,6 +29,7 @@ use Yii;
  * @property boolean $populary
  *
  * @property CategoryName $categoryName
+ * @property Product[] $products
  * @property ProductUnit $productUnit
  * @property CategoryName[] $categoryNames
  * @property ProductCategory[] $productCategories
@@ -203,4 +205,12 @@ class Category extends \yii\db\ActiveRecord
         }
         return false;
     }
+
+    public function beforeDelete()
+    {
+        if ( ($count = $this->getProducts()->count()) > 0) {
+            throw new ErrorException('С категорией "'. $this->name .'" связанно <strong>'. $count .'</strong> товаров. Удаление невозможно.');
+            return false;
+        }
+    }
 }
@@ -63,8 +63,7 @@ class Import extends Model {
             return FALSE;
         }
-        $filesize = filesize(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts'));
-
+        $filesize = filesize(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'));
         if ($from) {
             fseek($handle, $from);
         }
@@ -97,28 +96,29 @@ class Import extends Model {
             // товары в пути
             if (empty ($city_name))
             {
-                $this->saveNotFoundRecord (
-                    [$modification_code, $product_title],
-                    Yii::getAlias('@uploadFilePricesAway')
-                );
+//                $this->saveNotFoundRecord (
+//                    [$modification_code, $product_title],
+//                    Yii::getAlias('@uploadFilePricesAway')
+//                );
                 $this->output[] = 'Товар '. $product_title . ' в пути';
                 continue;
             }
-            if ( ($productVariant = ProductVariant::find()->filterWhere(['sku' => trim($modification_code)])->one()) === null ) {
+            if ( ($productVariant = ProductVariant::find()->filterWhere(['sku' => $modification_code])->one()) === null ) {
                 // 'Нет даной модификации в базе';
-                $this->saveNotFoundRecord (
-                    [$modification_code, $product_title],
-                    Yii::getAlias('@uploadFilePricesNoVariant')
-                );
+//                $this->saveNotFoundRecord (
+//                    [$modification_code, $product_title],
+//                    Yii::getAlias('@uploadFilePricesNoVariant')
+//                );
                 $this->output[] = 'Для товара '. $product_title . ' не найдено соотвествие';
                 continue;
             }
+
             $quantity = 0;
             // ===== Set stock ====
@@ -161,7 +161,6 @@ class Import extends Model {
         if ($result['end']) {
             unlink(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'));
-            $this->output[] = '<font style="color:green; font-weight: bold">Импорт цен успешно завершен!</font>';
         }
         return $result;
@@ -233,7 +233,20 @@ class Product extends \yii\db\ActiveRecord
     public function getOptions() {
         return $this->hasMany(TaxOption::className(), ['tax_option_id' => 'option_id'])->viaTable('product_option', ['product_id' => 'product_id']);
-//        return $this->getRelations('product_option');
+    }
+
+    public function getProperties() {
+        $groups = $options = [];
+        foreach ($this->options as $option) {
+            $options[$option->tax_group_id][] = $option;
+        }
+        foreach (TaxGroup::find()->where(['tax_group_id' => array_keys($options)])->all() as $group) {
+            if (!empty($options[$group->tax_group_id])) {
+                $group->_options = $options[$group->tax_group_id];
+                $groups[] = $group;
+            }
+        }
+        return $groups;
     }
     public function getStocks() {
@@ -374,18 +387,4 @@ class Product extends \yii\db\ActiveRecord
         }
         return $op;
     }
-
-    public function getProperties() {
-        $groups = $options = [];
-        foreach ($this->options as $option) {
-            $options[$option->tax_group_id][] = $option;
-        }
-        foreach (TaxGroup::find()->where(['tax_group_id' => array_keys($options)])->all() as $group) {
-            if (!empty($options[$group->tax_group_id])) {
-                $group->_options = $options[$group->tax_group_id];
-                $groups[] = $group;
-            }
-        }
-        return $groups;
-    }
 }
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\modules\product\models\ProductVariantType;
+
+/**
+ * ProductVariantTypeSearch represents the model behind the search form about `common\modules\product\models\ProductVariantType`.
+ */
+class ProductVariantTypeSearch extends ProductVariantType
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['product_variant_type_id'], 'integer'],
+            [['name', 'name2'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = ProductVariantType::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'product_variant_type_id' => $this->product_variant_type_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'name2', $this->name2]);
+
+        return $dataProvider;
+    }
+}
@@ -17,8 +17,6 @@ $this-&gt;registerJs(&quot;
         doImport();
-//        $('ul#process-result').prepend('<li style="color: green; font-weight: bold">Импорт завершен</li>');
-
         function doImport(from) {
             from = typeof(from) != 'undefined' ? from : 0;
             console.log('go', from);
@@ -35,7 +33,6 @@ $this-&gt;registerJs(&quot;
                     var per = Math.round(100*data.from/data.totalsize)+'%';
                     $('#progressbar div').css({width: per});
-//                    $('#progressbar .ui-progressbar-value').html(per);
                     if(data != false && !data.end)
                     {
@@ -43,6 +40,7 @@ $this-&gt;registerJs(&quot;
                     }
                     else
                     {
+                        $('ul#process-result').prepend('<li>Импорт цен успешно завершен!</li>');
                         progressbar.hide('fast');
                         in_process = false;
                     }
@@ -62,7 +60,7 @@ $this-&gt;registerJs(&quot;
     <?= \yii\jui\ProgressBar::widget([
         'clientOptions' => [
             'value' => 100,
-            'label' => 'ddd'
+            'label' => ''
         ],
         'options' => [
             'id' => 'progressbar'
@@ -23,23 +23,35 @@ class ImportController extends Controller {
     private function getProductsFile($file_type = 'uploadFileProducts') {
         $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@'. $file_type);
         if (!is_file($filename)) {
-            $this->stderr("File $filename not found");
-            return FALSE;
+            $this->stderr('Task already executed');
+            return Controller::EXIT_CODE_ERROR;
         }
         return fopen ($filename, 'r');
     }
     public function actionProducts() {
+        if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
+            $this->errors[] = 'Task already executed';
+            return Controller::EXIT_CODE_ERROR;
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
+        fclose($ff);
         $model = new Import();
         $data = $model->goProducts(0, null);
-
+        unlink(Yii::getAlias('@uploadDir/goProducts.lock'));
         return Controller::EXIT_CODE_NORMAL;
     }
     public function actionPrices() {
+        if (file_exists(Yii::getAlias('@uploadDir/goPrices.lock'))) {
+            $this->stderr('Task already executed');
+            return Controller::EXIT_CODE_ERROR;
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goPrices.lock'), 'w+');
+        fclose($ff);
         $model = new Import();
         $data = $model->goPrices(0, null);
-
+        unlink(Yii::getAlias('@uploadDir/goPrices.lock'));
         return Controller::EXIT_CODE_NORMAL;
     }