add variantSku

Administrator
1 parent 68d49205
Showing 1 changed file with 17 additions and 13 deletions Show diff stats
widgets/Seo.php
@@ -66,7 +66,7 @@ class Seo extends Widget
                 if(empty($filter) && empty($sort) && empty($paginate) ){
-                    return $this->prepareString($this->selectSeoData(self::SEO_TEXT));
+                    return $this->prepareString($this->selectSeoData(self::SEO_TEXT,$filter));
                 } else {
@@ -99,7 +99,7 @@ class Seo extends Widget
                 $filter = \Yii::$app->request->get('filters', []);
-                $default = $this->selectSeoData(self::H1);
+                $default = $this->selectSeoData(self::H1, $filter);
                 if ($default != $this->{self::H1}) {
@@ -120,7 +120,8 @@ class Seo extends Widget
                 $filter = \Yii::$app->request->get('filters', []);
-                $title = $this->selectSeoData(self::TITLE);
+                $title = $this->selectSeoData(self::TITLE, $filter);
+
                 if(!empty($filter) &&  $title == $this->{Seo::TITLE} || !empty($filter) && empty($this->{Seo::TITLE})) {
@@ -143,7 +144,10 @@ class Seo extends Widget
                 break;
             case self::DESCRIPTION:
-                $description = $this->selectSeoData(self::DESCRIPTION);
+
+                $filter = \Yii::$app->request->get('filters', []);
+
+                $description = $this->selectSeoData(self::DESCRIPTION, $filter);
                 if (!empty($description)) {
@@ -154,8 +158,6 @@ class Seo extends Widget
                 } else {
-                    $filter = \Yii::$app->request->get('filters', []);
-
                     if(!empty($filter)){
                         $array = $this->arrayBuilder($filter);
                         $this->getView()->registerMetaTag([
@@ -169,12 +171,13 @@ class Seo extends Widget
                 break;
             case self::META:
-                $meta = $this->selectSeoData(self::META);
                 $filter = \Yii::$app->request->get('filters', []);
                 $sort = \Yii::$app->request->get('sort', []);
                 $paginate = \Yii::$app->request->get('page', []);
+                $meta = $this->selectSeoData(self::META, $filter);
+
                 if (!empty($meta) && empty($sort) &&  empty($paginate) && !isset($filter['prices']) ) {
                     $this->getView()->registerMetaTag([
@@ -282,9 +285,10 @@ class Seo extends Widget
     /**
      * @param $param
+     * @param $filter
      * @return mixed
      */
-    protected function selectSeoData($param)
+    protected function selectSeoData($param, $filter)
     {
         $result = '';
@@ -297,7 +301,7 @@ class Seo extends Widget
             $result = $widgetData->$param;
-        }else if(!empty($this->$param)) {
+        }else if(!empty($this->$param) && empty($filter)) {
             $result = $this->$param;
@@ -315,7 +319,7 @@ class Seo extends Widget
         $row = '';
         foreach($array as $name => $field){
-            $row .= $field['name'] .' '.$field['value'].' '  ;
+            $row .= $field['value'].' '  ;
         }
         $template =  preg_replace('/{filter}/',$row,$title);
@@ -329,7 +333,7 @@ class Seo extends Widget
         $row = '';
         foreach($array as $name => $field){
-            $row .= $field['name'] .' '.$field['value'].' '  ;
+            $row .= $field['value'].' '  ;
         }
         $template =  preg_replace('/{filter}/',$row, $description);
@@ -341,9 +345,9 @@ class Seo extends Widget
     public function getNameString($array, $h1){
-        $row = '';
+        $row = ' ';
         foreach($array as $name => $field){
-            $row .= $field['name'] .' '.$field['value'].' '  ;
+            $row .= $field['value'].' '  ;
         }
         $template =  preg_replace('/{filter}/',$row, $h1 );