add DetailsCrosses model

Mihail
1 parent ffd4b834
Showing 5 changed files with 60 additions and 14 deletions Show diff stats
backend/models/Details.php
backend/models/DetailsCrosses.php
common/components/PriceWriter.php
common/components/parsers/CustomConverter.php
common/components/parsers/config.php
@@ -36,7 +36,6 @@ class Details extends BaseActiveRecord
     /**
      * @var bool - признак необходимости удалить префикс Артикула перед вставкой
      */
-    public $delete_prefix = false;
     public $delete_price = false;
     /**
@@ -132,9 +131,6 @@ class Details extends BaseActiveRecord
             //воспользуемся пакетной вставкой от фреймворка
             $query_insert = Yii::$app->db->createCommand()->batchInsert($table_name, $keys_arr, $current_batch_array)->sql;
-            if ($this->delete_prefix) {
-                $query_insert = $this->prepareArticul( $query_insert );
-            }
             // добавим фрагмент с апдейтом при дубляже
             $query = "{$query_insert} {$query_update}";
             // \common\components\CustomVarDamp::dumpAndDie($query);
@@ -142,9 +138,4 @@ class Details extends BaseActiveRecord
         }
     }
-
-    private function prepareArticul( $query_insert ){
-        //CustomVarDamp::dumpAndDie($query_insert);
-        return $query_insert;
-    }
 }
+<?php
+
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%details_crosses}}".
+ *
+ * @property string $ID
+ * @property string $ARTICLE
+ * @property string $BRAND
+ * @property string $CROSS_BRAND
+ * @property string $CROSS_ARTICLE
+ * @property string $timestamp
+ */
+class DetailsCrosses extends \backend\components\base\BaseActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%details_crosses}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['ARTICLE', 'BRAND', 'CROSS_BRAND', 'CROSS_ARTICLE'], 'required'],
+            [['timestamp'], 'safe'],
+            [['ARTICLE', 'BRAND', 'CROSS_BRAND', 'CROSS_ARTICLE'], 'string', 'max' => 100]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'ID' => Yii::t('app', 'ID'),
+            'ARTICLE' => Yii::t('app', 'Article'),
+            'BRAND' => Yii::t('app', 'Brand'),
+            'CROSS_BRAND' => Yii::t('app', 'Cross  Brand'),
+            'CROSS_ARTICLE' => Yii::t('app', 'Cross  Article'),
+            'timestamp' => Yii::t('app', 'Timestamp'),
+        ];
+    }
+}
@@ -66,6 +66,7 @@ class PriceWriter
                 $row['BOX'] = \Yii::$app->multiparser->convertToInteger($row['BOX']);
                 // присвоим полный артикул
                 $row['FULL_ARTICLE'] = $row['ARTICLE'];
+                $row['ARTICLE'] = \Yii::$app->multiparser->convertToArticle( $row );
                 if (isset($row['ADD_BOX']))
                     $row['ADD_BOX'] = \Yii::$app->multiparser->convertToInteger($row['ADD_BOX']);
@@ -125,9 +125,9 @@ class CustomConverter extends Converter
     }
-    public static function convertToArticul(array $row)
+    public static function convertToArticle( array $row )
     {
-        if (isset($row['ARTICLE']) && isset($row['BRAND']) && isset(self::$importer_id)) {
+        if ( isset($row['ARTICLE']) ) {
             // 1. Уберем префикс который разделен пробелом (если он есть)
             $words = explode(" ", $row['ARTICLE']);
@@ -135,7 +135,8 @@ class CustomConverter extends Converter
                 array_shift($words);
                 $row['ARTICLE'] = implode(" ", $words);
             }
-
+        }
+        if( isset( $row['BRAND'] ) && isset( self::$importer_id ) ){
             // 2. Уберем брендовый префикс (если он есть)
             $prefix = '';
             // запрос закешируем
@@ -17,11 +17,11 @@
                      'hasKey' => 1,
                      'configuration' => ["string"   => 'DESCR',
                                          "float"   => 'PRICE',
-                                         "brand"   => 'BRAND',
+                                         "brand"   => 'BRAND[',
                                         "integer"   => ['BOX','ADD_BOX'],
                                         "multiply"   => [],
                                         "details"   => [],
-                                        "articul"   => []
+                                        "article"   => []
                      ]
              ],],