Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents f2d1c773 d5c87d48
Showing 3 changed files with 49 additions and 18 deletions Show diff stats
console/SiteMapController.php
models/Category.php
views/category/_form.php
@@ -4,6 +4,8 @@
     use artweb\artbox\ecommerce\models\Brand;
     use artweb\artbox\ecommerce\models\ProductVariant;
+    use artweb\artbox\language\components\LanguageUrlManager;
+    use artweb\artbox\language\models\Language;
     use artweb\artbox\seo\models\Seo;
     use artweb\artbox\ecommerce\models\Category;
     use Yii;
@@ -27,9 +29,14 @@
         public function getAddStatic()
         {
             return [
-                'https://extremstyle.ua/ru',
+                Yii::$app->urlManager->baseUrl.'/ru',
             ];
         }
+
+
+        public function getHost(){
+            return Yii::$app->urlManager->baseUrl.'/ru';
+        }
         public function getVariants()
         {
@@ -68,6 +75,7 @@
                            ->joinWith('taxGroups.lang')
                            ->with('taxGroups.taxOptions.lang')
                            ->where(['!=', 'tax_group.meta_robots', 'noindex,nofollow' ])
+                           ->where(['tax_group.is_filter'=>true ])
                            ->all();
         }
@@ -121,18 +129,31 @@
         public function actionProcess()
         {
+
+            Language::setCurrent('ru');
+
+
             $config = ArrayHelper::merge(
                 require( \Yii::getAlias('@frontend/config/') . 'main.php' ),
-                require( \Yii::getAlias('@common/config/') . 'main.php' )
+                require( \Yii::getAlias('@common/config/') . 'main.php' ),
+                ['components'=>['urlManager'=>['hostInfo'=>'https://extremstyle.ua']]]
             );
-            
-            Yii::$app->urlManager->addRules($config[ 'components' ][ 'urlManager' ][ 'rules' ]);
+
+            if(isset($config['components']['urlManager']['class'])){
+                unset($config['components']['urlManager']['class']);
+            }
+            //Yii::$app->urlManager = new LanguageUrlManager($config['components']['urlManager']);
+
+            $urlManager =  new LanguageUrlManager($config['components']['urlManager']);
+
             $this->mainMap = '<?xml version="1.0" encoding="UTF-8"?>';
             $this->mainMap .= '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
             $this->fileName = 'sitemap' . $this->mapNumber . '.xml';
             setlocale(LC_ALL, 'ru_RU.CP1251');
             $this->handle = fopen(Yii::getAlias('@frontend') . '/web' . '/' . $this->fileName, "w");
-            
+
+
+
             $this->content = '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
             foreach ($this->getAddStatic() as $page) {
@@ -140,7 +161,7 @@
             }
             foreach ($this->getStaticPages() as $page) {
-                $url = Url::to(
+                $url = $urlManager->createAbsoluteUrl(
                     [
                         'site/page',
                         'slug' => $page->lang->alias,
@@ -150,7 +171,7 @@
             }
             foreach ($this->getCategories() as $category) {
-                $url = Url::to(
+                $url =  $urlManager->createAbsoluteUrl(
                     [
                         'catalog/category',
                         'category' => $category->lang->alias,
@@ -164,7 +185,7 @@
                     if(!preg_match("@^[a-zA-Z\d]+$@i", $row->sku)) {
                         continue;
                     }
-                    $url = Url::to(
+                    $url =  $urlManager->createAbsoluteUrl(
                         [
                             'catalog/product',
                             'product' => $row->product->lang->alias,
@@ -177,7 +198,7 @@
             foreach ($this->getBrands() as $brand) {
-                $url = Url::to(
+                $url = $urlManager->createAbsoluteUrl(
                     [
                         'brand/view',
                         'slug' => $brand->lang->alias,
@@ -190,7 +211,7 @@
             foreach ($this->getCategoriesWithFilters() as $category) {
                 foreach ($category->taxGroups as $group) {
                     foreach ($group->taxOptions as $option) {
-                        $url = Url::to(
+                        $url =  $urlManager->createAbsoluteUrl(
                             [
                                 'catalog/category',
                                 'category' => $category,
@@ -215,7 +236,7 @@
             fclose($this->handle);
             $this->mainMap .= '<sitemap>'.
-                '<loc>https://extremstyle.ua/ru/' . $this->fileName . '</loc>'.
+                '<loc>'.$this->getHost(). $this->fileName . '</loc>'.
                 '<lastmod>' . date('Y-m-d') . '</lastmod>'.
                 '</sitemap>'.
                 '</sitemapindex>';
@@ -19,6 +19,7 @@
      * @todo Write doc for ArtboxTreeBehavior
      * @property integer           $id
      * @property integer           $sort
+     * @property integer           $sort2
      * @property integer           $remote_id
      * @property integer           $parent_id
      * @property string            $path
@@ -68,7 +69,7 @@
             return [
                 'artboxtree' => [
                     'class'        => ArtboxTreeBehavior::className(),
-                    'keyNameGroup' => NULL,
+                    'keyNameGroup' => null,
                     'keyNamePath'  => 'path',
                 ],
                 'language'   => [
@@ -110,6 +111,7 @@
                         'depth',
                         'product_unit_id',
                         'sort',
+                        'sort2',
                     ],
                     'integer',
                 ],
@@ -138,6 +140,7 @@
                 'product_unit_id' => Yii::t('product', 'Product Unit ID'),
                 'remote_id'       => Yii::t('product', 'Remote ID'),
                 'sort'            => Yii::t('product', 'Порядок вывода'),
+                'sort2'           => Yii::t('product', 'Порядок вывода на главной'),
             ];
         }
@@ -212,7 +215,7 @@
         {
             if (parent::beforeSave($insert)) {
-                if (empty($this->parent_id)) {
+                if (empty( $this->parent_id )) {
                     $this->parent_id = 0;
                 }
@@ -39,10 +39,14 @@
              )
              ->label(Yii::t('product', 'Parent category')) ?>
-  <?php
-    echo $form->field($model, 'sort');
-  ?>
-  
+    <?php
+        echo $form->field($model, 'sort');
+    ?>
+    
+    <?php
+        echo $form->field($model, 'sort2');
+    ?>
+    
     <?= $form->field($model, 'image')
              ->widget(
                  \kartik\file\FileInput::className(),
@@ -85,7 +89,10 @@
                              'gif',
                              'png',
                          ],
-                         'initialPreview'        => !empty( $model->getImageUrl(1, false) ) ? ArtboxImageHelper::getImage(
+                         'initialPreview'        => !empty( $model->getImageUrl(
+                             1,
+                             false
+                         ) ) ? ArtboxImageHelper::getImage(
                              $model->getImageUrl(1, false),
                              'list'
                          ) : '',