-

Karnovsky A
1 parent 1aafb42d
Showing 2 changed files with 81 additions and 12 deletions Show diff stats
common/modules/product/models/import.php → common/modules/product/models/Import.php
common/modules/product/models/ProductVariantTypeSearch.php
@@ -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;
+<?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;
+    }
+}