Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 2be06650 2e23f037
Showing 2 changed files with 60 additions and 14 deletions Show diff stats
common/modules/product/models/Export.php
common/modules/product/models/Import.php
@@ -3,6 +3,7 @@
     namespace common\modules\product\models;
     use common\modules\rubrication\models\TaxGroup;
+    use common\modules\rubrication\models\TaxOption;
     use yii\base\Model;
     class Export extends Model
@@ -59,7 +60,7 @@
                                 $list = [
                                     $categories,
                                     !empty($product->brand) ? $product->brand ->name :'',
-                                    $product->name,
+                                    $product->name . '(#' . $product->product_id .'#)',
                                     '',
                                     ( ( !empty( $product->description ) ) ? $product->description : '' ),
                                     $filterString,
@@ -101,14 +102,19 @@
             return $result;
         }
-        
+    
+        /**
+         * @param TaxOption[] $filters
+         *
+         * @return string
+         */
         public function convertFilterToString($filters)
         {
             if(!empty($filters)){
                 $fittersArray = [];
                 foreach($filters as $filter) {
                     if($filter->taxGroup instanceof  TaxGroup){
-                        $fittersArray[ $filter->taxGroup->alias ][] = $filter->value;
+                        $fittersArray[ $filter->taxGroup->alias ][] = $filter->value . '(#' . $filter->alias . '#)';
                     }
                 }
@@ -243,7 +243,6 @@
         public function goProducts($from = 0, $limit = null)
         {
-            
             set_time_limit(0);
             $new_products = $linked_products = 0;
@@ -318,6 +317,12 @@
                     $result_items[] = "Не указано наименование товара (строка $j)";
                     continue;
                 }
+                if (preg_match('/^.+\(#(\d+)#\)$/', trim($product_name), $remote_id)) {
+                    if (!empty( $remote_id[ 1 ] )) {
+                        $remote_id = $remote_id[ 1 ];
+                        $product_name = substr($product_name, 0, strpos($product_name, '(#' . $remote_id . '#)'));
+                    }
+                }
                 // 4  Описание Укр
                 $product_body_uk = $data[ 3 ];
@@ -363,9 +368,16 @@
                 $product_image = explode('=', $data[ 14 ]);
                 $product_image = @$product_image[ 3 ];
-                if (( $_product = Product::find()
-                                         ->filterWhere([ 'name' => trim($product_name) ])
-                                         ->one() ) === null
+                if (!empty( $remote_id )) {
+                    if (( $_product = Product::find()
+                                             ->filterWhere([ 'product_id' => $remote_id ])
+                                             ->one() ) === null
+                    ) {
+                        $_product = new Product();
+                    }
+                } elseif (( $_product = Product::find()
+                                               ->filterWhere([ 'name' => trim($product_name) ])
+                                               ->one() ) === null
                 ) {
                     $_product = new Product();
                 }
@@ -621,26 +633,44 @@
                 $filters_options = explode(',', $filter[ 2 ][ 0 ]);
                 foreach ($filters_options as $filter_options) {
-                    $value = TaxValueString::find()
-                                           ->innerJoinWith('taxOption')
-                                           ->andWhere([ 'value' => $filter_options ])
-                                           ->andWhere([ 'tax_option.tax_group_id' => $taxGroup->tax_group_id ])
-                                           ->one();
+                    $parsed_filter = $this->parseFilter($filter_options);
+                    $value = null;
+                    if ($parsed_filter !== false) {
+                        $value = TaxValueString::find()
+                                               ->innerJoinWith('taxOption')
+                                               ->andWhere([ 'tax_option.alias' => $parsed_filter[ 2 ] ])
+                                               ->andWhere([ 'tax_option.tax_group_id' => $taxGroup->tax_group_id ])
+                                               ->one();
+                    }
                     if (!$value instanceof TaxValueString) {
                         // Create option
                         $option = new TaxOption();
                         $option->tax_group_id = $taxGroup->tax_group_id;
-                        $option->name = $filter_options;
+                        if($parsed_filter !== false) {
+                            $option->name = $parsed_filter[1];
+                            $option->alias = $parsed_filter[2];
+                        } else {
+                            $option->name = $filter_options;
+                        }
                         $option->save();
                         $value = new TaxValueString();
                         $value->tax_option_id = $option->tax_option_id;
-                        $value->value = $filter_options;
+                        $value->value = $option->name;
                         $value->save();
                         $option->default_value = $value->tax_value_id;
                         $option->save();
+                    } else {
+                        if($parsed_filter !== false) {
+                            $value->value = $parsed_filter[1];
+                            $value->taxOption->name = $parsed_filter[1];
+                        } else {
+                            $value->value = $filter_options;
+                            $value->taxOption->name = $filter_options;
+                        }
+                        $value->save();
                     }
                     $options[] = $value->tax_option_id;
@@ -650,4 +680,14 @@
             return $options;
         }
+        
+        private function parseFilter($filter)
+        {
+            $regex = '/^(.+)\(#(.+)#\)$/';
+            if (preg_match($regex, $filter, $result)) {
+                return $result;
+            } else {
+                return false;
+            }
+        }
     }
 \ No newline at end of file