diff --git a/common/mail/calculator.php b/common/mail/calculator.php
new file mode 100644
index 0000000..def50f0
--- /dev/null
+++ b/common/mail/calculator.php
@@ -0,0 +1,35 @@
+<?php
+    use common\models\Feedback;
+    use yii\web\View;
+    
+    /**
+     * @var View     $this
+     * @var Feedback $model
+     */
+
+?>
+
+<table>
+    <tbody>
+        <tr>
+            <td><b><?= \Yii::t('app', 'Name: ') ?></b></td>
+            <td><?= $model->name ?></td>
+        </tr>
+        <tr>
+            <td><b><?= \Yii::t('app', 'Topic: ') ?></b></td>
+            <td><?= $model->topic ?></td>
+        </tr>
+        <tr>
+            <td><b><?= \Yii::t('app', 'Phone: ') ?></b></td>
+            <td><?= $model->phone ?></td>
+        </tr>
+        <tr>
+            <td><b><?= \Yii::t('app', 'Email: ') ?></b></td>
+            <td><?= $model->email ?></td>
+        </tr>
+        <tr>
+            <td><b><?= \Yii::t('app', 'JSON string: ') ?></b></td>
+            <td><?= $model->calc_json_info ?></td>
+        </tr>
+    </tbody>
+</table>
diff --git a/common/models/Feedback.php b/common/models/Feedback.php
index af2c59e..8149dc6 100644
--- a/common/models/Feedback.php
+++ b/common/models/Feedback.php
@@ -24,16 +24,18 @@
         const calculator_attributes = [
             'adress', 'module_install_angle', 'latitude', 'longitude',
             'south_deviation', 'power_station_type', 'area', 'power',
-            'budget', 'day_consumption', 'month_consumption', 'consumptors_total_power',
-            'autonomous_days'
+            'budget', 'auth_day', 'auth_month', 'auth_pwr_all',
+            'auth_pwr_days'
         ];
-        
-        private $attributeValues = [];
+    
+        public $attributeValues = [];
         
         public function __set($name, $value)
         {
             if(in_array($name, self::calculator_attributes)){
-                $this->attributeValues[$name] = $value;
+                if(isset($value) && !empty($value)){
+                    $this->attributeValues[$name] = $value;
+                }
             }
             else{
                 parent::__set($name, $value);
@@ -111,7 +113,6 @@
                             'name',
                             'phone',
                             'email',
-                            'returnUrl',
                             'topic',
                             'calc_json_info',
                             
@@ -125,9 +126,9 @@
             );
         }
         
-        public function setCalcJsonInfo( array $value)
+        public function setCalcJsonInfo()
         {
-            $this->calc_json_info = json_encode($value);
+            $this->calc_json_info = json_encode($this->attributeValues);
         }
         
         public function getCalcJsonInfo() : array
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 366760d..c1f0c86 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -160,8 +160,8 @@
             if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
-                
-                switch (Yii::$app->request->post('topic')){
+                $post = Yii::$app->request->post('Feedback');
+                switch ($post['topic']){
                     case Feedback::SCENARIO_FEEDBACK :
                         $model = new Feedback(['scenario' => Feedback::SCENARIO_FEEDBACK]);
                         $view = 'feedback';
@@ -178,14 +178,7 @@
                         $model = new Feedback(['scenario' => Feedback::SCENARIO_CALCULATOR]);
                         $view = 'calculator';
                         $isLoaded = $model->load(Yii::$app->request->post());
-                        $newPost = [];
-                        foreach (Feedback::calculator_attributes as $calculator_attribute_name){
-                            $calculator_attribute_value = Yii::$app->request->post($calculator_attribute_name);
-                            if( isset($calculator_attribute_value) && !empty($calculator_attribute_value) ){
-                                $newPost[$calculator_attribute_name] = $calculator_attribute_value;
-                            }
-                        }
-                        $model->setCalcJsonInfo($newPost);
+                        $model->setCalcJsonInfo();
                         break;
                         
                     default:
@@ -216,6 +209,8 @@
                     return [
                         'success' => true,
                         'message' => 'Success message',
+                        'view' => $view,
+                        'model' => $model->attributeValues,
                         'alert'   => $this->renderPartial('success_alert'),
                     ];
                 } else {
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index ad6cafc..5fcb57c 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -565,165 +565,98 @@
                                             <div class="col-md-12">
                                                 <div class="row">
                                                     <div class="col-md-4">
-                                                        <div class="form-group field-calculate-email">
-                                                            <label class="control-label"><?= \Yii::t(
-                                                                    'app',
-                                                                    'info_area'
-                                                                ) ?></label>
-                                                            <input type="text" class="form-control">
-                                
-                                                            <p class="help-block help-block-error"></p>
-                                                        </div>
+                                                        <?= $form->field($feedback, "area")
+                                                                 ->textInput()
+                                                                 ->label(
+                                                                     \Yii::t(
+                                                                         'app',
+                                                                         'info_area'
+                                                                     )
+                                                                 )?>
                                                     </div>
                                                     <div class="col-md-4">
-                                                        <div class="form-group field-calculate-email">
-                                                            <label class="control-label"><?= \Yii::t(
-                                                                    'app',
-                                                                    'info_power'
-                                                                ) ?></label>
-                                                            <input type="text" class="form-control">
-                                
-                                                            <p class="help-block help-block-error"></p>
-                                                        </div>
+                                                        <?= $form->field($feedback, "power")
+                                                                 ->textInput()
+                                                                 ->label(
+                                                                     \Yii::t(
+                                                                         'app',
+                                                                         'info_power'
+                                                                     )
+                                                                 )?>
                                                     </div>
                                                     <div class="col-md-4">
-                                                        <div class="form-group field-calculate-email">
-                                                            <label class="control-label"><?= \Yii::t(
-                                                                    'app',
-                                                                    'info_budget'
-                                                                ) ?></label>
-                                                            <input type="text" class="form-control">
-                                
-                                                            <p class="help-block help-block-error"></p>
-                                                        </div>
+                                                        <?= $form->field($feedback, "budget")
+                                                                 ->textInput()
+                                                                 ->label(
+                                                                     \Yii::t(
+                                                                         'app',
+                                                                         'info_budget'
+                                                                     )
+                                                                 )?>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                
-                                <?php $form::end()?>
     
-                                <form action="" id="calculate-form">
-                                    
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <p style="font-weight:bold;"><?= \Yii::t('app', 'info_power_ses') ?></p>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="row" style="margin-bottom: 15px;">
-                                                        <div class="col-md-3 col-sm-12 col-xs-12">
-                                                            <input class="custom-radio" id="custom-radio-Автономная" type="radio" name="Calculate[mode]" value="Автономная"><label for="custom-radio-Автономная"></label><span style="margin-left:5px;"><?= \Yii::t(
-                                                                    'app',
-                                                                    'authonomous'
-                                                                ) ?></span></div>
-                                                        <div class="col-md-3 col-sm-12 col-xs-12">
-                                                            <input class="custom-radio" id="custom-radio-Сетевая" type="radio" name="Calculate[mode]" value="Сетевая"><label for="custom-radio-Сетевая"></label><span style="margin-left:5px;"><?= \Yii::t(
-                                                                    'app',
-                                                                    'ses_network'
-                                                                ) ?></span></div>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-12">
-                                                    <div class="row">
-                                                        <div class="col-md-4">
-                                                            <div class="form-group field-calculate-email">
-                                                                <label class="control-label"><?= \Yii::t(
-                                                                        'app',
-                                                                        'info_area'
-                                                                    ) ?></label>
-                                                                <input type="text" class="form-control">
-                                    
-                                                                <p class="help-block help-block-error"></p>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-4">
-                                                            <div class="form-group field-calculate-email">
-                                                                <label class="control-label"><?= \Yii::t(
-                                                                        'app',
-                                                                        'info_power'
-                                                                    ) ?></label>
-                                                                <input type="text" class="form-control">
-                                    
-                                                                <p class="help-block help-block-error"></p>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-4">
-                                                            <div class="form-group field-calculate-email">
-                                                                <label class="control-label"><?= \Yii::t(
-                                                                        'app',
-                                                                        'info_budget'
-                                                                    ) ?></label>
-                                                                <input type="text" class="form-control">
-                                    
-                                                                <p class="help-block help-block-error"></p>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <p style="font-weight:bold;"><?= \Yii::t(
-                                                    'app',
-                                                    'info_power_ses_auth'
-                                                ) ?></p>
-                                            <div class="row">
-                                                <div class="col-md-6">
-                                                    <div class="form-group field-calculate-email">
-                                                        <label class="control-label"><?= \Yii::t(
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <p style="font-weight:bold;"><?= \Yii::t(
+                                                'app',
+                                                'info_power_ses_auth'
+                                            ) ?></p>
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <?=$form->field($feedback, "auth_day")
+                                                        ->textInput()
+                                                        ->label(
+                                                            \Yii::t(
                                                                 'app',
                                                                 'info_auth_day'
-                                                            ) ?></label>
-                                                        <input type="text" class="form-control">
-                            
-                                                        <p class="help-block help-block-error"></p>
-                                                    </div>
-                                                    <div class="form-group field-calculate-email">
-                                                        <label class="control-label"><?= \Yii::t(
+                                                            )
+                                                        )?>
+                                                
+                                                <?=$form->field($feedback, "auth_month")
+                                                        ->textInput()
+                                                        ->label(
+                                                            \Yii::t(
                                                                 'app',
                                                                 'info_auth_month'
-                                                            ) ?></label>
-                                                        <input type="text" class="form-control">
-                            
-                                                        <p class="help-block help-block-error"></p>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-6">
-                                                    <div class="form-group field-calculate-email">
-                                                        <label class="control-label"><?= \Yii::t(
+                                                            )
+                                                        )?>
+                                            </div>
+                                            
+                                            <div class="col-md-6">
+                                                <?=$form->field($feedback, "auth_pwr_all")
+                                                        ->textInput()
+                                                        ->label(
+                                                            \Yii::t(
                                                                 'app',
                                                                 'info_auth_pwr_all'
-                                                            ) ?></label>
-                                                        <input type="text" class="form-control">
-                            
-                                                        <p class="help-block help-block-error"></p>
-                                                    </div>
-                                                    <div class="form-group field-calculate-email">
-                                                        <label class="control-label"><?= \Yii::t(
+                                                            )
+                                                        )?>
+                                                <?=$form->field($feedback, "auth_pwr_days")
+                                                        ->textInput()
+                                                        ->label(
+                                                            \Yii::t(
                                                                 'app',
                                                                 'info_auth_pwr_days'
-                                                            ) ?></label>
-                                                        <input type="text" class="form-control">
-                            
-                                                        <p class="help-block help-block-error"></p>
-                                                    </div>
-                                                </div>
+                                                            )
+                                                        )?>
                                             </div>
                                         </div>
                                     </div>
-        
-                                    <p class="text-center submit-wr">
-                                        <button type="submit" class="send-form btn btn-lg btn-template-primary"><?= \Yii::t(
-                                                'app',
-                                                'info_calculate'
-                                            ) ?></button>
-                                    </p>
-                                </form>
+                                </div>
+    
+                                <p class="text-center submit-wr">
+                                    <button type="submit" class="send-form btn btn-lg btn-template-primary"><?= \Yii::t(
+                                            'app',
+                                            'info_calculate'
+                                        ) ?></button>
+                                </p>
+                                
+                                <?php $form::end()?>
                                 
                             </div>
                         </div>
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js
index 3c12a95..a91de16 100644
--- a/frontend/web/js/script.js
+++ b/frontend/web/js/script.js
@@ -6,7 +6,7 @@ $(
          */
         $(document)
             .on(
-                'beforeSubmit', '#feedback-form', function(e) {
+                'beforeSubmit', '#calculate-form, #feedback-form', function(e) {
                     var f = this;
                     var form = $(this);
                     var formData = form.serialize();
@@ -17,7 +17,7 @@ $(
                             data: formData,
                             success: function(data) {
                                 f.reset();
-                                $('#feedback-modal')
+                                $('#feedback-modal,#calculate-modal')
                                     .modal('hide');
                                 form.data('yiiActiveForm').validated = false;
                                 $('#success-modal')
@@ -32,7 +32,7 @@ $(
                 }
             )
             .on(
-                'submit', '#feedback-form', function(e) {
+                'submit', '#calculate-form, #feedback-form', function(e) {
                     e.preventDefault();
                 }
             );
--
libgit2 0.21.4