Yarik / artbox-seo

Commit 4656e4ee39676162c3a6d4d19413bfe6655d2e80

Authored by Administrator
1 parent 68d49205

add variantSku

Showing 1 changed file with 17 additions and 13 deletions   Show diff stats
Inline Side-by-side
widgets/Seo.php
  Show/Hide comments   View file @4656e4e
... ... @@ -66,7 +66,7 @@ class Seo extends Widget
66 66  
67 67 if(empty($filter) && empty($sort) && empty($paginate) ){
68 68  
69   - return $this->prepareString($this->selectSeoData(self::SEO_TEXT));
  69 + return $this->prepareString($this->selectSeoData(self::SEO_TEXT,$filter));
70 70  
71 71 } else {
72 72  
... ... @@ -99,7 +99,7 @@ class Seo extends Widget
99 99  
100 100 $filter = \Yii::$app->request->get('filters', []);
101 101  
102   - $default = $this->selectSeoData(self::H1);
  102 + $default = $this->selectSeoData(self::H1, $filter);
103 103  
104 104 if ($default != $this->{self::H1}) {
105 105  
... ... @@ -120,7 +120,8 @@ class Seo extends Widget
120 120 $filter = \Yii::$app->request->get('filters', []);
121 121  
122 122  
123   - $title = $this->selectSeoData(self::TITLE);
  123 + $title = $this->selectSeoData(self::TITLE, $filter);
  124 +
124 125  
125 126 if(!empty($filter) && $title == $this->{Seo::TITLE} || !empty($filter) && empty($this->{Seo::TITLE})) {
126 127  
... ... @@ -143,7 +144,10 @@ class Seo extends Widget
143 144  
144 145 break;
145 146 case self::DESCRIPTION:
146   - $description = $this->selectSeoData(self::DESCRIPTION);
  147 +
  148 + $filter = \Yii::$app->request->get('filters', []);
  149 +
  150 + $description = $this->selectSeoData(self::DESCRIPTION, $filter);
147 151  
148 152 if (!empty($description)) {
149 153  
... ... @@ -154,8 +158,6 @@ class Seo extends Widget
154 158  
155 159 } else {
156 160  
157   - $filter = \Yii::$app->request->get('filters', []);
158   -
159 161 if(!empty($filter)){
160 162 $array = $this->arrayBuilder($filter);
161 163 $this->getView()->registerMetaTag([
... ... @@ -169,12 +171,13 @@ class Seo extends Widget
169 171 break;
170 172 case self::META:
171 173  
172   - $meta = $this->selectSeoData(self::META);
173 174  
174 175 $filter = \Yii::$app->request->get('filters', []);
175 176 $sort = \Yii::$app->request->get('sort', []);
176 177 $paginate = \Yii::$app->request->get('page', []);
177 178  
  179 + $meta = $this->selectSeoData(self::META, $filter);
  180 +
178 181 if (!empty($meta) && empty($sort) && empty($paginate) && !isset($filter['prices']) ) {
179 182  
180 183 $this->getView()->registerMetaTag([
... ... @@ -282,9 +285,10 @@ class Seo extends Widget
282 285  
283 286 /**
284 287 * @param $param
  288 + * @param $filter
285 289 * @return mixed
286 290 */
287   - protected function selectSeoData($param)
  291 + protected function selectSeoData($param, $filter)
288 292 {
289 293  
290 294 $result = '';
... ... @@ -297,7 +301,7 @@ class Seo extends Widget
297 301  
298 302 $result = $widgetData->$param;
299 303  
300   - }else if(!empty($this->$param)) {
  304 + }else if(!empty($this->$param) && empty($filter)) {
301 305  
302 306 $result = $this->$param;
303 307  
... ... @@ -315,7 +319,7 @@ class Seo extends Widget
315 319  
316 320 $row = '';
317 321 foreach($array as $name => $field){
318   - $row .= $field['name'] .' '.$field['value'].' ' ;
  322 + $row .= $field['value'].' ' ;
319 323 }
320 324  
321 325 $template = preg_replace('/{filter}/',$row,$title);
... ... @@ -329,7 +333,7 @@ class Seo extends Widget
329 333  
330 334 $row = '';
331 335 foreach($array as $name => $field){
332   - $row .= $field['name'] .' '.$field['value'].' ' ;
  336 + $row .= $field['value'].' ' ;
333 337 }
334 338  
335 339 $template = preg_replace('/{filter}/',$row, $description);
... ... @@ -341,9 +345,9 @@ class Seo extends Widget
341 345  
342 346 public function getNameString($array, $h1){
343 347  
344   - $row = '';
  348 + $row = ' ';
345 349 foreach($array as $name => $field){
346   - $row .= $field['name'] .' '.$field['value'].' ' ;
  350 + $row .= $field['value'].' ' ;
347 351 }
348 352  
349 353 $template = preg_replace('/{filter}/',$row, $h1 );
... ...