diff --git a/common/models/Feedback.php b/common/models/Feedback.php index b30ee2a..af2c59e 100644 --- a/common/models/Feedback.php +++ b/common/models/Feedback.php @@ -13,6 +13,7 @@ * Class Feedback * * @property string $topic + * @property string $calc_json_info * * @package common\models */ @@ -20,7 +21,39 @@ { const SCENARIO_CALCULATOR = 'calculator'; + 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' + ]; + private $attributeValues = []; + + public function __set($name, $value) + { + if(in_array($name, self::calculator_attributes)){ + $this->attributeValues[$name] = $value; + } + else{ + parent::__set($name, $value); + } + } + + public function __get($name) + { + if(in_array($name, self::calculator_attributes)){ + return $this->attributeValues[$name]??''; + } + else{ + return parent::__get($name); + } + } + + public function getCalculatorAttributes(){ + return $this->attributeValues; + } + public function scenarios() { return array_merge( @@ -40,14 +73,16 @@ 'returnUrl', 'topic', ], - self::SCENARIO_CALCULATOR => [ - 'name', - 'phone', - 'returnUrl', - 'topic', - 'calc_json_info', - - ] + self::SCENARIO_CALCULATOR => array_merge( + [ + 'name', + 'phone', + 'returnUrl', + 'topic', + 'calc_json_info', + ], + self::calculator_attributes + ) ] ); } @@ -73,7 +108,15 @@ ], [ [ - 'calc_json_info' + 'name', + 'phone', + 'email', + 'returnUrl', + 'topic', + 'calc_json_info', + + 'adress', + 'module_install_angle' ], 'required', 'on' => self::SCENARIO_CALCULATOR, @@ -82,5 +125,13 @@ ); } + public function setCalcJsonInfo( array $value) + { + $this->calc_json_info = json_encode($value); + } + public function getCalcJsonInfo() : array + { + return json_decode($this->calc_json_info); + } } \ No newline at end of file diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 1ab03b7..9b45c48 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -158,11 +158,45 @@ if (empty(Yii::$app->request->post())) { throw new BadRequestHttpException(); } else { - $model = new Feedback(); - if ($model->load(Yii::$app->request->post()) && $model->save()) { + + switch (Yii::$app->request->post('topic')){ + case Feedback::SCENARIO_FEEDBACK : + $model = new Feedback(['scenario' => Feedback::SCENARIO_FEEDBACK]); + $view = 'feedback'; + $isLoaded = $model->load(Yii::$app->request->post()); + break; + + case Feedback::SCENARIO_CALLBACK : + $model = new Feedback(['scenario' => Feedback::SCENARIO_CALLBACK]); + $view = 'feedback'; + $isLoaded = $model->load(Yii::$app->request->post()); + break; + + case Feedback::SCENARIO_CALCULATOR: + $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); + break; + + default: + $model = new Feedback(); + $view = 'feedback'; + $isLoaded = $model->load(Yii::$app->request->post()); + } + + + if ($isLoaded && $model->save()) { $mailer->compose( - 'feedback', + $view, [ 'model' => $model, ] diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index ed9ab6c..ad6cafc 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -245,16 +245,11 @@
- setHeight(42) - ->renderImage( - [ - 'alt' => $settings->name, - ] - )*/ - ?> - <?= $settings->name; ?> + <?= $settings->name; ?>
about; ?>
@@ -270,16 +265,11 @@
- setHeight(42) - ->renderImage( - [ - 'alt' => $settings->name, - ] - )*/ - ?> - <?= $settings->name; ?> + <?= $settings->name; ?>
about; ?>
@@ -434,109 +424,239 @@

-
-
+ + Feedback::SCENARIO_CALCULATOR]); + + $form = ActiveForm::begin( + [ + 'id' => 'calculate-form', + 'method' => 'POST', + 'action' => '/site/feedback', + ] + ); + ?> + +
-

-
- - - -

-
-
- - - -

+

+ + field($feedback, 'topic') + ->hiddenInput(['value' => Feedback::SCENARIO_CALCULATOR]) + ->label(false)?> + + field($feedback, "name")->textInput()?> + field($feedback, "phone")->textInput()?> + field($feedback, "email")->textInput()?> + +
+
+ +
+
+

+
+
+ + field($feedback, "adress") + ->textInput() + ->label( + \Yii::t( + 'app', + 'address1' + ) + )?> + + field($feedback, "module_install_angle") + ->textInput() + ->label( + \Yii::t( + 'app', + 'install_modules' + ) + )?> + +
+ +
+

:

+ + field($feedback, "latitude") + ->textInput() + ->label( + \Yii::t( + 'app', + 'Latitude' + ) + )?> + + field($feedback, "longitude") + ->textInput() + ->label( + \Yii::t( + 'app', + 'Longitude' + ) + )?> + + field($feedback, "south_deviation") + ->textInput() + ->label( + \Yii::t( + 'app', + 'south_deviation' + ) + )?> + +
-
- - - -

+ +
+
+ +
+
+ +
+
-
-
-
-

-
-
-
- - - -

-
-
- - - -

-
+
+ +
+
+

+
+
+
+ + field($feedback, "power_station_type") + ->radioList( + [ + "Автономная" => "".\Yii::t('app', 'authonomous')."", + "Сетевая" => ''.\Yii::t('app', 'ses_network')."", + ], + [ + 'tag' => false, + 'unselect' => null, + 'encode' => false, + 'item' => function ($index, $label, $name, $checked, $value){ + $content = '
'; + + $content .= Html::radio( + $name, + ($index===0)?true:false, + [ + 'label' => $label, + 'value' => $value, + ] + ); + + $content .= '
'; + + return $content; + }, + ] + )->label(false)?> +
-
-

:

-
- - - -

+
+ +
+
+
+
+ + + +

+
-
- - - -

+
+
+ + + +

+
-
- - - -

+
+
+ + + +

+
-
-
-
-
+
+ + + + +
-

+

-
-
+
+
+
+
- + - +

- + - +

- + - +

@@ -545,46 +665,66 @@
+
-

+

- + - +

- + - +

- + - +

- + - +

- +

- +

+
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index 83c790f..13635ed 100644 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -40,7 +40,15 @@ JS; ); ?>
- Получить консультацию специалиста + + Получить консультацию специалиста +
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 137dc52..3c12a95 100644 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -19,7 +19,7 @@ $( f.reset(); $('#feedback-modal') .modal('hide'); - $(this).data('yiiActiveForm').validated = false; + form.data('yiiActiveForm').validated = false; $('#success-modal') .modal('show'); }, -- libgit2 0.21.4