Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/views/layouts/main.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/views/layouts/main.php
Alexey Boroda
2 parents 1396b3a5 ace41b9d
Showing 18 changed files with 21 additions and 32 deletions Show diff stats
common/models/FilterCache.php
common/modules/comment/readme
common/modules/product/models/Export.php
common/modules/product/models/Import.php
common/modules/product/views/manage/export-process.php
common/modules/product/views/manage/export.php
console/controllers/FilterController.php
console/migrations/m161020_145858_product_variant_add_status.php
console/migrations/m161104_094427_filter_cache.php
console/migrations/m170202_140836_add_description_column_to_brand_table.php
console/migrations/yarik/m170302_170344_add_synonym_and_use_in_menu.php
console/migrations/yarik/m170302_173310_add_category_synonym_column.php
frontend/views/layouts/main.php
frontend/web/images/new_img/ico-1.png
frontend/web/images/new_img/ico/ico-19.png
frontend/web/js/filter.js
frontend/web/sitemap_back.xml
frontend/widgets/FilterList.php
@@ -114,7 +114,7 @@
                 $fittersArray = [];
                 foreach($filters as $filter) {
                     if($filter->taxGroup instanceof  TaxGroup){
-                        $fittersArray[ $filter->taxGroup->alias ][] = $filter->value . '(#' . $filter->alias . '#)';
+                        $fittersArray[ $filter->taxGroup->alias ][] = $filter->value;
                     }
  
                 }
@@ -642,44 +642,36 @@
                 $filters_options = explode(',', $filter[ 2 ][ 0 ]);
  
                 foreach ($filters_options as $filter_options) {
-                    $parsed_filter = $this->parseFilter($filter_options);
+//                    $parsed_filter = $this->parseFilter($filter_options);
                     $value = null;
-                    if ($parsed_filter !== false) {
+//                    if ($parsed_filter !== false) {
                         $value = TaxValueString::find()
                                                ->innerJoinWith('taxOption')
-                                               ->andWhere([ 'tax_option.alias' => $parsed_filter[ 2 ] ])
+//                                               ->andWhere([ 'tax_option.alias' => $parsed_filter[ 2 ] ])
+                                                ->andWhere([ 'value' => $filter_options ])
                                                ->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;
-                        if($parsed_filter !== false) {
-                            $option->name = $parsed_filter[1];
-                            $option->alias = $parsed_filter[2];
-                        } else {
+//                        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 = $option->name;
+                        $value->value = $filter_options;
                         $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;
  
@@ -690,13 +682,13 @@
             return $options;
         }
  
-        private function parseFilter($filter)
-        {
-            $regex = '/^(.+)\(#(.+)#\)$/';
-            if (preg_match($regex, $filter, $result)) {
-                return $result;
-            } else {
-                return false;
-            }
-        }
+//        private function parseFilter($filter)
+//        {
+//            $regex = '/^(.+)\(#(.+)#\)$/';
+//            if (preg_match($regex, $filter, $result)) {
+//                return $result;
+//            } else {
+//                return false;
+//            }
+//        }
     }
 \ No newline at end of file
@@ -423,9 +423,6 @@
                                     <li>
                                         <a href="https://www.facebook.com/linija.svitla" class="facebook" target="_blank" rel="nofollow"></a>
                                     </li>
-<!--                                    <li>-->
-<!--                                        <a href="http://vk.com/linija_svitla" class="vkontakte" target="_blank" rel="nofollow"></a>-->
-<!--                                    </li>-->
                                     <li>
                                         <a href="#" class="twitter" target="_blank" rel="nofollow"></a>
                                     </li>