From bf6de24b12c2fea270786ef872d47989e30f8e5a Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 30 Nov 2016 00:22:34 +0200
Subject: [PATCH] add variantSku

---
 models/SeoDynamicLang.php            | 14 +++++++-------
 views/seo-dynamic/_form_language.php | 29 +++++++++++++----------------
 widgets/Seo.php                      | 25 +++++++++++++++++--------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/models/SeoDynamicLang.php b/models/SeoDynamicLang.php
index e433c99..d1fe6b6 100755
--- a/models/SeoDynamicLang.php
+++ b/models/SeoDynamicLang.php
@@ -101,13 +101,13 @@
             return [
                 'seo_dynamic_id'   => Yii::t('app', 'seo_dynamic_id'),
                 'language_id'      => Yii::t('app', 'language_id'),
-                'title'            => Yii::t('app', 'name'),
-                'meta_title'       => Yii::t('app', 'title'),
-                'h1'               => Yii::t('app', 'h1'),
-                'key'              => Yii::t('app', 'key'),
-                'meta'             => Yii::t('app', 'meta'),
-                'meta_description' => Yii::t('app', 'meta_description'),
-                'seo_text'         => Yii::t('app', 'seo_text'),
+                'title'            => 'name',
+                'meta_title'       => 'title',
+                'h1'               => 'h1',
+                'key'              => 'key',
+                'meta'             => 'meta',
+                'meta_description' => 'meta description',
+                'seo_text'         => 'seo text',
             ];
         }
         
diff --git a/views/seo-dynamic/_form_language.php b/views/seo-dynamic/_form_language.php
index 7f5ccaa..868665e 100755
--- a/views/seo-dynamic/_form_language.php
+++ b/views/seo-dynamic/_form_language.php
@@ -13,19 +13,23 @@
      * @var View           $this
      */
 ?>
+
 <?= $form->field($model_lang, '[' . $language->id . ']title')
          ->textInput([ 'maxlength' => true ]); ?>
+
 <?= $form->field($model_lang, '[' . $language->id . ']meta_title')
          ->textInput(); ?>
-<?= $form->field($model_lang, '[' . $language->id . ']meta_description')
-         ->widget(CKEditor::className(), [
-             'editorOptions' => ElFinder::ckeditorOptions('elfinder', [
-                 'preset'               => 'full',
-                 'inline'               => false,
-                 'filebrowserUploadUrl' => Yii::$app->getUrlManager()
-                                                    ->createUrl('file/uploader/images-upload'),
-             ]),
-         ]) ?>
+
+<?= $form->field($model_lang, '[' . $language->id . ']meta_description')->textarea() ?>
+
+<?= $form->field($model_lang, '[' . $language->id . ']key')
+    ->textInput([ 'maxlength' => true ]) ?>
+
+<?= $form->field($model_lang, '[' . $language->id . ']h1')
+    ->textInput([ 'maxlength' => true ]) ?>
+
+<?= $form->field($model_lang, '[' . $language->id . ']meta')
+    ->textInput([ 'maxlength' => true ]) ?>
 
 <?= $form->field($model_lang, '[' . $language->id . ']seo_text')
          ->widget(CKEditor::className(), [
@@ -36,10 +40,3 @@
                                                     ->createUrl('file/uploader/images-upload'),
              ]),
          ]) ?>
-<?= $form->field($model_lang, '[' . $language->id . ']key')
-         ->textInput([ 'maxlength' => true ]) ?>
-<?= $form->field($model_lang, '[' . $language->id . ']h1')
-         ->textInput([ 'maxlength' => true ]) ?>
-
-<?= $form->field($model_lang, '[' . $language->id . ']meta')
-         ->textInput([ 'maxlength' => true ]) ?>
\ No newline at end of file
diff --git a/widgets/Seo.php b/widgets/Seo.php
index db8e18f..9eed985 100755
--- a/widgets/Seo.php
+++ b/widgets/Seo.php
@@ -29,7 +29,7 @@ class Seo extends Widget
 
 
     const SEO_TEXT = 'seo_text';
-    const DESCRIPTION = 'description';
+    const DESCRIPTION = 'meta_description';
     const META = 'meta';
     const H1 = 'h1';
     const TITLE = 'title';
@@ -135,6 +135,7 @@ class Seo extends Widget
 
                 }
 
+
                 if (!empty($title)) {
 
                     return $title;
@@ -253,7 +254,9 @@ class Seo extends Widget
 
     protected function findSeoByDynamic()
     {
-
+//        print_r(\Yii::$app->controller->id);
+//        print_r(\Yii::$app->controller->action->id);
+//        die();
         if(!empty($this->key)){
 
             $query = SeoDynamic::find()->joinWith('seoCategory')->where(['controller' => \Yii::$app->controller->id, 'action' => \Yii::$app->controller->action->id, 'key' => $this->key]);
@@ -282,6 +285,11 @@ class Seo extends Widget
         }
     }
 
+
+    /**
+     * @param $param
+     * @return mixed
+     */
     protected function selectSeoData($param)
     {
 
@@ -294,19 +302,20 @@ class Seo extends Widget
             $result = $widgetData->$param;
 
         } else if (!empty($this->$param)) {
-
-            $result = $this->$param;
-
-        } else {
-
             $widgetData = $this->findSeoByDynamic();
 
             if ($widgetData instanceof SeoDynamic) {
 
-                $result = $widgetData->$param;
+                $result = $widgetData->lang->$param;
 
             }
 
+        } else {
+
+            $result = $this->$param;
+
+
+
         }
 
         return $this->replaceData($result);
--
libgit2 0.21.4