test

Yarik
1 parent cd3dad5c
Showing 33 changed files with 81 additions and 1661 deletions Show diff stats
common/models/OptionHelper.php
console/migrations/m130524_201442_init.php
frontend/assets/AppAsset.php
frontend/controllers/OptionController.php
frontend/controllers/OptionValuesController.php
frontend/controllers/OptionsController.php
frontend/models/Option.php
frontend/models/OptionLang.php
frontend/models/OptionLangSearch.php
frontend/models/OptionSearch.php
frontend/models/OptionValues.php
frontend/models/OptionValuesSearch.php
frontend/models/Options.php
frontend/models/OptionsSearch.php
frontend/views/option-values/_form.php
frontend/views/option-values/_search.php
frontend/views/option-values/create.php
frontend/views/option-values/index.php
frontend/views/option-values/update.php
frontend/views/option-values/view.php
@@ -14,7 +14,7 @@ class OptionHelper extends Model
     const OPTION_VALUE = 3;
     public function getRule($return = 3)
     {
-        $result = Options::find()->where(['name' => 'rules'])->with('value');
+        $result = Option::find()->where(['name' => 'rules'])->with('value');
         if($return == self::OPTION_OBJECT) {
             return $result->one();
         } elseif($return == self::OPTION_ARRAY) {
@@ -16,6 +16,9 @@ class m130524_201442_init extends Migration
         $this->createTable('{{%user}}', [
             'id' => $this->primaryKey(),
             'username' => $this->string()->notNull()->unique(),
+            'lastname' => $this->string(),
+            'firstname' => $this->string(),
+            'middlename' => $this->string(),
             'auth_key' => $this->string(32)->notNull(),
             'password_hash' => $this->string()->notNull(),
             'password_reset_token' => $this->string()->unique(),
@@ -25,6 +28,19 @@ class m130524_201442_init extends Migration
             'created_at' => $this->integer()->notNull(),
             'updated_at' => $this->integer()->notNull(),
         ], $tableOptions);
+
+        $this->insert('{{%user}}', [
+            'username' => 'admin', 
+            'lastname' => 'admin', 
+            'firstname' => 'admin', 
+            'middlename' => '', 
+            'auth_key' => 'SlJ315le5enaDJ4OsdvXX83i_drf-JXl', 
+            'password_hash' => '$2y$13$LfYpoaZkKzniNw/7rySAnOVPHy8wKFFznxBVoAWTnbLv/Di0oXqvi',
+            'password_reset_token' => 'NULL',
+            'email' => 'admin@admin.com',
+            'created_at' => '1',
+            'updated_at' => '1',
+        ]);
     }
  
     public function down()
@@ -26,7 +26,8 @@ class AppAsset extends AssetBundle
         'js/markerclusterer.js',
         'js/jquery.scrollbox.min.js',
         'js/slider.js',
-        'js/jquery.rating.js'
+        'js/jquery.rating.js',
+        '/admin/js/option.js'
     ];
     public $depends = [
         'yii\web\YiiAsset',
@@ -3,12 +3,11 @@
 namespace frontend\controllers;
  
 use Yii;
-use frontend\models\Option;
-use frontend\models\OptionSearch;
+use common\models\Option;
+use common\models\OptionSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use frontend\models\OptionLang;
  
 /**
  * OptionController implements the CRUD actions for Option model.
@@ -61,14 +60,17 @@ class OptionController extends Controller
      */
     public function actionCreate()
     {
-        $form[0] = Option::create(\Yii::$app->request->post(), 'User', 10, [['name' => 'phone', 'template' => 'text', 'translate' => true], ['name' => 'adres', 'template' => 'text', 'translate' => false]], true);
-        if($form[0]['success'] == false) {
-            return $this->render('create', ['forms' => $form]);
+        $model = new Option();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->option_id]);
         } else {
-            return $this->redirect(['index']);
+            return $this->render('create', [
+                'model' => $model,
+            ]);
         }
     }
-    
+
     /**
      * Updates an existing Option model.
      * If update is successful, the browser will be redirected to the 'view' page.
@@ -77,11 +79,14 @@ class OptionController extends Controller
      */
     public function actionUpdate($id)
     {
-        $form[0] = Option::change($id, \Yii::$app->request->post(), 'User', 10);
-        if($form[0]['success'] == false) {
-            return $this->render('update', ['forms' => $form]);
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->option_id]);
         } else {
-            return $this->redirect(['view', 'id' => $id]);
+            return $this->render('update', [
+                'model' => $model,
+            ]);
         }
     }
  
@@ -93,23 +98,7 @@ class OptionController extends Controller
      */
     public function actionDelete($id)
     {
-        $model = $this->findModel($id);
-        $children = $model->hasMany(Option::className(), ['parent_id' => 'option_id'])->all();
-        $langs = array();
-        if(!empty($children)) {
-            foreach($children as $child) {
-                $langs = OptionLang::findAll(['id' => $child->option_id]);
-                foreach($langs as $lang) {
-                    $lang->delete();
-                }
-                $child->delete();
-            }
-        }
-        $langs = OptionLang::findAll(['id' => $id]);
-        foreach($langs as $lang) {
-            $lang->delete();
-        }
-        $model->delete();
+        $this->findModel($id)->delete();
  
         return $this->redirect(['index']);
     }
-<?php
-
-namespace frontend\controllers;
-
-use Yii;
-use frontend\models\OptionValues;
-use frontend\models\OptionValuesSearch;
-use yii\web\Controller;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-
-/**
- * OptionValuesController implements the CRUD actions for OptionValues model.
- */
-class OptionValuesController extends Controller
-{
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * Lists all OptionValues models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new OptionValuesSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
-
-    /**
-     * Displays a single OptionValues model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-
-    /**
-     * Creates a new OptionValues model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $post = \Yii::$app->request->post();
-        if(is_array($post['OptionValues']['option_value_text'])) {
-            $ok = 0;
-            $first = 0;
-            $id = 0;
-            $models = array();
-            foreach($post['OptionValues']['option_value_text'] as $lang => $value) {
-                $models[$lang] = new OptionValues();
-                $models[$lang]->load(Yii::$app->request->post());
-                $models[$lang]->option_language_id = $lang;
-                $models[$lang]->option_value_text = $value;
-                if($first && $id) {
-                    $models[$lang]->option_value_parent = $id;
-                }
-                if($models[$lang]->save()) {
-                    $ok = 1;
-                    if(!$first) {
-                        $first = 1;
-                        $id = $models[$lang]->option_value_id;
-                    }
-                } else {
-                    unset($models[$lang]);
-                }
-            }
-            if($ok) {
-                return $this->redirect(['view', 'id' => $id]);
-            }
-        }
-        $model = new OptionValues();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->option_value_id]);
-        } else {
-            return $this->render('create', [
-               'model' => $model,
-            ]);
-        }   
-    }
-
-    /**
-     * Updates an existing OptionValues model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->option_value_id]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing OptionValues model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-
-    /**
-     * Finds the OptionValues model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return OptionValues the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = OptionValues::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-}
-<?php
-
-namespace frontend\controllers;
-
-use Yii;
-use frontend\models\Options;
-use frontend\models\OptionsSearch;
-use yii\web\Controller;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-
-/**
- * OptionsController implements the CRUD actions for Options model.
- */
-class OptionsController extends Controller
-{
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * Lists all Options models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new OptionsSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
-
-    /**
-     * Displays a single Options model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-
-    /**
-     * Creates a new Options model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new Options();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->option_id]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Updates an existing Options model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->option_id]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Options model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-
-    /**
-     * Finds the Options model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return Options the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = Options::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-
-/**
- * This is the model class for table "option".
- *
- * @property integer $option_id
- * @property string $model
- * @property integer $model_id
- * @property string $name
- * @property string $template
- * @property integer $parent_id
- */
-class Option extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'option';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['model', 'model_id', 'name', 'template'], 'required'],
-            [['model_id', 'option_pid'], 'integer'],
-            [['model', 'name', 'template'], 'string', 'max' => 200]
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'option_id' => Yii::t('app', 'Option ID'),
-            'model' => Yii::t('app', 'Model'),
-            'model_id' => Yii::t('app', 'Model ID'),
-            'name' => Yii::t('app', 'Name'),
-            'template' => Yii::t('app', 'Template'),
-            'option_pid' => Yii::t('app', 'Parent ID'),
-            'date_add' => Yii::t('app', 'Date created'),
-            'translate' => Yii::t('app', 'Translatable'),
-        ];
-    }
-    
-    public function getLangs() {
-        return (new Language())->find()->where(['>', 'language_id', 0])->andWhere(['status' => 1])->asArray()->all();
-    }
-    
-    public static function change($id, $post, $modeldb, $model_id) {
-        $models[$id] = Option::findOne($id);
-        $modellang[$id] = array();
-        $langs = OptionLang::findAll(['option_language_id' => $id]);
-        foreach($langs as $lang) {
-            $modellang[$id][$lang->language_id] = $lang;
-        }
-        $children = (new Option())->find()->where(['option_pid' => $id])->all();
-        foreach($children as $child) {
-            $models[$child->option_id] = $child;
-            $modellang[$child->option_id] = array();
-            $langs = OptionLang::findAll(['option_id' =>$child->option_id]);
-            foreach($langs as $lang) {
-                $modellang[$child->option_id][$lang->language_id] = $lang;
-            }
-        }
-        $ok = 1;
-        if(!empty($post)) {
-            foreach($post['Option'] as $key => $option) {
-                if(in_array($key, array('model', 'model_id'))) { continue; }
-                if(empty($option['value'][$models[$key]->name]) && !empty($option['lang'])) {
-                    foreach($option['lang'] as $language_id => $lang) {
-                        if(!empty($lang)) {
-                            $option['value'][$models[$key]->name] = $lang;
-                            break;
-                        }
-                    }
-                }
-                $modellang[$key][0]->value = $option['value'][$models[$key]->name];
-                if(empty($modellang[$key][0]->value) || !$modellang[$key][0]->save()) {
-                    $ok = 0;
-                    $models[$key]->addError('value', 'Value must be set');
-                    $modellang[$key][0]->addError('value', 'Value must be set');
-                }
-                if(!empty($option['lang'])) {
-                    foreach($option['lang'] as $language_id => $lang) {
-                        if(empty($modellang[$key][$language_id])) {
-                            $modellang[$key][$language_id] = new OptionLang();
-                            $modellang[$key][$language_id]->option_id = $models[$key]->option_id;
-                            $modellang[$key][$language_id]->language_id = $language_id;
-                            $modellang[$key][$language_id]->value = $lang;
-                        } else {
-                            $modellang[$key][$language_id]->value = $lang;
-                        }
-                        if(!$modellang[$key][$language_id]->save()) {
-                            $ok = 0;
-                        }
-                    }
-                }
-            }
-            if($ok) {
-                return array('id' => $id, 'models' => $models, 'modelslang' => $modelslang, 'success' => true);
-            } else {
-                return array(
-                    'models' => $models,
-                    'modellang' => $modellang,
-                    'modeldb' => $modeldb,
-                    'model_id' => $model_id,
-                    'success' => false
-                );
-            }
-        }
-        return array(
-            'models' => $models,
-            'modellang' => $modellang,
-            'modeldb' => $modeldb,
-            'model_id' => $model_id,
-            'success' => false
-        );
-    }
-
-    public static function create($post, $modeldb, $model_id, $fields, $multiple) {
-    	$multiple = boolval($multiple);
-        $model = new Option();
-        $modellang = new OptionLang();
-        if(!empty($post['Option'])) {
-            $ok = 1;
-            $parentid = null;
-            $models = array();
-            foreach($post['Option'] as $index => $option) {
-                if(in_array($index, array('model', 'model_id')) && $index !== 0) { continue; }
-                $first = 1;
-                foreach($option['value'] as $key => $value) {
-                    $models[$index][$key] = new Option();
-                    $models[$index][$key]->model = $post['Option']['model'];
-                    $models[$index][$key]->model_id = $post['Option']['model_id'];
-                    $models[$index][$key]->template = $option[$key]['template'];
-                    $models[$index][$key]->translate = $option[$key]['translate']?1:0;
-                    $models[$index][$key]->name = $key;
-                    if(!$first) {
-                        $models[$index][$key]->option_pid = $parentid;
-                    }
-                    $modelslang[$index][$key][0] = new OptionLang();
-                    if(!empty($option['lang'][$key])) {
-                        foreach($option['lang'][$key] as $code => $lang) {
-                            if(!empty($lang)) {
-                                $value = $lang;
-                                break;
-                            }
-                        }
-                    }
-                    if(!empty($value) && $models[$index][$key]->save()) {
-                        if($first) {
-                            $parentid = $models[$index][$key]->option_id;
-                        }
-                        $modelslang[$index][$key][0]->option_id = $models[$index][$key]->option_id;
-                        $modelslang[$index][$key][0]->language_id = 0;
-                        $modelslang[$index][$key][0]->value = $value;
-                        if($modelslang[$index][$key][0]->save()) {
-                            if(!empty($option['lang'][$key])) {
-                                foreach($option['lang'][$key] as $code => $lang) {
-                                    if(!empty($lang)) {
-                                        $modelslang[$index][$key][$code] = new OptionLang();
-                                        $modelslang[$index][$key][$code]->option_id = $models[$index][$key]->option_id;
-                                        $modelslang[$index][$key][$code]->language_id = $code;
-                                        $modelslang[$index][$key][$code]->value = $lang;
-                                        if(!$modelslang[$index][$key][$code]->save()) {
-                                            $ok = 0;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        $models[$index][$key]->validate();
-                        $modelslang[$index][$key][0]->validate();
-                        $modelslang[$index][$key][0]->addError('value', 'Value must be set');
-                        if(!empty($option['lang'][$key])) {
-                            foreach($option['lang'][$key] as $code => $lang) {
-                                if(!empty($lang)) {
-                                    $modelslang[$index][$key][$code] = new OptionLang();
-                                    $modelslang[$index][$key][$code]->option_id = $models[$index][$key]->option_id;
-                                    $modelslang[$index][$key][$code]->language_id = $code;
-                                    $modelslang[$index][$key][$code]->value = $lang;
-                                }
-                            }
-                        }
-                        $ok = 0;
-                    }
-                    $first = 0;
-                }
-            }
-            if($ok) {
-            	if($modeldb == 'Feedback') {
-            		$newflag = new Option();
-            		$newflag->model = $modeldb;
-            		$newflag->model_id = $model_id;
-            		$newflag->name = 'is_new';
-            		$newflag->template = 'checkbox';
-            		$newflag->option_pid = $parentid;
-            		$newflag->translate = 0;
-            		if($newflag->save()) {
-            			$newflaglang = new OptionLang();
-            			$newflaglang->option_id = $newflag->option_id;
-            			$newflaglang->language_id = 0;
-            			$newflaglang->value = '1';
-            			if(!$newflaglang->save()) {
-            				$newflag->delete();
-            			}
-            		}
-            	}
-                return array('models' => $models, 'modelslang' => $modelslang, 'success' => true);
-            } else {
-                return array(
-                    'models' => $models,
-                    'modellang' => $modelslang,
-                    'modeldb' => $modeldb,
-                    'model_id' => $model_id,
-                    'fields' => $fields,
-                    'success' => false,
-                	'multiple' => $multiple
-                );
-            }
-        } else {
-            return array(
-                'model' => $model,
-                'modeldb' => $modeldb,
-                'model_id' => $model_id,
-                'fields' => $fields,
-                'success' => false,
-            	'multiple' => $multiple
-            );
-        }
-    }
-    
-    public function getOptions() {
-    	return $this->hasMany(Option::className(), ['option_pid' => 'option_id'])->indexBy('name');
-    }
-    
-    public function getOption() {
-    	return $this->hasOne(Option::className(), ['option_id' => 'option_pid']);
-    }
-    
-    public function getOptionLangs() {
-    	return $this->hasMany(OptionLang::className(), ['option_id' => 'option_id']);
-    }
-    
-    public function getOptionDefaultLang($array = false) {
-    	$query = $this->getOptionLangs()->where(['language_id' => 0]);
-    	if($array) {
-    		$query->asArray();
-    	}
-    	return $query->one();
-    }
-    
-    public static function markOld($id) {
-    	$model = Option::findOne($id);
-    	$is_new = $model->getOptions()->where(['name' => 'is_new'])->one();
-    	if(empty($is_new)) return false;
-    	$is_newlang = $is_new->getOptionDefaultLang();
-    	$is_newlang->value = '0';
-    	if($is_newlang->save()) {
-    		return true;
-    	} else {
-    		return false;
-    	}
-    }
-    
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-
-/**
- * This is the model class for table "option_lang".
- *
- * @property integer $id
- * @property integer $language_id
- * @property string $value
- */
-class OptionLang extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'option_lang';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_id', 'language_id'], 'required'],
-            [['option_id', 'language_id'], 'integer'],
-            [['value'], 'string']
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'option_id' => Yii::t('app', 'ID'),
-            'language_id' => Yii::t('app', 'Lang ID'),
-            'value' => Yii::t('app', 'Value'),
-        ];
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use frontend\models\OptionLang;
-
-/**
- * OptionLangSearch represents the model behind the search form about `frontend\models\OptionLang`.
- */
-class OptionLangSearch extends OptionLang
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_language_id', 'option_id', 'language_id'], 'integer'],
-            [['value'], 'safe'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
-    /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
-     */
-    public function search($params)
-    {
-        $query = OptionLang::find();
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
-        }
-
-        $query->andFilterWhere([
-            'option_language_id' => $this->option_language_id,
-            'option_id' => $this->option_id,
-            'language_id' => $this->language_id,
-        ]);
-
-        $query->andFilterWhere(['like', 'value', $this->value]);
-
-        return $dataProvider;
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use frontend\models\Option;
-
-/**
- * OptionSearch represents the model behind the search form about `frontend\models\Option`.
- */
-class OptionSearch extends Option
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_id', 'model_id', 'option_pid'], 'integer'],
-            [['model', 'name', 'template'], 'safe'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
-    /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
-     */
-    public function search($params)
-    {
-        $query = Option::find();
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-		$data = [
-			'OptionSearch' => [
-				'model' => 'Main'
-			]
-		];
-		
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
-        }
-        
-        $query->andWhere(['option_pid' => null]);
-        
-        $query->andFilterWhere([
-            'option_id' => $this->option_id,
-            'model_id' => $this->model_id,
-            'option_pid' => $this->option_pid,
-        ]);
-		
-        $query->andFilterWhere(['like', 'model', $this->model])
-            ->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'template', $this->template]);
-        
-
-        return $dataProvider;
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-
-/**
- * This is the model class for table "option_values".
- *
- * @property integer $option_value_id
- * @property string $option_key
- * @property string $option_value_text
- * @property integer $option_language_id
- * @property integer $option_value_parent
- * @property integer $option_user
- *
- * @property Language $optionLang
- */
-class OptionValues extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'option_values';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_key', 'option_value_text'], 'required'],
-            [['option_language_id', 'option_value_parent', 'option_user'], 'integer'],
-            [['option_key'], 'string', 'max' => 200]
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'option_value_id' => Yii::t('app', 'Option Value ID'),
-            'option_key' => Yii::t('app', 'Option Key'),
-            'option_value_text' => Yii::t('app', 'Option Value Text'),
-            'option_language_id' => Yii::t('app', 'Option Lang ID'),
-            'option_value_parent' => Yii::t('app', 'Option Value Parent'),
-            'option_user' => Yii::t('app', 'Option User'),
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getOptionLang()
-    {
-        return $this->hasOne(Language::className(), ['language_id' => 'option_language_id']);
-    }
-    public function getLanguages() {
-        return (new LanguageLang())->find()->orderBy('language_id ASC')->asArray()->all();
-    }
-    public function getLanguagesCodes() {
-        return (new Language())->find()->orderBy('language_id ASC')->asArray()->all();
-    }
-    public function getDropDownArray() {
-        $langs = array();
-        foreach($this->getLanguages() as $lang) {
-            $langs[$lang['language_id']] = $lang['lang_title'];
-        }
-        return $langs;
-    }
-    public function beforeSave($insert) {
-        if (parent::beforeSave($insert)) {
-            $this->option_user = \Yii::$app->user->getId();
-            if($this->option_value_parent == 0) {
-                unset($this->option_value_parent);
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-    public function getUserOptions() {
-        return (new OptionValues())->find()->where('option_user=:user')->addParams([':user' => \Yii::$app->user->getID()])->andWhere(['not', ['option_user' => null]])->asArray()->all();
-    }
-    public function getUserOptionsArray() {
-        $options = array('0' => Yii::t('app', 'Default Parent'));
-        foreach($this->getUserOptions() as $option) {
-            $options[$option['option_value_id']] = $option['option_key'].' - '.$option['option_value_text'];
-        }
-        return $options;
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use frontend\models\OptionValues;
-
-/**
- * OptionValuesSearch represents the model behind the search form about `frontend\models\OptionValues`.
- */
-class OptionValuesSearch extends OptionValues
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_value_id', 'option_language_id', 'option_value_parent', 'option_user'], 'integer'],
-            [['option_key', 'option_value_text'], 'safe'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
-    /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
-     */
-    public function search($params)
-    {
-        $query = OptionValues::find();
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
-        }
-
-        $query->andFilterWhere([
-            'option_value_id' => $this->option_value_id,
-            'option_language_id' => $this->option_language_id,
-            'option_value_parent' => $this->option_value_parent,
-            'option_user' => $this->option_user,
-        ]);
-
-        $query->andFilterWhere(['like', 'option_key', $this->option_key])
-            ->andFilterWhere(['like', 'option_value_text', $this->option_value_text]);
-
-        return $dataProvider;
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-
-/**
- * This is the model class for table "option".
- *
- * @property integer $option_id
- * @property string $option_key
- * @property integer $option_parent
- * @property integer $option_translatable
- * @property string $option_format
- *
- * @property OptionValues[] $optionValues
- * @property Options $optionParent
- * @property Options[] $options
- */
-class Options extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName ()
-    {
-        return 'option';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules ()
-    {
-        return [
-            [['option_key'], 'required'], [['option_parent', 'option_translatable'], 'integer'], [['option_key', 'option_format'], 'string', 'max' => 200]
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels ()
-    {
-        return [
-            'option_id' => Yii::t ('app', 'Option ID'), 'option_key' => Yii::t ('app', 'Option Key'), 'option_parent' => Yii::t ('app', 'Option Parent'), 'option_translatable' => Yii::t ('app', 'Option Translatable'), 'option_format' => Yii::t ('app', 'Option Format'),
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getOptionLang ()
-    {
-        return $this->hasMany (OptionLang::className (), ['option_id' => 'option_id']);
-    }
-
-    public function getValue ()
-    {
-        return $this->hasOne(OptionLang::className(), ['option_id' => 'option_id'])->where(['option_lang.language_id' => '0']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getOptionParent()
-    {
-        return $this->hasOne(Options::className(), ['option_id' => 'option_parent']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getOptions()
-    {
-        return $this->hasMany(Options::className(), ['option_parent' => 'option_id']);
-    }
-}
-<?php
-
-namespace frontend\models;
-
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use frontend\models\Options;
-
-/**
- * OptionsSearch represents the model behind the search form about `frontend\models\Options`.
- */
-class OptionsSearch extends Options
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['option_id', 'option_parent', 'option_translatable'], 'integer'],
-            [['option_key', 'option_format'], 'safe'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
-    /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
-     */
-    public function search($params)
-    {
-        $query = Options::find();
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
-        }
-
-        $query->andFilterWhere([
-            'option_id' => $this->option_id,
-            'option_parent' => $this->option_parent,
-            'option_translatable' => $this->option_translatable,
-        ]);
-
-        $query->andFilterWhere(['like', 'option_key', $this->option_key])
-            ->andFilterWhere(['like', 'option_format', $this->option_format]);
-
-        return $dataProvider;
-    }
-}
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionValues */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="option-values-form">
-	
-    <?php $form = ActiveForm::begin(); ?>
-
-    <?= $form->field($model, 'option_key')->textInput(['maxlength' => true]) ?>
-	
-	<div class="optionvalues-option_value_text-active">
-	<?= $form->field($model, 'option_value_text', ['enableClientValidation' => false])->label($model->getAttributeLabel('option_key').' | <span class="glyphicon glyphicon-globe add-langs"></span>')->textInput() ?>
-
-    <?= $form->field($model, 'option_language_id')->dropDownList($model->getDropDownArray()) ?>
-    </div>
-
-    <?= $form->field($model, 'option_value_parent')->dropDownList($model->getUserOptionsArray()) ?>
-
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>
-<div class="reserved_inputs">
-    <div class="lang-inputs form-group optionvalues-option_value_text-lang">
-    	<label for="OptionValues[option_value_text][0]" class="col-xs-12 optionvalues-option_value_text" data-group="optionvalues-option_value_text"><?php echo $model->getAttributeLabel('option_key'); ?> | <span class="glyphicon glyphicon-globe remove-langs"></span></label>
-    	<?php foreach($model->getLanguagesCodes() as $lang) {
-    	   ?>
-    	   <div class="col-xs-1 text-right"><span><?=$lang['lang_code']?></span></div>
-    	   <div class="col-xs-11"><input type="text" id="optionvalues-<?=$lang['lang_code']?>-option_value_text" class="form-control" name="OptionValues[option_value_text][<?=$lang['language_id']?>]" /></div>
-    	   <?php
-    	}?>
-    	<div class="clearfix"></div>
-    </div>
-</div>
-<script>
-	$(function() {
-		$(document).on('click', '.add-langs', function() {
-			var group = $(this).parent().attr('for');
-			$(this).parent().parent().appendTo('.reserved_inputs');
-			$('.field-optionvalues-option_language_id').appendTo('.reserved_inputs');
-			$('.'+group+'-lang').appendTo('.'+group+'-active');
-		});
-		$(document).on('click', '.remove-langs', function() {
-			var group = $(this).parent().data('group');
-			$(this).parent().parent().appendTo('.reserved_inputs');
-			console.log('field-'+group);
-			$('.reserved_inputs .field-'+group).appendTo('.'+group+'-active');
-			$('.field-optionvalues-option_language_id').appendTo('.'+group+'-active');
-		});
-	});
-</script>
 \ No newline at end of file
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionValuesSearch */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="option-values-search">
-
-    <?php $form = ActiveForm::begin([
-        'action' => ['index'],
-        'method' => 'get',
-    ]); ?>
-
-    <?= $form->field($model, 'option_value_id') ?>
-
-    <?= $form->field($model, 'option_key') ?>
-
-    <?= $form->field($model, 'option_value_text') ?>
-
-    <?= $form->field($model, 'option_language_id') ?>
-
-    <?= $form->field($model, 'option_value_parent') ?>
-
-    <?php // echo $form->field($model, 'option_user') ?>
-
-    <div class="form-group">
-        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionValues */
-
-$this->title = Yii::t('app', 'Create Option Values');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Option Values'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="option-values-create">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= $this->render('_form', [
-        'model' => $model,
-    ]) ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-use yii\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel frontend\models\OptionValuesSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = Yii::t('app', 'Option Values');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="option-values-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-
-    <p>
-        <?= Html::a(Yii::t('app', 'Create Option Values'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
-
-    <?= GridView::widget([
-        'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'option_value_id',
-            'option_key',
-            'option_value_text:ntext',
-            'option_language_id',
-            'option_value_parent',
-            // 'option_user',
-
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
-    ]); ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionValues */
-
-$this->title = Yii::t('app', 'Update {modelClass}: ', [
-    'modelClass' => 'Option Values',
-]) . ' ' . $model->option_value_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Option Values'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->option_value_id, 'url' => ['view', 'id' => $model->option_value_id]];
-$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
-?>
-<div class="option-values-update">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= $this->render('_form', [
-        'model' => $model,
-    ]) ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionValues */
-
-$this->title = $model->option_value_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Option Values'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="option-values-view">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <p>
-        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->option_value_id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->option_value_id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
-    <?= DetailView::widget([
-        'model' => $model,
-        'attributes' => [
-            'option_value_id',
-            'option_key',
-            'option_value_text:ntext',
-            'option_language_id',
-            'option_value_parent',
-            'option_user',
-        ],
-    ]) ?>
-
-</div>
@@ -4,125 +4,30 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
  
 /* @var $this yii\web\View */
-/* @var $model frontend\models\Option */
+/* @var $model common\models\Option */
 /* @var $form yii\widgets\ActiveForm */
 ?>
  
 <div class="option-form">
+
     <?php $form = ActiveForm::begin(); ?>
-    <input type="hidden" name="Option[model]" value="<?=$modeldb?>"/>
-    <input type="hidden" name="Option[model_id]" value="<?=$model_id?>"/>
-	<?php if($multiple) { ?><p class="text-right"><span class="glyphicon glyphicon-plus add_row"></span></p><?php }?>
-	<?php if(empty($models)) {
-	?>
-	<div class="form-group" id="main_row">
-	<?php foreach($fields as $index => $field) {
-	    ?>
-	    <div class="fields_block">
-	    <label for="Option[0][<?=$field['name']?>]"><?php echo Yii::t('app', $field['name']); ?></label>
-	    <?php 
-	       if($field['translate']) { ?><p class="text-right"><span class="glyphicon glyphicon-globe add_lang"></span></p><?php }
-	    ?>
-    	<input type="hidden" name="Option[0][<?=$field['name']?>][template]" value="<?=$field['template']?>"/>
-    	<input type="hidden" name="Option[0][<?=$field['name']?>][translate]" value="<?=$field['translate']?>"/>
-    	<input type="<?=$field['template']?>" name="Option[0][value][<?=$field['name']?>]" class="form-control required main_input" required/>
-	    <?php
-	    if($field['translate']) {
-	        ?>
-	        <div class="lang_inputs" style="display: none">
-	        <?php
-	        foreach($model->getLangs() as $lang) {
-	        ?>
-	        	<div class="form-group">
-	        		<div class="col-xs-1"><?=$lang['lang_code']?></div>
-	        		<div class="col-xs-11"><input type="<?=$field['template']?>" name="Option[0][lang][<?=$field['name']?>][<?=$lang['language_id']?>]" class="form-control" /></div>
-	        		<div class="clearfix"></div>
-	        	</div>
-	        <?php
-	        }
-	        ?>
-	        </div>
-	        <?php
-	    }
-	    ?>
-	    </div>
-	    <?php
-	}?>
-	</div>
-	<?php
-	} else {
-	$first = 1;
-	foreach($models as $index => $row) {
-	    foreach($row as $key => $value) {
-	        if(!$modellang[$index][$key][0]->hasErrors('value')) {
-	            continue;
-	        }
-	        if($first) {
-	        ?>
-	        <div class="form-group" id="main_row">
-	        <?php
-	        }
-        	?>
-        	<div class="fields_block">
-        	<label for="Option[0][<?=$key?>]"><?php echo Yii::t('app', $key); ?></label>
-            <input type="hidden" name="Option[0][template]" value="<?=$value->template?>"/>
-            <input type="<?=$value->template?>" name="Option[0][value][<?=$key?>]" class="form-control required main_input" required value="<?=$modellang[$index][$key][0]->value?>"/>
-            <div class="help-block"><?=$modellang[$index][$key][0]->getFirstError('value')?></div>
-        	<?php
-        	if($field['translate']) { 
-        	    ?>
-        	    <div class="lang_inputs">
-        	    <?php
-            	foreach($value->getLangs() as $lang) {
-            	   ?>
-            	   <div class="form-group">
-            	   	<div class="col-xs-1"><?=$lang['lang_code']?></div>
-            	   	<div class="col-xs-11"><input type="<?=$value->template?>" name="Option[0][lang][<?=$key?>][<?=$lang['language_id']?>]" class="form-control" value="<?=$modellang[$index][$key][$lang['language_id']]->value?>"/></div>
-            	   </div>
-            	   <?php
-            	}
-            	?>
-            	</div>
-            	<?php
-        	} ?>
-        	</div>
-        	<?php
-	        if($first) {
-	        ?>
-	        </div>
-	        <?php
-	        $first = 0;
-	        }
-	    }
-	}
-	}?>
-	
+
+    <?= $form->field($model, 'model')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'model_id')->textInput() ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'template')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'option_pid')->textInput() ?>
+
+    <?= $form->field($model, 'date_add')->textInput() ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
  
     <?php ActiveForm::end(); ?>
-    <script>
-		$(function() {
-			var counter = 0;
-			$(document).on('click', '.add_row', function() {
-				counter++;
-				var clone = $('#main_row').clone().html().replace(new RegExp("Option\\[0\\]", 'g'), "Option["+counter+"]");
-				$(clone).appendTo('#<?=$form->getId()?>');
-				$('#<?=$form->getId()?> button[type=submit]').parent().appendTo('#<?=$form->getId()?>');
-			});
-			$(document).on('click', '.add_lang', function() {
-				var field_block = $(this).parent().parent();
-				if($(this).hasClass('active')) {
-					$(field_block).find('.main_input').attr('required', '').show();
-					$(field_block).find('.lang_inputs').hide();
-					$(this).removeClass('active');
-				} else {
-					$(field_block).find('.main_input').removeAttr('required').hide();
-					$(field_block).find('.lang_inputs').show();
-					$(this).addClass('active');
-				}
-			});
-		});
-    </script>
+
 </div>
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\Option */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="option-form">
-    <?php $form = ActiveForm::begin(); ?>
-    <input type="hidden" name="Option[model]" value="<?=$modeldb?>"/>
-    <input type="hidden" name="Option[model_id]" value="<?=$model_id?>"/>
-	<?php foreach($models as $id => $row) {
-        	?>
-        	<label for="Option[<?=$id?>][<?=$key?>]"><?php echo Yii::t('app', $key); ?></label>
-        	<input type="hidden" name="Option[<?=$id?>][id]" value="<?=$id?>" />
-            <input type="hidden" name="Option[<?=$id?>][template]" value="<?=$row->template?>"/>
-            <input type="<?=$row->template?>" name="Option[<?=$id?>][value][<?=$row->name?>]" class="form-control required" required value="<?=$modellang[$id][0]->value?>"/>
-            <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
-        	<?php
-            if($row->translate) {
-                foreach($row->getLangs() as $language_id => $lang) {
-                ?>
-                <div class="form-group">
-                	<div class="col-xs-1"><?=$lang['lang_code']?></div>
-                	<div class="col-xs-11"><input type="<?=$row->template?>" name="Option[<?=$id?>][lang][<?=$lang['language_id']?>]" class="form-control" value="<?=$modellang[$id][$lang['language_id']]->value?>"/></div>
-                </div>
-                <?php
-                }
-            }
-        	
-	}?>
-	
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-</div>
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
  
 /* @var $this yii\web\View */
-/* @var $model frontend\models\OptionSearch */
+/* @var $model common\models\OptionSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
  
@@ -15,17 +15,19 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
  
-    <?= $form->field($model, 'option_id') ?>
-
     <?= $form->field($model, 'model') ?>
  
+    <?= $form->field($model, 'option_id') ?>
+
     <?= $form->field($model, 'model_id') ?>
  
     <?= $form->field($model, 'name') ?>
  
     <?= $form->field($model, 'template') ?>
  
-    <?php // echo $form->field($model, 'parent_id') ?>
+    <?php // echo $form->field($model, 'option_pid') ?>
+
+    <?php // echo $form->field($model, 'date_add') ?>
  
     <div class="form-group">
         <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
@@ -4,16 +4,18 @@ use yii\helpers\Html;
  
  
 /* @var $this yii\web\View */
-/* @var $model frontend\models\Option */
+/* @var $model common\models\Option */
  
 $this->title = Yii::t('app', 'Create Option');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="option-create">
+
     <h1><?= Html::encode($this->title) ?></h1>
-	<?php foreach($forms as $oneform) {
-        echo $this->render('_form', $oneform);
-    }?>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
  
 </div>
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\grid\GridView;
  
 /* @var $this yii\web\View */
-/* @var $searchModel frontend\models\OptionSearch */
+/* @var $searchModel common\models\OptionSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
  
 $this->title = Yii::t('app', 'Options');
@@ -25,12 +25,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
  
-            'option_id',
             'model',
+            'option_id',
             'model_id',
             'name',
             'template',
-            // 'parent_id',
+            // 'option_pid',
+            // 'date_add',
  
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -3,19 +3,21 @@
 use yii\helpers\Html;
  
 /* @var $this yii\web\View */
-/* @var $model frontend\models\Option */
+/* @var $model common\models\Option */
  
 $this->title = Yii::t('app', 'Update {modelClass}: ', [
     'modelClass' => 'Option',
-]) . ' ' . $forms[0]['models'][\Yii::$app->request->get('id')]->name;
+]) . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $forms[0]['models'][\Yii::$app->request->get('id')]->name, 'url' => ['view', 'id' => $forms[0]['models'][\Yii::$app->request->get('id')]->option_id]];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->option_id]];
 $this->params['breadcrumbs'][] = Yii::t('app', 'Update');
 ?>
 <div class="option-update">
+
     <h1><?= Html::encode($this->title) ?></h1>
-	<?php foreach($forms as $oneform) {
-    	echo $this->render('_form_edit', $oneform); 
-	}?>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
  
 </div>
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\DetailView;
  
 /* @var $this yii\web\View */
-/* @var $model frontend\models\Option */
+/* @var $model common\models\Option */
  
 $this->title = $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
@@ -28,12 +28,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'option_id',
             'model',
+            'option_id',
             'model_id',
             'name',
             'template',
-            'parent_id',
+            'option_pid',
+            'date_add',
         ],
     ]) ?>
  
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\Options */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="options-form">
-
-    <?php $form = ActiveForm::begin(); ?>
-
-    <?= $form->field($model, 'option_key')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'option_parent')->textInput() ?>
-
-    <?= $form->field($model, 'option_translatable')->textInput() ?>
-
-    <?= $form->field($model, 'option_format')->textInput(['maxlength' => true]) ?>
-
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\OptionsSearch */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="options-search">
-
-    <?php $form = ActiveForm::begin([
-        'action' => ['index'],
-        'method' => 'get',
-    ]); ?>
-
-    <?= $form->field($model, 'option_id') ?>
-
-    <?= $form->field($model, 'option_key') ?>
-
-    <?= $form->field($model, 'option_parent') ?>
-
-    <?= $form->field($model, 'option_translatable') ?>
-
-    <?= $form->field($model, 'option_format') ?>
-
-    <div class="form-group">
-        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\Options */
-
-$this->title = Yii::t('app', 'Create Options');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="options-create">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= $this->render('_form', [
-        'model' => $model,
-    ]) ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-use yii\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel frontend\models\OptionsSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = Yii::t('app', 'Options');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="options-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-
-    <p>
-        <?= Html::a(Yii::t('app', 'Create Options'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
-
-    <?= GridView::widget([
-        'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'option_id',
-            'option_key',
-            'option_parent',
-            'option_translatable',
-            'option_format',
-
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
-    ]); ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\Options */
-
-$this->title = Yii::t('app', 'Update {modelClass}: ', [
-    'modelClass' => 'Options',
-]) . ' ' . $model->option_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->option_id, 'url' => ['view', 'id' => $model->option_id]];
-$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
-?>
-<div class="options-update">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= $this->render('_form', [
-        'model' => $model,
-    ]) ?>
-
-</div>
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model frontend\models\Options */
-
-$this->title = $model->option_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Options'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="options-view">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <p>
-        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->option_id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->option_id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
-    <?= DetailView::widget([
-        'model' => $model,
-        'attributes' => [
-            'option_id',
-            'option_key',
-            'option_parent',
-            'option_translatable',
-            'option_format',
-        ],
-    ]) ?>
-
-</div>