diff --git a/backend/views/request/update.php b/backend/views/request/update.php index 940b8d6..6b5ffbf 100644 --- a/backend/views/request/update.php +++ b/backend/views/request/update.php @@ -53,6 +53,8 @@ ->textInput() ?> field($model, 'email') ?> + field($model, 'post_address') + ->textInput() ?> field($model, 'phone_office') ->textInput() ?> field($model, 'phone_other') @@ -93,6 +95,7 @@ field($model, 'special_meal') ->textInput() ?> + field($model, 'working_lang') ->dropDownList([ 2 => \Yii::t('app', "RusW"), diff --git a/common/config/params.php b/common/config/params.php index 4ec9ba6..fd3f54a 100755 --- a/common/config/params.php +++ b/common/config/params.php @@ -1,6 +1,12 @@ 'admin@example.com', - 'supportEmail' => 'support@example.com', + 'adminEmail' => 'admin@example.com', + 'supportEmail' => 'support@example.com', 'user.passwordResetTokenExpire' => 3600, + 'pdf_instruction' => [ + 'ru' => 'Kyiv_-_EM_and_9th_Forum_-_OverviewHyper_MASTER_07-5_Clean.pdf', + 'en' => 'Kyiv_-_EM_and_9th_Forum_-_OverviewHyper_MASTER_07-5_Clean.pdf', + 'ua' => 'Ukraine - EM and 9th Forum-UKR.pdf', + 'fr' => 'fr_agenda.pdf', + ] ]; diff --git a/common/helpers/datePickerData.php b/common/helpers/datePickerData.php index bbbc169..c4b1d99 100644 --- a/common/helpers/datePickerData.php +++ b/common/helpers/datePickerData.php @@ -26,6 +26,7 @@ class datePickerData private function initJsDatePicker(){ $this->result['ru']=<<result['en']=<<result['ua']=<<result['fr']=<< Официальный почтовый адресс : + asText($model->post_address) ?> + + + Email : asText($model->email) ?> diff --git a/common/messages/en/app.php b/common/messages/en/app.php index 56f7d55..893826a 100644 --- a/common/messages/en/app.php +++ b/common/messages/en/app.php @@ -9,7 +9,8 @@ return [ 'Birth' => 'Date of birth', 'Citizenship' => 'Сountry/organization represented', 'Passport' => 'Series and passport number', - 'Email' => 'Official mailing address (for dispatch of documents)', + 'Post address' => 'Official mailing address (for dispatch of documents)', + 'Email' => 'E-mail', 'Organization' => 'Professional title', 'Participation in events' => 'Participation in events', diff --git a/common/messages/fr/app.php b/common/messages/fr/app.php index 6f34800..64b6b56 100644 --- a/common/messages/fr/app.php +++ b/common/messages/fr/app.php @@ -10,7 +10,8 @@ return [ 'Birth' => 'Date de naissance', 'Citizenship' => 'Pays / organisation representee', 'Passport' => 'Série et numéro de passeport', - 'Email' => 'Adresse postale officielle (pour l\'envoi de documents)', + 'Post address' => 'Adresse postale officielle (pour l\'envoi de documents)', + 'Email' => 'E-mail', 'Organization' => 'Titre professionnel', diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php index 6bba33c..6927ea7 100644 --- a/common/messages/ru/app.php +++ b/common/messages/ru/app.php @@ -10,7 +10,8 @@ return [ 'Birth' => 'Дата рождения', 'Citizenship' => 'Страна\организация', 'Passport' => 'Серия и номер паспорта', - 'Email' => 'Официальный почтовый адресс (для отправки документов)', + 'Post address' => 'Официальный почтовый адресс (для отправки документов)', + 'Email' => 'Е-мейл', 'Organization' => 'Должность', 'Conference' => 'Министерская конференция', diff --git a/common/messages/ua/app.php b/common/messages/ua/app.php index fda990f..6999023 100644 --- a/common/messages/ua/app.php +++ b/common/messages/ua/app.php @@ -10,7 +10,8 @@ return [ 'Birth' => 'Дата народження', 'Citizenship' => 'Країна/Організація', 'Passport' => 'Серія та номер паспорта', - 'Email' => 'Офіційна поштова адреса (для відправки документів)', + 'Post address' => 'Офіційна поштова адреса (для відправки документів)', + 'Email' => 'Е-мейл', 'Organization' => 'Посада', 'Conference' => 'Міністерська конференція', diff --git a/common/models/Customer.php b/common/models/Customer.php index 2176e24..0d096a4 100644 --- a/common/models/Customer.php +++ b/common/models/Customer.php @@ -46,6 +46,7 @@ * @property boolean $meal_vegan * * @property integer $working_lang + * @property string $post_address ==> официальный почтовый адрес */ class Customer extends \yii\db\ActiveRecord { @@ -135,6 +136,7 @@ 'passport_number', 'passport_date', 'passport_valid', + 'post_address' ], 'string', 'max' => 255, @@ -168,6 +170,7 @@ 'citizenship', #'passport', 'email', + 'post_address', 'passport_number', 'passport_date', 'passport_place', @@ -179,6 +182,9 @@ ], 'required', ], + [['phone_office', + 'phone_other' + ],'match','pattern'=>'#^[\d\s]+$#'], [ ['acceptance'], 'compare', @@ -224,6 +230,7 @@ 'acceptance' => Yii::t('app', 'acceptance'), 'working_lang' => Yii::t('app', 'Working language'), 'special_meal' => Yii::t('app', 'Special meal'), + 'post_address' => Yii::t('app', 'Post address'), ]; } diff --git a/console/migrations/m180906_190153_customer_add_column_post.php b/console/migrations/m180906_190153_customer_add_column_post.php new file mode 100644 index 0000000..769998e --- /dev/null +++ b/console/migrations/m180906_190153_customer_add_column_post.php @@ -0,0 +1,23 @@ +addColumn('customer','post_address', + $this->string(255) + ->comment("Официальный почтовый адрес")); + } + + public function down() + { + $this->dropColumn('customer','post_address'); + } + +} diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index dc427a2..3896c5c 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -200,6 +200,9 @@ return $this->redirect([ 'site/index' ]); } + else{ + die(var_dump($model->errors)); + } } return $this->render( diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 2664731..e43324c 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -76,6 +76,9 @@ JS; $this->registerJs($js, View::POS_READY); } + $currentLang=\artbox\core\models\Language::getCurrent()->url; + + ?> beginPage() ?> @@ -149,7 +152,7 @@ JS; if($category->id==4){ ?> - devicedetect->isMobile()){ ?> diff --git a/frontend/views/site/signup.php b/frontend/views/site/signup.php index bafdd62..e76d632 100755 --- a/frontend/views/site/signup.php +++ b/frontend/views/site/signup.php @@ -45,9 +45,13 @@ $js=$dp->getDatepickerJs();
field($model, 'email')->textInput(['class' => ''])?>
-
- field($model, 'phone_office')->textInput(['class' => ''])?> + field($model, 'post_address')->textInput(['class' => ''])?> +
+
+ field($model, 'phone_office') + ->textInput(['class' => '']) + ?>
diff --git a/frontend/web/pdf/Ukraine - EM and 9th Forum-UKR.pdf b/frontend/web/pdf/Ukraine - EM and 9th Forum-UKR.pdf new file mode 100644 index 0000000..b9b7553 Binary files /dev/null and b/frontend/web/pdf/Ukraine - EM and 9th Forum-UKR.pdf differ diff --git a/frontend/web/pdf/fr_agenda.pdf b/frontend/web/pdf/fr_agenda.pdf new file mode 100644 index 0000000..b7608b7 Binary files /dev/null and b/frontend/web/pdf/fr_agenda.pdf differ -- libgit2 0.21.4