diff --git a/backend/controllers/CurrencyController.php b/backend/controllers/CurrencyController.php index 8797503..3d72e21 100644 --- a/backend/controllers/CurrencyController.php +++ b/backend/controllers/CurrencyController.php @@ -4,23 +4,37 @@ namespace backend\controllers; use yii\base\Controller; use yii\filters\VerbFilter; +use yii\filters\AccessControl; class CurrencyController extends Controller{ + /** * @inheritdoc */ public function behaviors() { return [ + 'access' => [ + 'class' => AccessControl::className(), + 'except' => ['login', 'error'], + 'rules' => [ + [ + 'allow' => true, + 'roles' => ['@'] + ], + ], + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ - 'delete' => ['POST'], + 'logout' => ['post'], + 'delete-req' => ['post'] ], ], ]; } + /** * Lists all Specialization models. * @return mixed diff --git a/backend/views/specialization/_form.php b/backend/views/specialization/_form.php index 018cc2c..ac05746 100755 --- a/backend/views/specialization/_form.php +++ b/backend/views/specialization/_form.php @@ -30,8 +30,12 @@ use \kartik\color\ColorInput; echo common\modules\file\widgets\ImageUploader::widget([ 'model'=> $model, 'field'=>'image', - 'width'=>940, - 'height'=>324, + 'size' => [ + [ + 'width'=>940, + 'height'=>324, + ] + ], 'multi'=>false, 'gallery' =>$model->image, 'name' => 'Загрузить картинку' diff --git a/common/config/main.php b/common/config/main.php index c3405c3..6963e70 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -90,7 +90,18 @@ 'options', ], 'components' => [ - + 'i18n' => [ + 'translations' => [ + 'frontend' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@frontend/messages', + 'sourceLanguage' => 'en-US', + 'fileMap' => [ + 'app' => 'app.php' + ], + ], + ], + ], 'cache' => [ 'class' => 'yii\caching\FileCache', ], @@ -108,26 +119,26 @@ ], ], - 'i18n' => [ - 'translations' => [ - '*' => [ - 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => '@common/translation', - 'fileMap' => [ - 'app' => 'app.php', - 'app/error' => 'error.php', - ], - ], - 'app' => [ - 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => '@common/translation', - 'fileMap' => [ - 'app' => 'app.php', - 'app/error' => 'error.php', - ], - ] - ], - ], +// 'i18n' => [ +// 'translations' => [ +// '*' => [ +// 'class' => 'yii\i18n\PhpMessageSource', +// 'basePath' => '@common/translation', +// 'fileMap' => [ +// 'app' => 'app.php', +// 'app/error' => 'error.php', +// ], +// ], +// 'app' => [ +// 'class' => 'yii\i18n\PhpMessageSource', +// 'basePath' => '@common/translation', +// 'fileMap' => [ +// 'app' => 'app.php', +// 'app/error' => 'error.php', +// ], +// ] +// ], +// ], 'authManager' => [ 'class' => 'yii\rbac\DbManager', ], diff --git a/common/models/Blog.php b/common/models/Blog.php index 6baf9b4..2311a36 100644 --- a/common/models/Blog.php +++ b/common/models/Blog.php @@ -97,15 +97,15 @@ public function attributeLabels() { return [ - 'blog_id' => Yii::t('app', 'Blog ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'name' => Yii::t('app', 'Название'), - 'link' => Yii::t('app', 'URL'), - 'date_add' => Yii::t('app', 'Дата добавления'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'view_count' => Yii::t('app', 'Количество просмотров'), - 'description' => Yii::t('app', 'Описание'), - 'cover' => Yii::t('app', 'Фото главное'), + 'blog_id' => Yii::t('app', 'blog_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'name' => Yii::t('app', 'name'), + 'link' => Yii::t('app', 'link'), + 'date_add' => Yii::t('app', 'date_add'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'view_count' => Yii::t('app', 'view_count'), + 'description' => Yii::t('app', 'description'), + 'cover' => Yii::t('app', 'cover'), ]; } diff --git a/common/models/Chat.php b/common/models/Chat.php index 1b40388..e9aac52 100644 --- a/common/models/Chat.php +++ b/common/models/Chat.php @@ -48,11 +48,11 @@ class Chat extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'chat_id' => 'Chat ID', - 'status' => 'Status', - 'comment' => 'Comment', - 'from_user' => 'From User', - 'to_user' => 'To User', + 'chat_id' => Yii::t('app', 'chat_id'), + 'status' => Yii::t('app', 'status'), + 'comment' => Yii::t('app', 'comment'), + 'from_user' => Yii::t('app', 'from_user'), + 'to_user' => Yii::t('app', 'to_user'), ]; } @@ -96,7 +96,7 @@ class Chat extends \yii\db\ActiveRecord if($this->from_user == \Yii::$app->user->id){ return UserInfo::findOne(['user_id'=>$this->to_user]); } else { - return UserInfo::find(['user_id'=>$this->from_user]); + return UserInfo::findOne(['user_id'=>$this->from_user]); } } diff --git a/common/models/Cities.php b/common/models/Cities.php index 613e8e9..88f017e 100644 --- a/common/models/Cities.php +++ b/common/models/Cities.php @@ -39,10 +39,10 @@ class Cities extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => 'ID', - 'name' => 'Name', - 'is_active' => 'Is Active', - 'parent' => 'Parent', + 'id' => Yii::t('app','ID'), + 'name' => Yii::t('app','name'), + 'is_active' => Yii::t('app','is_active'), + 'parent' => Yii::t('app','parent'), ]; } } diff --git a/common/models/CompanyInfo.php b/common/models/CompanyInfo.php index a0d8cf4..efca4da 100755 --- a/common/models/CompanyInfo.php +++ b/common/models/CompanyInfo.php @@ -62,11 +62,11 @@ public function attributeLabels() { return [ - 'company_info_id' => Yii::t('app', 'Company Info ID'), - 'name' => Yii::t('app', 'Название компании'), - 'staff' => Yii::t('app', 'Количество сотрудников'), - 'street' => Yii::t('app', 'Улица'), - 'house' => Yii::t('app', 'Дом'), + 'company_info_id' => Yii::t('app', 'company_info_id'), + 'name' => Yii::t('app', 'name_company'), + 'staff' => Yii::t('app', 'staff'), + 'street' => Yii::t('app', 'street'), + 'house' => Yii::t('app', 'house'), ]; } } diff --git a/common/models/Country.php b/common/models/Country.php index 87124c6..46f6603 100644 --- a/common/models/Country.php +++ b/common/models/Country.php @@ -1,4 +1,4 @@ - 255], + return [ + [['oid'], 'integer'], + [['country_name', 'country_name_en'], 'string', 'max' => 255], ]; } @@ -39,10 +39,10 @@ class Country extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'country_id' => Yii::t('app', 'Country ID'), - 'oid' => Yii::t('app', 'Oid'), - 'country_name' => Yii::t('app', 'Country Name'), - 'country_name_en' => Yii::t('app', 'Country Name En'), + 'country_id' => Yii::t('app', 'country_id'), + 'oid' => Yii::t('app', 'oid'), + 'country_name' => Yii::t('app', 'country_name'), + 'country_name_en' => Yii::t('app', 'country_name_en'), ]; } } diff --git a/common/models/Currency.php b/common/models/Currency.php index 90d41f3..2a23534 100644 --- a/common/models/Currency.php +++ b/common/models/Currency.php @@ -45,13 +45,13 @@ class Currency extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'currency_id' => Yii::t('app', 'Currency ID'), - 'name' => Yii::t('app', 'Name'), - 'symbol' => Yii::t('app', 'Symbol'), - 'code' => Yii::t('app', 'Code'), - 'rate' => Yii::t('app', 'Rate'), - 'date_update' => Yii::t('app', 'Date Update'), - 'is_default' => Yii::t('app', 'Is Default'), + 'currency_id' => Yii::t('app', 'currency_id'), + 'name' => Yii::t('app', 'name'), + 'symbol' => Yii::t('app', 'symbol'), + 'code' => Yii::t('app', 'code'), + 'rate' => Yii::t('app', 'rate'), + 'date_update' => Yii::t('app', 'date_update'), + 'is_default' => Yii::t('app', 'is_default'), ]; } diff --git a/common/models/CustomerSearch.php b/common/models/CustomerSearch.php index 8a7d3d6..2ae0ea3 100644 --- a/common/models/CustomerSearch.php +++ b/common/models/CustomerSearch.php @@ -63,11 +63,11 @@ public function attributeLabels() { return [ - 'type' => Yii::t('app', 'Тип заказчика'), - 'rating' => Yii::t('app', 'Рейтинг'), - 'online' => Yii::t('app', 'Статус'), - 'city' => Yii::t('app', 'Город'), - 'info' => Yii::t('app', 'Любая информация о заказчике'), + 'type' => Yii::t('app', 'type'), + 'rating' => Yii::t('app', 'rating'), + 'online' => Yii::t('app', 'online'), + 'city' => Yii::t('app', 'city'), + 'info' => Yii::t('app', 'info'), ]; } diff --git a/common/models/Department.php b/common/models/Department.php index c2a971a..ecd56f4 100644 --- a/common/models/Department.php +++ b/common/models/Department.php @@ -1,4 +1,4 @@ - 255], + return [ + [['name'], 'string', 'max' => 255], ]; } @@ -38,8 +38,8 @@ class Department extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'department_id' => Yii::t('app', 'Department ID'), - 'name' => Yii::t('app', 'Name'), + 'department_id' => Yii::t('app', 'department_id'), + 'name' => Yii::t('app', 'name'), ]; } @@ -48,6 +48,6 @@ class Department extends \yii\db\ActiveRecord */ public function getTeams() { - return $this->hasMany(Team::className(), ['department_id' => 'department_id']); + return $this->hasMany(Team::className(), ['department_id' => 'department_id']); } } diff --git a/common/models/Employment.php b/common/models/Employment.php index f7e5fa7..9d1830f 100644 --- a/common/models/Employment.php +++ b/common/models/Employment.php @@ -1,4 +1,4 @@ - 255], + return [ + [['name'], 'string', 'max' => 255], ]; } @@ -38,8 +38,8 @@ class Employment extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'employment_id' => Yii::t('app', 'Employment ID'), - 'name' => Yii::t('app', 'Name'), + 'employment_id' => Yii::t('app', 'employment_id'), + 'name' => Yii::t('app', 'name'), ]; } @@ -48,6 +48,6 @@ class Employment extends \yii\db\ActiveRecord */ public function getVacancyEmployments() { - return $this->hasMany(VacancyEmployment::className(), ['employment_id' => 'employment_id']); + return $this->hasMany(VacancyEmployment::className(), ['employment_id' => 'employment_id']); } } diff --git a/common/models/Fields.php b/common/models/Fields.php index ca60c59..d2f9591 100755 --- a/common/models/Fields.php +++ b/common/models/Fields.php @@ -63,20 +63,20 @@ ]; } - /** - * @inheritdoc - */ - public function attributeLabels() - { - return [ - 'id' => 'ID', - 'table_name' => 'Model Name', - 'table_id' => 'Model ID', - 'value' => 'Value', - 'field_name' => 'Field Name', - 'language' => 'Language', - ]; - } + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'id' => Yii::t('app', 'id'), + 'table_name' => Yii::t('app', 'table_name'), + 'table_id' => Yii::t('app', 'table_id'), + 'value' => Yii::t('app', 'value'), + 'field_name' => Yii::t('app', 'field_name'), + 'language' => Yii::t('app', 'language'), + ]; + } public static function getData($id, $model, $type) { diff --git a/common/models/File.php b/common/models/File.php index 33cd82d..6cf0a5a 100644 --- a/common/models/File.php +++ b/common/models/File.php @@ -41,10 +41,10 @@ class File extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'file_id' => 'File ID', - 'status' => 'Status', - 'name' => 'Name', - 'dir' => 'Dir', + 'file_id' => Yii::t('app','file_id'), + 'status' => Yii::t('app','status'), + 'name' => Yii::t('app','name'), + 'dir' => Yii::t('app','dir'), ]; } diff --git a/common/models/Gallery.php b/common/models/Gallery.php index 688deb9..35e58b5 100644 --- a/common/models/Gallery.php +++ b/common/models/Gallery.php @@ -87,14 +87,14 @@ public function attributeLabels() { return [ - 'gallery_id' => Yii::t('app', 'Gallery ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'name' => Yii::t('app', 'Название'), - 'date_add' => Yii::t('app', 'Дата добавления'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'cover' => Yii::t('app', 'Фото главное'), - 'type' => Yii::t('app', 'Вид галереи'), - 'photo' => Yii::t('app', 'Фото галереи'), + 'gallery_id' => Yii::t('app', 'gallery_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'name' => Yii::t('app', 'name'), + 'date_add' => Yii::t('app', 'date_add'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'cover' => Yii::t('app', 'cover_g'), + 'type' => Yii::t('app', 'type_g'), + 'photo' => Yii::t('app', 'photo_g'), ]; } } diff --git a/common/models/Job.php b/common/models/Job.php index 01e1ace..a7b8814 100755 --- a/common/models/Job.php +++ b/common/models/Job.php @@ -184,22 +184,23 @@ // } } - /** - * @inheritdoc - */ - public function attributeLabels() - { - return [ - 'job_id' => Yii::t('app', 'Job ID'), - 'name' => Yii::t('app', 'Name'), - 'link' => Yii::t('app', 'Link'), - 'date_start' => Yii::t('app', 'Date Start'), - 'date_end' => Yii::t('app', 'Date End'), - 'position' => Yii::t('app', 'Position'), - 'user_id' => Yii::t('app', 'User ID'), - 'total_count' => Yii::t('app', 'Total Count'), - 'complete_count' => Yii::t('app', 'Complete Count'), - 'current' => Yii::t('app', 'Current'), - ]; - } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'job_id' => Yii::t('app', 'job_id'), + 'name' => Yii::t('app', 'name'), + 'link' => Yii::t('app', 'link'), + 'date_start' => Yii::t('app', 'date_start'), + 'date_end' => Yii::t('app', 'date_end'), + 'position' => Yii::t('app', 'position'), + 'user_id' => Yii::t('app', 'user_id'), + 'total_count' => Yii::t('app', 'total_count'), + 'complete_count' => Yii::t('app', 'complete_count'), + 'current' => Yii::t('app', 'current'), + ]; } +} diff --git a/common/models/Media.php b/common/models/Media.php index d66805b..82c16e0 100755 --- a/common/models/Media.php +++ b/common/models/Media.php @@ -49,12 +49,12 @@ class Media extends ActiveRecord /** * @inheritdoc */ - public function attributeLabels() + public function attributeLabels() { return [ - 'media_id' => Yii::t('app', 'ID'), - 'hash' => Yii::t('app', 'Hash'), - 'extension' => Yii::t('app', 'Extension'), + 'media_id' => Yii::t('app', 'media_id'), + 'hash' => Yii::t('app', 'hash'), + 'extension' => Yii::t('app', 'extension'), ]; } diff --git a/common/models/Message.php b/common/models/Message.php index d60c5e8..b2666c8 100644 --- a/common/models/Message.php +++ b/common/models/Message.php @@ -55,13 +55,13 @@ class Message extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'message_id' => 'Message ID', - 'chat_id' => 'Chat ID', - 'user_id' => 'User ID', - 'status' => 'Status', - 'text' => 'Сообщение', - 'files' => 'Files', - 'date' => 'Date', + 'message_id' => Yii::t('app', 'message_id'), + 'chat_id' => Yii::t('app', 'chat_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'status' => Yii::t('app', 'status'), + 'text' => Yii::t('app', 'text'), + 'files' => Yii::t('app', 'files'), + 'date' => Yii::t('app', 'date'), ]; } diff --git a/common/models/Option.php b/common/models/Option.php index ab31dd0..6ea9f51 100755 --- a/common/models/Option.php +++ b/common/models/Option.php @@ -47,13 +47,13 @@ class Option extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'model' => Yii::t('app', 'Model'), - 'option_id' => Yii::t('app', 'Option ID'), - 'model_id' => Yii::t('app', 'Model ID'), - 'name' => Yii::t('app', 'Name'), - 'template' => Yii::t('app', 'Template'), - 'option_pid' => Yii::t('app', 'Option Pid'), - 'date_add' => Yii::t('app', 'Date Add'), + 'model' => Yii::t('app', 'model'), + 'option_id' => Yii::t('app', 'option_id'), + 'model_id' => Yii::t('app', 'model_id'), + 'name' => Yii::t('app', 'name'), + 'template' => Yii::t('app', 'template'), + 'option_pid' => Yii::t('app', 'option_pid'), + 'date_add' => Yii::t('app', 'date_add'), ]; } diff --git a/common/models/OptionLang.php b/common/models/OptionLang.php index 1f3b390..5720134 100755 --- a/common/models/OptionLang.php +++ b/common/models/OptionLang.php @@ -42,10 +42,10 @@ class OptionLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'option_lang_id' => Yii::t('app', 'Option Lang ID'), - 'option_id' => Yii::t('app', 'Option ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'value' => Yii::t('app', 'Value'), + 'option_lang_id' => Yii::t('app', 'option_lang_id'), + 'option_id' => Yii::t('app', 'option_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'value' => Yii::t('app', 'value'), ]; } diff --git a/common/models/Payment.php b/common/models/Payment.php index b2d27c2..292c7df 100644 --- a/common/models/Payment.php +++ b/common/models/Payment.php @@ -1,4 +1,4 @@ - 255], + return [ + [['name'], 'required'], + [['status'], 'integer'], + [['name'], 'string', 'max' => 255], ]; } @@ -41,9 +41,9 @@ class Payment extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'payment_id' => Yii::t('app', 'Payment ID'), - 'name' => Yii::t('app', 'Name'), - 'status' => Yii::t('app', 'Status'), + 'payment_id' => Yii::t('app', 'payment_id'), + 'name' => Yii::t('app', 'name'), + 'status' => Yii::t('app', 'status'), ]; } @@ -52,6 +52,6 @@ class Payment extends \yii\db\ActiveRecord */ public function getUserPayments() { - return $this->hasMany(UserPayment::className(), ['payment_id' => 'payment_id']); + return $this->hasMany(UserPayment::className(), ['payment_id' => 'payment_id']); } } diff --git a/common/models/Portfolio.php b/common/models/Portfolio.php index d94843e..e6a6dd4 100644 --- a/common/models/Portfolio.php +++ b/common/models/Portfolio.php @@ -121,21 +121,21 @@ public function attributeLabels() { return [ - 'portfolio_id' => Yii::t('app', 'Portfolio ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'name' => Yii::t('app', 'Название'), - 'link' => Yii::t('app', 'URL'), - 'date_add' => Yii::t('app', 'Дата добавления'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'view_count' => Yii::t('app', 'Количество просмотров'), - 'city' => Yii::t('app', 'Город'), - 'street' => Yii::t('app', 'Улица'), - 'house' => Yii::t('app', 'Дом'), - 'description' => Yii::t('app', 'Описание'), - 'cover' => Yii::t('app', 'Фото главное'), - 'gallery_id' => Yii::t('app', 'Фото галерея'), - 'specializationString' => Yii::t('app', 'Специализации'), - 'preview' => Yii::t('app', 'Описание кратко'), + 'portfolio_id' => Yii::t('app', 'portfolio_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'name' => Yii::t('app', 'name'), + 'link' => Yii::t('app', 'link'), + 'date_add' => Yii::t('app', 'date_add'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'view_count' => Yii::t('app', 'view_count'), + 'city' => Yii::t('app', 'city'), + 'street' => Yii::t('app', 'street'), + 'house' => Yii::t('app', 'house'), + 'description' => Yii::t('app', 'description'), + 'cover' => Yii::t('app', 'cover_m'), + 'gallery_id' => Yii::t('app', 'gallery_id'), + 'specializationString' => Yii::t('app', 'specializationString'), + 'preview' => Yii::t('app', 'preview'), ]; } diff --git a/common/models/PortfolioSpecialization.php b/common/models/PortfolioSpecialization.php index 6a373e0..a5dd0fe 100644 --- a/common/models/PortfolioSpecialization.php +++ b/common/models/PortfolioSpecialization.php @@ -44,9 +44,9 @@ class PortfolioSpecialization extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'portfolio_specialization_id' => Yii::t('app', 'Portfolio Specialization ID'), - 'portfolio_id' => Yii::t('app', 'Portfolio ID'), - 'specialization_id' => Yii::t('app', 'Specialization ID'), + 'portfolio_specialization_id' => Yii::t('app', 'portfolio_specialization_id'), + 'portfolio_id' => Yii::t('app', 'portfolio_id'), + 'specialization_id' => Yii::t('app', 'specialization_id'), ]; } diff --git a/common/models/Project.php b/common/models/Project.php index c2195bf..30c7322 100644 --- a/common/models/Project.php +++ b/common/models/Project.php @@ -178,28 +178,27 @@ public function attributeLabels() { return [ - 'project_id' => Yii::t('app', 'Project ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'name' => Yii::t('app', 'Название'), - 'link' => Yii::t('app', 'URL'), - 'project_pid' => Yii::t('app', 'Родительский проект'), - 'date_add' => Yii::t('app', 'Дата добавления'), - 'date_end' => Yii::t('app', 'Дата окончания'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'view_count' => Yii::t('app', 'Количество просмотров'), - 'budget' => Yii::t('app', 'Бюджет'), - 'city' => Yii::t('app', 'Город'), - 'street' => Yii::t('app', 'Улица'), - 'house' => Yii::t('app', 'Дом'), - 'payment_variant' => Yii::t('app', 'Варианты оплаты'), - 'deadline' => Yii::t('app', 'Срок выполнения'), - 'description' => Yii::t('app', 'Описание'), - 'contractual' => Yii::t('app', 'Договорной'), - 'file' => Yii::t('app', 'Присоединить файл'), - 'specializationInput' => Yii::t('app', 'Специализации'), - 'paymentInput' => Yii::t('app', 'Способ оплаты'), - 'specializationString' => Yii::t('app', 'Специализации'), - 'hidden' => Yii::t('app', 'Снять проект с тендера'), + 'project_id' => Yii::t('app', 'project_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'name' => Yii::t('app', 'name'), + 'link' => Yii::t('app', 'link'), + 'project_pid' => Yii::t('app', 'project_pid'), + 'date_add' => Yii::t('app', 'date_add'), + 'date_end' => Yii::t('app', 'date_end'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'view_count' => Yii::t('app', 'view_count'), + 'budget' => Yii::t('app', 'budget'), + 'city' => Yii::t('app', 'city'), + 'street' => Yii::t('app', 'street'), + 'house' => Yii::t('app', 'house'), + 'payment_variant' => Yii::t('app', 'payment_variant'), + 'deadline' => Yii::t('app', 'deadline'), + 'description' => Yii::t('app', 'description'), + 'contractual' => Yii::t('app', 'contractual'), + 'file' => Yii::t('app', 'file'), + 'specializationInput' => Yii::t('app', 'specializationInput'), + 'paymentInput' => Yii::t('app', 'paymentInput'), + 'specializationString' => Yii::t('app', 'specializationString'), ]; } diff --git a/common/models/ProjectPayment.php b/common/models/ProjectPayment.php index 460ecaf..f542963 100644 --- a/common/models/ProjectPayment.php +++ b/common/models/ProjectPayment.php @@ -1,4 +1,4 @@ - true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], - [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], + return [ + [['project_id', 'payment_id'], 'integer'], + [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], + [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], ]; } @@ -42,9 +42,9 @@ class ProjectPayment extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'project_payment_id' => Yii::t('app', 'Project Payment ID'), - 'project_id' => Yii::t('app', 'Project ID'), - 'payment_id' => Yii::t('app', 'Payment ID'), + 'project_payment_id' => Yii::t('app', 'project_payment_id'), + 'project_id' => Yii::t('app', 'project_id'), + 'payment_id' => Yii::t('app', 'payment_id'), ]; } @@ -53,7 +53,7 @@ class ProjectPayment extends \yii\db\ActiveRecord */ public function getPayment() { - return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); + return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); } /** @@ -61,6 +61,6 @@ class ProjectPayment extends \yii\db\ActiveRecord */ public function getProject() { - return $this->hasOne(Project::className(), ['project_id' => 'project_id']); + return $this->hasOne(Project::className(), ['project_id' => 'project_id']); } } diff --git a/common/models/ProjectSpecialization.php b/common/models/ProjectSpecialization.php index cd14981..916a1a7 100644 --- a/common/models/ProjectSpecialization.php +++ b/common/models/ProjectSpecialization.php @@ -1,4 +1,4 @@ - true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], - [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], + return [ + [['project_id', 'specialization_id'], 'integer'], + [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']], + [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], ]; } @@ -42,9 +42,9 @@ class ProjectSpecialization extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'project_specialization_id' => Yii::t('app', 'Project Specialization ID'), - 'project_id' => Yii::t('app', 'Project ID'), - 'specialization_id' => Yii::t('app', 'Specialization ID'), + 'project_specialization_id' => Yii::t('app', 'project_specialization_id'), + 'project_id' => Yii::t('app', 'project_id'), + 'specialization_id' => Yii::t('app', 'specialization_id'), ]; } @@ -53,7 +53,7 @@ class ProjectSpecialization extends \yii\db\ActiveRecord */ public function getProject() { - return $this->hasOne(Project::className(), ['project_id' => 'project_id']); + return $this->hasOne(Project::className(), ['project_id' => 'project_id']); } /** @@ -61,6 +61,6 @@ class ProjectSpecialization extends \yii\db\ActiveRecord */ public function getSpecialization() { - return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); + return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); } } diff --git a/common/models/Social.php b/common/models/Social.php index a9669d2..be05c41 100755 --- a/common/models/Social.php +++ b/common/models/Social.php @@ -39,10 +39,10 @@ class Social extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'social_id' => Yii::t('app', 'Social ID'), - 'social_name' => Yii::t('app', 'Social Name'), - 'social_user_id' => Yii::t('app', 'Social User ID'), - 'user_id' => Yii::t('app', 'User ID'), + 'social_id' => Yii::t('app', 'social_id'), + 'social_name' => Yii::t('app', 'social_name'), + 'social_user_id' => Yii::t('app', 'social_user_id'), + 'user_id' => Yii::t('app', 'user_id'), ]; } } diff --git a/common/models/Specialization.php b/common/models/Specialization.php index 1bb3a0e..986129a 100755 --- a/common/models/Specialization.php +++ b/common/models/Specialization.php @@ -43,13 +43,13 @@ class Specialization extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'specialization_id' => 'Specialization ID', - 'specialization_pid' => 'Specialization Pid', - 'specialization_name' => 'Specialization Name', - 'specialization_parent_name' => 'Specialization Parent Name', - 'image' => 'Картинка', - 'background' => 'Background', - 'status' => 'Status', + 'specialization_id' => Yii::t('app', 'specialization_id'), + 'specialization_pid' => Yii::t('app', 'specialization_pid'), + 'specialization_name' => Yii::t('app', 'specialization_name'), + 'specialization_parent_name' => Yii::t('app', 'specialization_parent_name'), + 'image' => Yii::t('app', 'image'), + 'background' => Yii::t('app', 'background'), + 'status' => Yii::t('app', 'status'), ]; } diff --git a/common/models/Team.php b/common/models/Team.php index 32b55ff..bfac20a 100644 --- a/common/models/Team.php +++ b/common/models/Team.php @@ -121,19 +121,19 @@ public function attributeLabels() { return [ - 'team_id' => Yii::t('app', 'Team ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'firstname' => Yii::t('app', 'Имя'), - 'lastname' => Yii::t('app', 'Фамилия'), - 'middlename' => Yii::t('app', 'Отчество'), - 'link' => Yii::t('app', 'Ссылка на профиль МФП'), - 'position' => Yii::t('app', 'Должность'), - 'department_id' => Yii::t('app', 'Отдел компании'), - 'experience_from' => Yii::t('app', 'Опыт'), - 'date_add' => Yii::t('app', 'дата добавления'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'photo' => Yii::t('app', 'Фото'), - 'country_id' => Yii::t('app', 'Страна'), + 'team_id' => Yii::t('app', 'team_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'firstname' => Yii::t('app', 'firstname'), + 'lastname' => Yii::t('app', 'lastname'), + 'middlename' => Yii::t('app', 'middlename'), + 'link' => Yii::t('app', 'link_profile'), + 'position' => Yii::t('app', 'position'), + 'department_id' => Yii::t('app', 'department_id'), + 'experience_from' => Yii::t('app', 'experience_from'), + 'date_add' => Yii::t('app', 'date_add'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'photo' => Yii::t('app', 'photo'), + 'country_id' => Yii::t('app', 'country_id'), ]; } diff --git a/common/models/TenderSearch.php b/common/models/TenderSearch.php index d431cfa..8a6bd62 100644 --- a/common/models/TenderSearch.php +++ b/common/models/TenderSearch.php @@ -87,13 +87,13 @@ public function attributeLabels() { return [ - 'specialization' => Yii::t('app', 'Специализация'), - 'budget_currency' => Yii::t('app', 'Валюта'), - 'contractual' => Yii::t('app', 'Договорной'), - 'city' => Yii::t('app', 'Город'), - 'payment' => Yii::t('app', 'Способ оплаты'), - 'budget_from' => Yii::t('app', 'от'), - 'budget_to' => Yii::t('app', 'до'), + 'specialization' => Yii::t('app', 'specialization'), + 'budget_currency' => Yii::t('app', 'budget_currency'), + 'contractual' => Yii::t('app', 'contractual'), + 'city' => Yii::t('app', 'city'), + 'payment' => Yii::t('app', 'payment'), + 'budget_from' => Yii::t('app', 'budget_from'), + 'budget_to' => Yii::t('app', 'budget_to'), ]; } diff --git a/common/models/User.php b/common/models/User.php index 4b03d5c..8217fd4 100755 --- a/common/models/User.php +++ b/common/models/User.php @@ -151,9 +151,9 @@ public function attributeLabels() { return [ - 'firstname' => Yii::t('app', 'Имя'), - 'lastname' => Yii::t('app', 'Фамилия'), - 'email' => Yii::t('app', 'Email'), + 'firstname' => Yii::t('app', 'firstname'), + 'lastname' => Yii::t('app', 'lastname'), + 'email' => Yii::t('app', 'email'), ]; } diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php index 520681f..6617a05 100755 --- a/common/models/UserInfo.php +++ b/common/models/UserInfo.php @@ -279,41 +279,41 @@ public function attributeLabels() { return [ - 'user_id' => Yii::t('app', 'User ID'), - 'view_count' => Yii::t('app', 'Количество просмотров'), - 'busy' => Yii::t('app', 'Статус'), - 'date_visit' => Yii::t('app', 'Дата визита'), - 'experience' => Yii::t('app', 'Опыт работы'), - 'rank' => Yii::t('app', 'Rank'), - 'salary' => Yii::t('app', 'Зарплата'), - 'job' => Yii::t('app', 'Место работы'), - 'location' => Yii::t('app', 'Место расположения'), - 'soft' => Yii::t('app', 'Работа с программами'), - 'user_info_id' => Yii::t('app', 'User Info ID'), - 'guarantee' => Yii::t('app', 'Гарантия качества работ'), - 'contract' => Yii::t('app', 'Работа по договору'), - 'estimate' => Yii::t('app', 'Предоставляете смету'), - 'purchase' => Yii::t('app', 'Делаете сами закупку материалов'), - 'delivery' => Yii::t('app', 'Занимаетесь сами доставкой материалов'), - 'prepayment' => Yii::t('app', 'Минимальная предоплата за работы'), - 'about' => Yii::t('app', 'О себе'), - 'type' => Yii::t('app', 'Is Default'), - 'member' => Yii::t('app', 'Членство в МФП'), - 'alt_location' => 'Город не в списке', - 'country' => Yii::t('app', 'Страна'), - 'city' => Yii::t('app', 'Город'), - 'image' => Yii::t('app', 'Аватар'), - 'poster' => Yii::t('app', 'Подложка'), - 'social_vk' => Yii::t('app', 'Vk.com'), - 'social_fb' => Yii::t('app', 'FaceBook.com'), - 'social_in' => Yii::t('app', 'LinkedIn.com'), - 'social_t' => Yii::t('app', 'Twitter.com'), - 'geography' => Yii::t('app', 'География работ'), - 'geographies' => Yii::t('app', 'География работ'), - 'salary_currency' => Yii::t('app', 'Валюта'), + 'user_id' => Yii::t('app', 'user_id'), + 'view_count' => Yii::t('app', 'view_count'), + 'busy' => Yii::t('app', 'busy'), + 'date_visit' => Yii::t('app', 'date_visit'), + 'experience' => Yii::t('app', 'experience'), + 'rank' => Yii::t('app', 'rank'), + 'salary' => Yii::t('app', 'salary'), + 'job' => Yii::t('app', 'job'), + 'location' => Yii::t('app', 'location'), + 'soft' => Yii::t('app', 'soft'), + 'user_info_id' => Yii::t('app', 'user_info_id'), + 'guarantee' => Yii::t('app', 'guarantee'), + 'contract' => Yii::t('app', 'contract'), + 'estimate' => Yii::t('app', 'estimate'), + 'purchase' => Yii::t('app', 'purchase'), + 'delivery' => Yii::t('app', 'delivery'), + 'prepayment' => Yii::t('app', 'prepayment'), + 'about' => Yii::t('app', 'about'), + 'type' => Yii::t('app', 'type'), + 'member' => Yii::t('app', 'member'), + 'alt_location' => Yii::t('app', 'alt_location'), + 'country' => Yii::t('app', 'country'), + 'city' => Yii::t('app', 'city'), + 'image' => Yii::t('app', 'image_ui'), + 'poster' => Yii::t('app', 'poster'), + 'social_vk' => Yii::t('app', 'social_vk'), + 'social_fb' => Yii::t('app', 'social_fb'), + 'social_in' => Yii::t('app', 'social_in'), + 'social_t' => Yii::t('app', 'social_t'), + 'geography' => Yii::t('app', 'geography'), + 'geographies' => Yii::t('app', 'geographies'), + 'salary_currency' => Yii::t('app', 'salary_currency'), 'is_customer' => '', 'is_freelancer' => '', - 'hide_mail' => Yii::t('app', 'не публиковать Email'), + 'hide_mail' => Yii::t('app', 'hide_mail'), ]; } diff --git a/common/models/UserPayment.php b/common/models/UserPayment.php index 010cb75..69906ba 100644 --- a/common/models/UserPayment.php +++ b/common/models/UserPayment.php @@ -1,4 +1,4 @@ - true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], + return [ + [['user_id', 'payment_id'], 'integer'], + [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']], ]; } @@ -40,9 +40,9 @@ class UserPayment extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'user_payment_id' => Yii::t('app', 'User Payment ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'payment_id' => Yii::t('app', 'Payment ID'), + 'user_payment_id' => Yii::t('app', 'user_payment_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'payment_id' => Yii::t('app', 'payment_id'), ]; } @@ -51,6 +51,6 @@ class UserPayment extends \yii\db\ActiveRecord */ public function getPayment() { - return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); + return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']); } } diff --git a/common/models/UserSpecialization.php b/common/models/UserSpecialization.php index 1daa2b6..6c34fa8 100644 --- a/common/models/UserSpecialization.php +++ b/common/models/UserSpecialization.php @@ -1,4 +1,4 @@ - true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], + return [ + [['user_id', 'specialization_id'], 'integer'], + [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']], ]; } @@ -40,9 +40,9 @@ class UserSpecialization extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'user_specialization_id' => Yii::t('app', 'User Specialization ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'specialization_id' => Yii::t('app', 'Specialization ID'), + 'user_specialization_id' => Yii::t('app', 'user_specialization_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'specialization_id' => Yii::t('app', 'specialization_id'), ]; } @@ -51,6 +51,6 @@ class UserSpecialization extends \yii\db\ActiveRecord */ public function getSpecialization() { - return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); + return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']); } } diff --git a/common/models/Vacancy.php b/common/models/Vacancy.php index 12b55f6..60e6881 100644 --- a/common/models/Vacancy.php +++ b/common/models/Vacancy.php @@ -147,20 +147,20 @@ public function attributeLabels() { return [ - 'vacancy_id' => Yii::t('app', 'Vacancy ID'), - 'user_id' => Yii::t('app', 'User ID'), - 'name' => Yii::t('app', 'Название'), - 'link' => Yii::t('app', 'URL'), - 'date_add' => Yii::t('app', 'Дата добавления'), - 'user_add_id' => Yii::t('app', 'User Add ID'), - 'view_count' => Yii::t('app', 'Количество просмотров'), - 'user_name' => Yii::t('app', 'Контактное лицо'), - 'city' => Yii::t('app', 'Город'), - 'description' => Yii::t('app', 'Описание'), - 'employmentInput' => Yii::t('app', 'Вид занятости'), - 'phone' => Yii::t('app', 'Телефон'), - 'salary' => Yii::t('app', 'Заработная плата'), - 'salary_currency' => Yii::t('app', 'Валюта'), + 'vacancy_id' => Yii::t('app', 'vacancy_id'), + 'user_id' => Yii::t('app', 'user_id'), + 'name' => Yii::t('app', 'name'), + 'link' => Yii::t('app', 'link'), + 'date_add' => Yii::t('app', 'date_add'), + 'user_add_id' => Yii::t('app', 'user_add_id'), + 'view_count' => Yii::t('app', 'view_count'), + 'user_name' => Yii::t('app', 'user_name'), + 'city' => Yii::t('app', 'city'), + 'description' => Yii::t('app', 'description'), + 'employmentInput' => Yii::t('app', 'employmentInput'), + 'phone' => Yii::t('app', 'phone'), + 'salary' => Yii::t('app', 'salary'), + 'salary_currency' => Yii::t('app', 'salary_currency'), ]; } diff --git a/common/models/VacancyEmployment.php b/common/models/VacancyEmployment.php index 1fa7cfe..de3a1fe 100644 --- a/common/models/VacancyEmployment.php +++ b/common/models/VacancyEmployment.php @@ -42,9 +42,9 @@ class VacancyEmployment extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'vacancy_employment' => Yii::t('app', 'Vacancy Employment'), - 'vacancy_id' => Yii::t('app', 'Vacancy ID'), - 'employment_id' => Yii::t('app', 'Employment ID'), + 'vacancy_employment' => Yii::t('app', 'vacancy_employment'), + 'vacancy_id' => Yii::t('app', 'vacancy_id'), + 'employment_id' => Yii::t('app', 'employment_id'), ]; } diff --git a/common/models/VacancySpecialization.php b/common/models/VacancySpecialization.php index 1b7fe88..fcf499b 100644 --- a/common/models/VacancySpecialization.php +++ b/common/models/VacancySpecialization.php @@ -42,9 +42,9 @@ class VacancySpecialization extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'vacancy_specialization_id' => 'Vacancy Specialization ID', - 'vacancy_id' => 'Vacancy ID', - 'specialization_id' => 'Specialization ID', + 'vacancy_specialization_id' => Yii::t('app', 'vacancy_specialization_id'), + 'vacancy_id' => Yii::t('app', 'vacancy_id'), + 'specialization_id' => Yii::t('app', 'specialization_id'), ]; } diff --git a/common/modules/comment/widgets/views/form-project-comment.php b/common/modules/comment/widgets/views/form-project-comment.php index 5a76271..b343fd6 100644 --- a/common/modules/comment/widgets/views/form-project-comment.php +++ b/common/modules/comment/widgets/views/form-project-comment.php @@ -14,7 +14,7 @@
Добавить поле
+= Yii::t('add', 'add_field') ?>