Merge remote-tracking branch 'origin/master'

Yarik
2 parents 2ffeed3d cfcd8d20
Showing 4 changed files with 31 additions and 6 deletions Show diff stats
console/SiteMapController.php
helpers/CatalogFilterHelper.php
helpers/XmlHelper.php
models/ProductFrontendSearch.php
@@ -118,7 +118,7 @@
                     $this->mapNumber++;
                     $this->mainMap .= '<sitemap>'.
-                        '<loc>https://extremstyle.ua/ru/' . $this->fileName . '</loc>'.
+                        '<loc>https://extremstyle.ua/' . $this->fileName . '</loc>'.
                         '<lastmod>' . date('Y-m-d') . '</lastmod>'.
                         '</sitemap>';
@@ -210,11 +210,14 @@
                 $this->createRow($url, 0.7);
             }
-            
+
             foreach ($this->getCategoriesWithFilters() as $category) {
                 foreach ($category->taxGroups as $group) {
-                    if($group->is_filter && ($group->meta_robots != 'noindex,nofollow')){
-                        foreach ($group->taxOptions as $option) {
+                    if($group->meta_robots == 'noindex,nofollow') {
+                        continue;
+                    }
+                    if($group->is_filter){
+                        foreach ($group->options as $option) {
                             $url =  $urlManager->createAbsoluteUrl(
                                 [
                                     'catalog/category',
@@ -226,6 +229,8 @@
                         }
                     }
+
+
                 }
             }
@@ -242,7 +247,7 @@
             fclose($this->handle);
             $this->mainMap .= '<sitemap>'.
-                '<loc>'.$this->getHost(). $this->fileName . '</loc>'.
+                '<loc>'.'https://extremstyle.ua/'. $this->fileName . '</loc>'.
                 '<lastmod>' . date('Y-m-d') . '</lastmod>'.
                 '</sitemap>'.
                 '</sitemapindex>';
@@ -211,7 +211,7 @@ class CatalogFilterHelper extends Object
         $filterQuery = new Query();
-        $filterQuery->source('id');
+        $filterQuery->source('*');
         $filterQuery->from(Catalog::index(), Catalog::type());
         if($in_stock){
             $filterVO['nested']['path'] = 'variants';
+<?php
+    
+    namespace artweb\artbox\ecommerce\helpers;
+    
+    use yii\base\Object;
+    
+    class XmlHelper extends Object
+    {
+        public static function createElement(string $name, string $value = '', array $attributes = [])
+        {
+            $element = '<' . $name;
+            foreach ($attributes as $key => $attribute) {
+                $element .= ' ' . $key . '="' . $attribute . '"';
+            }
+            $element .= '>' . $value . '</' . $name . '>';
+            return $element;
+        }
+    }
 \ No newline at end of file
@@ -101,12 +101,14 @@
             $dataProvider = new ActiveDataProvider(
                 [
                     'query'      => $this->getSearchQuery($category, $params, $in_stock)->distinct()
+                                            ->select(['product.*','product_variant.price','product_lang.title'])
                                          ->with('variant', 'videos','category.lang')
                                          ->groupBy(
                                              [
                                                  'product_lang.title',
                                                  'product_variant.price',
                                                  'product.id',
+                                                 'product_variant.id',
                                              ]
                                          ),
                     'pagination' => [