Merge remote-tracking branch 'origin/master'

common/modules/bids/models/Bid.php

@@ -27,6 +27,7 @@ class Bid extends \common\components\ActiveRecordModel
     const FORM_MESSAGE = 'message';
 
     const TAG_INVOLVEMENT = 'Вовлечение';
+    const TAG_TREATMENT = 'Обращение';
 
     const FILE_FOLDER = '/uploads/bids/';
 
@@ -66,7 +67,13 @@ class Bid extends \common\components\ActiveRecordModel
     public function rules()
     {
         return [
-            [['name', 'phone', 'email'], 'required', 'on' => self::SCENARIO_PROJECT],
+            ['phone', 'required', 'when' => function($model) {
+                return !$model->email;
+            }, 'on' => self::SCENARIO_PROJECT],
+            ['email', 'required', 'when' => function($model) {
+                return !$model->phone;
+            }, 'on' => self::SCENARIO_PROJECT],
+
             [['email'], 'email'],
 
             [['name', 'phone'], 'required', 'on' => self::SCENARIO_CALLBACK],

common/modules/content/models/CoContentLang.php

@@ -136,7 +136,7 @@ class CoContentLang extends \common\components\ActiveRecordModel
         $arrWhatReplaceNext[] = '[projects]';
         $arrReplaceNext[] = CoBlocks::printStaticBlock('projects');
         $arrWhatReplaceNext[] = '[case-subscribe]';
-        $arrReplaceNext[] = CoBlocks::printStaticBlock('case-subscribe');
+        $arrReplaceNext[] = CoBlocks::printStaticBlock('case-subscribe', ['title' => $this->title]);
         $arrWhatReplaceNext[] = '[case-more]';
         $arrReplaceNext[] = CoBlocks::printStaticBlock('case-more', ['model' => $this->content]);
         $arrWhatReplaceNext[] = '[footer]';

frontend/views/layouts/block/callback.php

@@ -14,17 +14,22 @@ use common\modules\bids\models\Bid;
         <?php 
         $model = new Bid;
         $model->scenario = Bid::SCENARIO_CALLBACK;
+        $model->form = Bid::FORM_CALLBACK;
 
         $form = ActiveForm::begin([
             'action' => '/',
+            'enableClientValidation' => false,
             'options' => [
                 'class' => 'valid_form bids-form',
+                'data-title' => 'Заказать звонок',
+                'data-form' => 'Заказать звонок',
+                'data-tag' => Bid::TAG_TREATMENT
             ],
         ]); ?>
 
             <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-            <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_CALLBACK, ['class' => 'not_clear']); ?>
+            <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
             <?php echo $form->field($model, 'name', [
                 'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',

frontend/views/layouts/block/case-more.php

@@ -45,17 +45,22 @@ $more = CoContent::find()
                     <?php 
                     $model = new Bid;
                     $model->scenario = Bid::SCENARIO_SUBSCRIBE;
+                    $model->form = Bid::FORM_SUBSCRIBE;
 
                     $form = ActiveForm::begin([
                         'action' => '/',
+                        'enableClientValidation' => false,
                         'options' => [
                             'class' => 'subsc_form bids-form',
+                            'data-title' => 'Кейс: ' . $title,
+                            'data-form' => 'Подписаться на обновление',
+                            'data-tag' => Bid::TAG_INVOLVEMENT
                         ],
                     ]); ?>
 
                         <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-                        <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_SUBSCRIBE, ['class' => 'not_clear']); ?>
+                        <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
                         <?php echo $form->field($model, 'email', [
                             'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',

frontend/views/layouts/footer-index.php

@@ -18,25 +18,29 @@ use common\modules\bids\models\Bid;
                     <?php 
                     $model = new Bid;
                     $model->scenario = Bid::SCENARIO_PROJECT;
+                    $model->form = Bid::FORM_PROJECT;
 
                     $form = ActiveForm::begin([
                         'id' => 'form_foot',
                         'action' => '/',
+                        'enableClientValidation' => false,
                         'options' => [
                             'class' => 'footer_form bids-form',
-                            'enctype' => 'multipart/form-data'
+                            'data-title' => 'Рассчитать проект',
+                            'data-form' => 'Рассчитать проект',
+                            'data-tag' => Bid::TAG_TREATMENT
                         ],
                     ]); ?>
     
                         <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-                        <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_PROJECT, ['class' => 'not_clear']); ?>
+                        <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
                         <?php echo $form->field($model, 'name', [
                             'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
                             'errorOptions' => []
                         ])->textInput([
-                            'placeholder' => 'Ваше имя*',
+                            'placeholder' => 'Ваше имя',
                             'class' => 'footer_form__input'
                         ]); ?>
 
@@ -44,7 +48,7 @@ use common\modules\bids\models\Bid;
                             'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
                             'errorOptions' => []
                         ])->textInput([
-                            'placeholder' => 'Телефон*',
+                            'placeholder' => 'Телефон',
                             'class' => 'footer_form__input'
                         ]); ?>
 

frontend/views/layouts/head.php

@@ -2,7 +2,7 @@
 
 use common\modules\languages\models\Languages;
 
-$langs = Languages::find()->all();
+$langs = Languages::find()->where(['!=', 'id', Languages::getCurrent()->id])->all();
 ?>	
 
 <meta name="title" content="<?php echo \Yii::$app->controller->meta_title?>">

frontend/views/site/contacts.php

@@ -82,25 +82,29 @@ use \common\modules\bids\models\Bid;
                     <?php 
                     $model = new Bid;
                     $model->scenario = Bid::SCENARIO_CALLBACK;
+                    $model->form = Bid::FORM_MESSAGE;
 
                     $form = ActiveForm::begin([
                         'id' => 'form_foot',
                         'action' => '/',
+                        'enableClientValidation' => false,
                         'options' => [
                             'class' => 'sect_cont_form bids-form',
-                            'enctype' => 'multipart/form-data'
+                            'data-title' => 'Отправить сообщение с сайта',
+                            'data-form' => 'Отправить сообщение с сайта',
+                            'data-tag' => Bid::TAG_TREATMENT
                         ],
                     ]); ?>
 
                         <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-                        <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_MESSAGE, ['class' => 'not_clear']); ?>
+                        <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
                         <?php echo $form->field($model, 'name', [
                             'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',
                             'errorOptions' => []
                         ])->textInput([
-                            'placeholder' => 'Ваше имя*',
+                            'placeholder' => 'Ваше имя',
                             'class' => 'sect_cont_form__input'
                         ]); ?>
 

frontend/web/js/bids-form.js

@@ -50,7 +50,7 @@ $('form.bids-form').on('beforeSubmit', function(e) {
             {
                 errors = [];
                 $.each(response, function(key, value) {
-                    $('.field-'+key).addClass('has-error');
+                    form.find('.field-'+key).addClass('has-error');
                     errors = errors.concat(value);
                 });