little form and letter view fix

alex
1 parent 8a7ade31
Showing 3 changed files with 28 additions and 5 deletions Show diff stats
common/mail/request.php
common/models/Customer.php
frontend/views/site/signup.php
@@ -21,9 +21,29 @@
         <td><?= $formatter->asText($model->organization) ?></td>
     </tr>
     <tr>
+
         <td><b>Рабочий статус делегата:</b> :</td>
-        <td><?= $formatter->asText(\Yii::t('app',
-                $model::WORK_STATUS_.$model->user_work_status)) ?></td>
+        <td><?php
+            $workStatus=false;
+            switch ($model->user_work_status){
+                case 0:
+                    $workStatus=$model::WORK_STATUS_0;
+                    break;
+	            case 1:
+		            $workStatus=$model::WORK_STATUS_1;
+		            break;
+	            case 2:
+		            $workStatus=$model::WORK_STATUS_2;
+		            break;
+		            case 3:
+	            $workStatus=$model::WORK_STATUS_3;
+	            break;
+	            case 4:
+		            $workStatus=$model::WORK_STATUS_4;
+		            break;
+            }
+            echo \Yii::t('app',
+                $workStatus,[],'ru') ?></td>
     </tr>
     <tr>
         <td><b>Официальный почтовый адресс</b> :</td>
@@ -208,6 +208,9 @@
 		            'in',
 		            'range' => [
 			            '0',
+			            '1',
+			            '2',
+			            '3',
 			            '4',
 		            ],
 	            ],
@@ -232,7 +235,7 @@
                         'need_visa',
 	                    'nationality',
 	                    'country_from',
-	                    'work_status',
+	                    'user_work_status',
                     ],
                     'required',
                 ],
@@ -39,7 +39,7 @@ $js=$dp-&gt;getDatepickerJs();
                     <div class="input-wr">
                       <?=$form->field($model, 'name')->textInput(['class' => ''])?>
                     </div>
-                      <div class="col-xs-12 col-sm-12 col-md-9 col-md-push-2 form-register-inputs-wr">
+
                           <div class="input-wr">
@@ -53,7 +53,7 @@ $js=$dp-&gt;getDatepickerJs();
 			                  ],['class' => '','template' => '{input}{label}',])?>
                           </div>
-                      </div>
+
                       <div class="input-wr">
 		                  <?=$form->field($model, 'organization')->textInput(['class' => ''])?>
                       </div>