Anastasia / energyforum

Commit e3f07d6734256dbe6da78530cf225e99213a824c

Authored by alex
1 parent 71f28ec9

need visa теперь обязательна и dropdown

Showing 8 changed files with 21 additions and 15 deletions   Show diff stats
Inline Side-by-side
backend/views/request/update.php
  Show/Hide comments   View file @e3f07d6
@@ -91,7 +91,13 @@ @@ -91,7 +91,13 @@
91 'class' => 'flat', 91 'class' => 'flat',
92 ] 92 ]
93 ) ?> 93 ) ?>
94 - 94 + <?= $form->field($model, 'need_visa')
  95 + ->dropDownList(
  96 + [
  97 + 0 => 'Нет',
  98 + 1 => 'Да',
  99 + ]
  100 + ) ?>
95 <?= $form->field($model, 'special_meal') 101 <?= $form->field($model, 'special_meal')
96 ->textInput() ?> 102 ->textInput() ?>
97 103
common/mail/request.php
  Show/Hide comments   View file @e3f07d6
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 </tr> 83 </tr>
84 <tr> 84 <tr>
85 <td><b>Нужна виза</b> :</td> 85 <td><b>Нужна виза</b> :</td>
86 - <td><?= $formatter->asBoolean($model->need_visa) ?></td> 86 + <td><?= ($model->need_visa==0)?'Нет':'Да' ?></td>
87 </tr> 87 </tr>
88 <tr> 88 <tr>
89 <td><b>Особенное питание</b> :</td> 89 <td><b>Особенное питание</b> :</td>
common/messages/en/app.php
  Show/Hide comments   View file @e3f07d6
@@ -88,7 +88,7 @@ return [ @@ -88,7 +88,7 @@ return [
88 88
89 89
90 'yes' => 'Yes', 90 'yes' => 'Yes',
91 - 91 + 'No' => 'No',
92 92
93 93
94 94
common/messages/fr/app.php
  Show/Hide comments   View file @e3f07d6
@@ -89,7 +89,7 @@ return [ @@ -89,7 +89,7 @@ return [
89 'Choose' => 'Sélectionner', 89 'Choose' => 'Sélectionner',
90 90
91 'yes' => 'Oui', 91 'yes' => 'Oui',
92 - 92 + 'No' => 'Non',
93 93
94 94
95 95
common/messages/ru/app.php
  Show/Hide comments   View file @e3f07d6
@@ -85,7 +85,7 @@ return [ @@ -85,7 +85,7 @@ return [
85 'Choose' => 'Выбрать', 85 'Choose' => 'Выбрать',
86 86
87 'yes' => 'Да', 87 'yes' => 'Да',
88 - 88 + 'No' => 'Нет',
89 89
90 90
91 91
common/messages/ua/app.php
  Show/Hide comments   View file @e3f07d6
@@ -87,7 +87,7 @@ return [ @@ -87,7 +87,7 @@ return [
87 87
88 88
89 'yes' => 'Так', 89 'yes' => 'Так',
90 - 90 + 'No' => 'Hi',
91 91
92 92
93 93
common/models/Customer.php
  Show/Hide comments   View file @e3f07d6
@@ -121,6 +121,7 @@ @@ -121,6 +121,7 @@
121 ], 121 ],
122 'boolean', 122 'boolean',
123 ], 123 ],
  124 +
124 [ 125 [
125 [ 126 [
126 'name', 127 'name',
@@ -179,6 +180,7 @@ @@ -179,6 +180,7 @@
179 'acceptance', 180 'acceptance',
180 'phone_office', 181 'phone_office',
181 'phone_other', 182 'phone_other',
  183 + 'need_visa'
182 ], 184 ],
183 'required', 185 'required',
184 ], 186 ],
frontend/views/site/signup.php
  Show/Hide comments   View file @e3f07d6
@@ -104,16 +104,14 @@ $js=$dp-&gt;getDatepickerJs(); @@ -104,16 +104,14 @@ $js=$dp-&gt;getDatepickerJs();
104 104
105 </div> 105 </div>
106 <div class="col-xs-12 col-sm-12 col-md-9 col-md-push-2 form-register-inputs-wr"> 106 <div class="col-xs-12 col-sm-12 col-md-9 col-md-push-2 form-register-inputs-wr">
107 - <div class="signup_text1">  
108 - <?php echo \Yii::t('app','Need visa');?>  
109 - </div>  
110 107
111 - <div class="input-wr sidebar_checks">  
112 - <?php echo $form->field($model, 'need_visa',[  
113 - 'template' => '{input}{label}',  
114 - ])  
115 - ->checkbox([], false)  
116 - ->label(\Yii::t('app', 'yes'))?> 108 + <div class="input-wr">
  109 +
  110 + <?php echo $form->field($model, 'need_visa')->dropDownList([
  111 + null => \Yii::t('app', 'Choose'),
  112 + 0 => \Yii::t('app', 'yes'),
  113 + 1 => \Yii::t('app', 'No'),
  114 + ],['class' => '','template' => '{input}{label}',])?>
117 </div> 115 </div>
118 116
119 </div> 117 </div>