Anastasia / energyforum

Commit 72471595323b5cb1cc97435972ca0cc0b2048bc8

Authored by alex
1 parent d9f2e233

1) Изменил содержимое письма о зарегистрированном пользователе 

2) Изменил вид update в backend/request/update
3) сделал обязательными поля телефонов
Showing 4 changed files with 126 additions and 77 deletions   Show diff stats
Inline Side-by-side
backend/views/request/update.php
  Show/Hide comments   View file @7247159
@@ -43,15 +43,24 @@ @@ -43,15 +43,24 @@
43 ] 43 ]
44 ) ?> 44 ) ?>
45 45
46 - <?= $form->field($model, 'secondname')  
47 - ->textInput() ?> 46 + <!-- --><?php /*echo $form->field($model, 'secondname')
  47 + ->textInput() */?>
48 48
49 <?= $form->field($model, 'name') 49 <?= $form->field($model, 'name')
50 ->textInput() ?> 50 ->textInput() ?>
51 51
52 - <?= $form->field($model, 'dignity') 52 + <?= $form->field($model, 'organization')
53 ->textInput() ?> 53 ->textInput() ?>
54 - 54 + <?= $form->field($model, 'email')
  55 + ?>
  56 + <?= $form->field($model, 'phone_office')
  57 + ->textInput() ?>
  58 + <?= $form->field($model, 'phone_other')
  59 + ->textInput() ?>
  60 + <?= $form->field($model, 'fax')
  61 + ->textInput() ?>
  62 + <?= $form->field($model, 'citizenship')
  63 + ->textInput() ?>
55 <?= $form->field($model, 'gender') 64 <?= $form->field($model, 'gender')
56 ->dropDownList( 65 ->dropDownList(
57 [ 66 [
@@ -63,39 +72,38 @@ @@ -63,39 +72,38 @@
63 <?= $form->field($model, 'birth') 72 <?= $form->field($model, 'birth')
64 ->textInput() ?> 73 ->textInput() ?>
65 74
66 - <?= $form->field($model, 'citizenship')  
67 - ->textInput() ?>  
68 -  
69 -  
70 - <?= $form->field($model, 'passport')  
71 - ->textInput() ?> 75 +
72 76
73 - <?= $form->field($model, 'email')  
74 - ->textInput() ?>  
75 77
76 - <?= $form->field($model, 'organization') 78 + <?= $form->field($model, 'passport_number')
77 ->textInput() ?> 79 ->textInput() ?>
78 -  
79 - <?= $form->field($model, 'conference')  
80 - ->checkbox(  
81 - [  
82 - 'class' => 'flat',  
83 - ]  
84 - ) ?>  
85 -  
86 - <?= $form->field($model, 'geee')  
87 - ->checkbox(  
88 - [  
89 - 'class' => 'flat',  
90 - ]  
91 - ) ?>  
92 -  
93 - <?= $form->field($model, 'gere')  
94 - ->checkbox(  
95 - [  
96 - 'class' => 'flat',  
97 - ]  
98 - ) ?> 80 + <?= $form->field($model, 'passport_date')
  81 + ->textInput() ?>
  82 + <?= $form->field($model, 'passport_place')
  83 + ->textInput() ?>
  84 + <?= $form->field($model, 'passport_valid')
  85 + ->textInput() ?>
  86 + <?= $form->field($model, 'need_visa')
  87 + ->checkbox(
  88 + [
  89 + 'class' => 'flat',
  90 + ]
  91 + ) ?>
  92 +
  93 + <?= $form->field($model, 'special_meal')
  94 + ->textInput() ?>
  95 +
  96 + <?php echo $form->field($model, 'working_lang')
  97 + ->dropDownList([
  98 + 2 => \Yii::t('app', "RusW"),
  99 + 1 => \Yii::t('app', 'EngW'),
  100 + 4 => \Yii::t('app', 'FrW'),
  101 + ]);
  102 +
  103 + ?>
  104 +
  105 +
  106 +
99 107
100 <div class="style buttons-page-wr"> 108 <div class="style buttons-page-wr">
101 <a href="<?= $model->image ?>" class="btn btn-success" download=>Скачать фото <i class="fa fa-download"></i></a> 109 <a href="<?= $model->image ?>" class="btn btn-success" download=>Скачать фото <i class="fa fa-download"></i></a>
common/mail/request.php
  Show/Hide comments   View file @7247159
@@ -13,17 +13,33 @@ @@ -13,17 +13,33 @@
13 13
14 <table> 14 <table>
15 <tr> 15 <tr>
16 - <td><b>Фамилия</b> :</td>  
17 - <td><?= $formatter->asText($model->secondname) ?></td>  
18 - </tr>  
19 - <tr>  
20 - <td><b>Имя</b> :</td> 16 + <td><b>Имя/Фамилия</b> :</td>
21 <td><?= $formatter->asText($model->name) ?></td> 17 <td><?= $formatter->asText($model->name) ?></td>
22 </tr> 18 </tr>
23 - <tr>  
24 - <td><b>Титул</b> :</td>  
25 - <td><?= $formatter->asText($model->dignity) ?></td>  
26 - </tr> 19 + <tr>
  20 + <td><b>Должность</b> :</td>
  21 + <td><?= $formatter->asText($model->organization) ?></td>
  22 + </tr>
  23 + <tr>
  24 + <td><b>Официальный почтовый адресс</b> :</td>
  25 + <td><?= $formatter->asText($model->email) ?></td>
  26 + </tr>
  27 + <tr>
  28 + <td><b>Телефон (рабочий)</b> :</td>
  29 + <td><?= $formatter->asText($model->phone_office) ?></td>
  30 + </tr>
  31 + <tr>
  32 + <td><b>Телефон (дополнительный)</b> :</td>
  33 + <td><?= $formatter->asText($model->phone_other) ?></td>
  34 + </tr>
  35 + <tr>
  36 + <td><b>Факс</b> :</td>
  37 + <td><?= $formatter->asText($model->fax) ?></td>
  38 + </tr>
  39 + <tr>
  40 + <td><b>Страна\организация</b> :</td>
  41 + <td><?= $formatter->asText($model->citizenship) ?></td>
  42 + </tr>
27 <tr> 43 <tr>
28 <td><b>Пол</b> :</td> 44 <td><b>Пол</b> :</td>
29 <td><?php 45 <td><?php
@@ -40,32 +56,54 @@ @@ -40,32 +56,54 @@
40 <td><b>Дата рождения</b> :</td> 56 <td><b>Дата рождения</b> :</td>
41 <td><?= $formatter->asText($model->birth) ?></td> 57 <td><?= $formatter->asText($model->birth) ?></td>
42 </tr> 58 </tr>
43 - <tr>  
44 - <td><b>Гражданство</b> :</td>  
45 - <td><?= $formatter->asText($model->citizenship) ?></td>  
46 - </tr>  
47 - <tr>  
48 - <td><b>Паспорт</b> :</td>  
49 - <td><?= $formatter->asText($model->passport) ?></td>  
50 - </tr>  
51 - <tr>  
52 - <td><b>Email</b> :</td>  
53 - <td><?= $formatter->asText($model->email) ?></td>  
54 - </tr>  
55 - <tr>  
56 - <td><b>Должность</b> :</td>  
57 - <td><?= $formatter->asText($model->organization) ?></td>  
58 - </tr>  
59 - <tr>  
60 - <td><b>Министерская конференция</b> :</td>  
61 - <td><?= $formatter->asBoolean($model->conference) ?></td>  
62 - </tr>  
63 - <tr>  
64 - <td><b>GEEE</b> :</td>  
65 - <td><?= $formatter->asBoolean($model->geee) ?></td>  
66 - </tr>  
67 - <tr>  
68 - <td><b>GERE</b> :</td>  
69 - <td><?= $formatter->asBoolean($model->gere) ?></td>  
70 - </tr> 59 + <tr>
  60 + <td colspan="2" align="center">
  61 + <b>Паспортные данные</b>
  62 + </td>
  63 + </tr>
  64 + <tr>
  65 + <td><b>Серия, номер</b> :</td>
  66 + <td><?= $formatter->asText($model->passport_number) ?></td>
  67 + </tr>
  68 + <tr>
  69 + <td><b>Дата выдачи</b> :</td>
  70 + <td><?= $formatter->asText($model->passport_date) ?></td>
  71 + </tr>
  72 + <tr>
  73 + <td><b>Орган выдачи</b> :</td>
  74 + <td><?= $formatter->asText($model->passport_place) ?></td>
  75 + </tr>
  76 + <tr>
  77 + <td><b>Действителен до</b> :</td>
  78 + <td><?= $formatter->asText($model->passport_valid) ?></td>
  79 + </tr>
  80 + <tr>
  81 + <td><b>Нужна виза</b> :</td>
  82 + <td><?= $formatter->asBoolean($model->need_visa) ?></td>
  83 + </tr>
  84 + <tr>
  85 + <td><b>Особенное питание</b> :</td>
  86 + <td><?= $formatter->asText($model->special_meal) ?></td>
  87 + </tr>
  88 + <tr>
  89 + <td><b>Рабочий язык</b> :</td>
  90 + <td><?php
  91 +
  92 + switch ($model->working_lang){
  93 + case 2:
  94 + echo "Русский";
  95 + break;
  96 + case 1:
  97 + echo "Английский";
  98 + break;
  99 + case 4:
  100 + echo "Французкий";
  101 + break;
  102 + default:
  103 + echo "Русский";
  104 + break;
  105 + }
  106 +
  107 + ?></td>
  108 + </tr>
71 </table> 109 </table>
common/models/Customer.php
  Show/Hide comments   View file @7247159
@@ -57,10 +57,10 @@ @@ -57,10 +57,10 @@
57 const STATUS_ACTIVE = 1; 57 const STATUS_ACTIVE = 1;
58 const STATUS_NO = 0; 58 const STATUS_NO = 0;
59 59
60 - const MEAL_1 = 'halal';  
61 - const MEAL_2 = 'kashrut';  
62 - const MEAL_3 = 'vegetarian';  
63 - const MEAL_NONE = 'none'; 60 + const MEAL_1 = 'Халяль';
  61 + const MEAL_2 = 'Кашрут';
  62 + const MEAL_3 = 'Вегитарианець';
  63 + const MEAL_NONE = 'Не выбрано';
64 64
65 65
66 66
@@ -173,7 +173,9 @@ @@ -173,7 +173,9 @@
173 'passport_place', 173 'passport_place',
174 'passport_valid', 174 'passport_valid',
175 'need_visa', 175 'need_visa',
176 - 'acceptance' 176 + 'acceptance',
  177 + 'phone_office',
  178 + 'phone_other',
177 ], 179 ],
178 'required', 180 'required',
179 ], 181 ],
frontend/controllers/SiteController.php
  Show/Hide comments   View file @7247159
@@ -230,7 +230,8 @@ @@ -230,7 +230,8 @@
230 [ 230 [
231 'kennen.md@gmail.com', 231 'kennen.md@gmail.com',
232 'kazimirova.artweb@gmail.com', 232 'kazimirova.artweb@gmail.com',
233 - 'energyforum@euromediacompany.com' 233 + 'energyforum@euromediacompany.com',
  234 + 'foodstraiker@gmail.com',
234 ] 235 ]
235 ) 236 )
236 ->setSubject('U have request!') 237 ->setSubject('U have request!')