conflict

Alexey Boroda
2 parents f8a0d434 cabfeeef
Showing 14 changed files with 610 additions and 37 deletions Show diff stats
common/config/main.php
console/migrations/m180709_111256_create_partner_table.php
frontend/config/main.php
frontend/controllers/SiteController.php
frontend/models/Feedback.php
frontend/modules/forms/DynamicModel.php
frontend/modules/forms/Module.php
frontend/modules/forms/controllers/SaveController.php
frontend/modules/forms/views/form/form.php
frontend/views/forms/ContactModule.php
frontend/views/site/contact.php
frontend/web/css/site.css
frontend/web/js/script.js
frontend/widgets/ParthnersList.php
@@ -26,6 +26,13 @@
             ]
         ],
         'components' => [
+
+	        'reCaptcha' => [
+		        'name' => 'reCaptcha',
+		        'class' => 'himiklab\yii2\recaptcha\ReCaptcha',
+		        'siteKey' => '6LcZcmQUAAAAANF1TashIYAvYtTBCscpTlPe1q6T',
+		        'secret' => '6LcZcmQUAAAAAFH4Ru4S6QnmB3An3PJWglmV',
+	        ],
             'cache'              => [
                 'class' => 'yii\caching\FileCache',
             ],
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `partner`.
+ */
+class m180709_111256_create_partner_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('partner', [
+            'id' => $this->primaryKey(),
+            'image_id' => $this->integer(),
+            'status' => $this->boolean(),
+            'sort' => $this->integer(),
+            'link' => $this->string()
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropTable('partner');
+    }
+}
@@ -137,7 +137,8 @@
                     }',
             ],
             'contact' => [
-                'class'        => 'artbox\core\forms\Module',
+	            'class' => 'frontend\modules\forms\Module',
+	            #'class' => 'artbox\core\forms\Module',
                 'activeRecord' => "frontend\models\Feedback",
                 'templateForm' => '<div class="row">{form}</div>',
                 'attributes'   => [
@@ -145,6 +146,7 @@
                     'email',
                     'phone',
                     'message',
+
                 ],
                 'rules'        => [
                     [
@@ -158,7 +160,8 @@
                             'phone',
                         ],
                         'required',
-                    ]
+                    ],
+
                 ],
                 'labels'     => [
                     'email'   => \Yii::t('app','Email'),
 <?php
     namespace frontend\controllers;
-    use frontend\models\Feedback;
+    use frontend\models\Feedback as F;
     use common\models\blog\Article;
     use common\models\Settings;
     use common\models\slider\Slide;
@@ -72,11 +72,11 @@
          */
         public function actionContact()
         {
-            $contact = new Feedback();
+	        $contact = new F();
             return $this->render(
                 'contact',
                 [
-                    'contact' => $contact,
+	                'model' => $contact,
                 ]
             );
         }
@@ -11,9 +11,14 @@ use artbox\core\models\Feedback as ArtboxCoreFeedback;
 class Feedback extends ArtboxCoreFeedback
 {
+	public $reCaptcha;
+
+
 	public function rules()
     {
-        return [
+
+
+	    return [
             [
                 [
                     'name',
@@ -24,7 +29,17 @@ class Feedback extends ArtboxCoreFeedback
                 'on'      => self::SCENARIO_DEFAULT,
                 'message' => \Yii::t('app', 'Empty field'),
             ],
-            [
+		    ['reCaptcha', \himiklab\yii2\recaptcha\ReCaptchaValidator::className(),
+			    'uncheckedMessage' => 'Please confirm that you are not a bot.',
+			    // add follow lines to prevent checking recaptcha when from has errors
+			    'when' => function ($model) {
+				    return !$model->hasErrors();
+			    },
+		    ],
+//			[
+//				'reCaptcha','safe'
+//			],
+		    [
                 [
                     'name',
                     'email',
+<?php
+
+namespace frontend\modules\forms;
+
+/**
+ * Class DynamicModel
+ *
+ * @package artbox\core\forms
+ */
+class DynamicModel extends \yii\base\DynamicModel
+{
+	/**
+	 * @var mixed
+	 */
+	protected $_labels;
+
+	/**
+	 * @param $labels
+	 */
+	public function setAttributeLabels($labels)
+	{
+		$this->_labels = $labels;
+	}
+
+	/**
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public function getAttributeLabel($name)
+	{
+		return $this->_labels[$name] ?? $name;
+	}
+}
 \ No newline at end of file
+<?php
+
+namespace frontend\modules\forms;
+
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
+
+/**
+ * Module for generation forms adn saving data from frontend
+ *
+ * @package artbox\core\forms
+ */
+class Module extends \yii\base\Module
+{
+	/**
+	 * ActiveRecord for insert to db
+	 *
+	 * @var null
+	 */
+	public $templateForm = '{form}';
+
+	public $activeRecord = null;
+
+	/**
+	 * attributes which render in form
+	 *
+	 * @var array
+	 */
+	public $attributes = [];
+
+	/**
+	 * validation rules for DynamicModel
+	 *
+	 * @var array
+	 */
+	public $rules = [];
+
+	/**
+	 * scenario for ActiveRecord
+	 *
+	 * @var string
+	 */
+	public $scenario = 'default';
+
+	/**
+	 * Input types for attributes. textinput default
+	 *
+	 * @var array
+	 */
+	public $inputOptions = [];
+
+	/**
+	 * Labels by form (if ActiveRecord is null)
+	 *
+	 * @var array
+	 */
+	public $labels = [];
+
+	/**
+	 * Send or not email
+	 *
+	 * @var bool
+	 */
+	public $sendEmail = true;
+
+	/**
+	 * Email address
+	 *
+	 * @var string
+	 */
+	public $email = 'admin@example.com';
+
+	/**
+	 * Email template
+	 *
+	 * @var string
+	 */
+	public $emailFile = 'mail.php';
+
+	/**
+	 * Email subject
+	 *
+	 * @var string
+	 */
+	public $subject = '';
+
+	/**
+	 * mailer which send email
+	 *
+	 * @var null
+	 */
+	public $mailer = null;
+
+	/**
+	 * @var \yii\db\ActiveRecord $model ;
+	 */
+	public $model = null;
+
+	/**
+	 * send form with ajax
+	 *
+	 * @var bool
+	 */
+	public $ajax = false;
+
+	/**
+	 * callback function for ajax script of send form
+	 *
+	 * @var string
+	 */
+	public $successCallback = 'function (data) {
+            alert("ok");
+        }';
+
+	/**
+	 * error function for ajax script of send form
+	 *
+	 * @var string
+	 */
+	public $errorCallback = 'function (data) {
+            alert("error");
+        }';
+
+	/**
+	 * id form
+	 *
+	 * @var string
+	 */
+	public $formId = 'dynamic-form';
+
+	/**
+	 * options for submit button
+	 *
+	 * @var array
+	 */
+	public $buttonOptions = ['class' => 'btn'];
+
+	/**
+	 * content for submit button
+	 *
+	 * @var string
+	 */
+	public $buttonContent = 'Save';
+
+	/**
+	 * @var string
+	 */
+	public $classForm = 'form';
+
+	public $id = 'forms';
+
+	public $buttonTemplate = '{button}';
+
+	public $locale = 'app';
+	
+ 
+	/**
+	 * @inheritdoc
+	 * @throws \yii\base\InvalidConfigException
+	 */
+	public function init()
+	{
+		parent::init();
+
+		if ($this->activeRecord !== null) {
+			$this->model = \Yii::createObject($this->activeRecord);
+			$this->model->scenario = $this->scenario;
+		} else {
+			$this->model = new DynamicModel($this->attributes);
+			$this->model->attributeLabels = $this->labels;
+			foreach ($this->rules as $rule) {
+				if (is_array($rule) && isset($rule[0], $rule[1])) {
+					$attributes = $rule[0];
+					$validator = $rule[1];
+					unset($rule[0], $rule[1]);
+					$this->model->addRule($attributes, $validator, $rule);
+				} else {
+					throw new InvalidConfigException(
+						'Invalid validation rule: a rule must specify both attribute names and validator type.'
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * render html form with model
+	 *
+	 * @param \yii\web\View $view
+	 */
+	public function renderForm(View $view)
+	{
+		if ($this->ajax) {
+			$js = <<<JS
+$(document).on('submit', '#{$this->formId}', function(e) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        $.post(
+            $(this).attr("action"), $(this).serialize(), {$this->successCallback}).fail({$this->errorCallback});
+});
+JS;
+
+			$view->registerJs($js, View::POS_READY);
+		}
+		/**
+		 * @var ActiveForm $form
+		 */
+
+		$form = ActiveForm::begin(
+			[
+				'id' => $this->formId,
+				'action' => ($this->ajax) ? '/' . $this->id . '/save/ajax' : '/' . $this->id . '/save/no-ajax',
+				'class' => $this->classForm,
+			]
+		);
+
+		$content = '';
+		foreach ($this->attributes as $field) {
+
+			# если мы присвоили этому полю тип, то он его отрисовывает
+			if (isset($this->inputOptions[$field]['type'])) {
+				$function = $this->inputOptions[$field]['type'];
+				$formStr = $form->field($this->model, $field)
+					->$function(
+						isset($this->inputOptions[$field]['options'])
+							? $this->inputOptions[$field]['options'] : []
+					);
+			} # а если нет, то просто добавляет поле
+			else {
+				$formStr = $form->field($this->model, $field);
+			}
+			if (isset($this->labels[$field])) {
+				$formStr->label(\Yii::t($this->locale, $this->labels[$field]));
+			}
+			if (isset($this->inputOptions[$field]['template'])) {
+
+				$formStr = str_replace('{input}', $formStr, $this->inputOptions[$field]['template']);
+			}
+			$content .= $formStr;
+
+		}
+		$content .= $form->field($this->model, 'reCaptcha')->widget(\himiklab\yii2\recaptcha\ReCaptcha::className())->label(false);
+
+
+		$content .= str_replace('{button}', Html::submitButton(\Yii::t($this->locale, $this->buttonContent), $this->buttonOptions), $this->buttonTemplate);
+		$content = str_replace('{form}', $content, $this->templateForm);
+		echo $content;
+		ActiveForm::end();
+	}
+}
 \ No newline at end of file
+<?php
+
+namespace frontend\modules\forms\controllers;
+
+use artbox\core\forms\DynamicModel;
+use yii\web\Controller;
+use yii\web\Response;
+
+/**
+ * Class SaveController
+ *
+ * @property \artbox\core\forms\Module $module
+ * @package artbox\core\forms\controllers
+ */
+class SaveController extends Controller
+{
+	/**
+	 * Custom data saving via POST
+	 *
+	 * @return bool|\yii\web\Response
+	 * @throws \yii\base\InvalidConfigException
+	 */
+	public function actionNoAjax()
+	{
+		$returnUrl = \Yii::$app->request->referrer;
+		$model = $this->module->model;
+		if (\Yii::$app->request->isPost and $model->load(\Yii::$app->request->post())) {
+			if ($model instanceof DynamicModel) {
+				$this->sendEmail($model);
+			} else {
+				if ($model->save()) {
+					if ($this->module->sendEmail) {
+						$this->sendEmail($model);
+						return $this->redirect($returnUrl);
+					}
+				} else {
+					return false;
+				}
+			}
+			return $this->redirect($returnUrl);
+
+		}
+		return $this->redirect($returnUrl);
+	}
+
+	/**
+	 * Action that saves data submited via AJAX
+	 *
+	 * @return array
+	 * @throws \yii\base\InvalidConfigException
+	 */
+	public function actionAjax()
+	{
+		\Yii::$app->response->format = Response::FORMAT_JSON;
+		$model = $this->module->model;
+		if (\Yii::$app->request->isPost and $model->load(\Yii::$app->request->post())) {
+			if ($model instanceof DynamicModel) {
+				$this->sendEmail($model);
+				return ['status' => 'success'];
+			} else {
+
+				if ($model->save(false)) {
+					if ($this->module->sendEmail) {
+						$this->sendEmail($model);
+						return ['status' => 'success'];
+					}
+					return ['status' => 'success'];
+				} else {
+					return ['status' => 'error','errors'=>$model->errors];
+				}
+			}
+
+		}
+		return ['status' => 'error','error' => 'if doesent work'];
+	}
+
+	/**
+	 * @param $model
+	 *
+	 * @return bool
+	 * @throws \yii\base\InvalidConfigException
+	 */
+	public function sendEmail($model)
+	{
+
+		if ($this->module->mailer == null) {
+			$mailer = \Yii::$app->mailer;
+		} else {
+			$mailer = \Yii::$app->get($this->module->mailer);
+		}
+		return $mailer->compose(
+			[
+				'html' => $this->module->emailFile,
+				'text' => $this->module->emailFile,
+			],
+			[$model]
+		)
+			->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
+			->setTo($this->module->email)
+			->setSubject($this->module->subject)
+			->send();
+	}
+
+}
 \ No newline at end of file
+<?php
+/**
+ * @var \yii\db\ActiveRecord $model
+ * @var array $types
+ */
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+$form = ActiveForm::begin([
+	'id' => 'dynamic-form',
+	'enableAjaxValidation'   => false,
+	'enableClientValidation' => true,
+]);
+foreach ($this->context->module->attributes as $field) {
+	if (isset($types[$field])) {
+		$function = $types[$field]['type'];
+		echo $form->field($model, $field)
+			->$function(
+				$types[$field]['options']
+			);
+	} else {
+		echo $form->field($model, $field);
+	}
+
+}
+
+echo Html::submitButton();
+
+$form = ActiveForm::end();
+<?php
+
+namespace frontend\views\forms;
+
+
+use yii\helpers\Html;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+use artbox\core\forms\Module as CoreModule;
+
+
+/**
+ * Class ContactModule
+ * @package frontend\forms
+ *
+ *
+ * Класс, который немного видоизменяет вывод формы контактов для того, чтобы в ней появилась гугловая рекапча
+ *
+ */
+class ContactModule extends CoreModule
+{
+
+
+	public function renderForm(View $view)
+	{
+		if ($this->ajax) {
+			$js = <<<JS
+$(document).on('submit', '#{$this->formId}', function(e) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        $.post(
+            $(this).attr("action"), $(this).serialize(), {$this->successCallback}).fail({$this->errorCallback});
+});
+JS;
+
+			$view->registerJs($js, View::POS_READY);
+		}
+		/**
+		 * @var ActiveForm $form
+		 */
+
+		$form = ActiveForm::begin(
+			[
+				'id' => $this->formId,
+				'action' => ($this->ajax) ? '/' . $this->id . '/save/ajax' : '/' . $this->id . '/save/no-ajax',
+				'class' => $this->classForm,
+			]
+		);
+		$content = '';
+		foreach ($this->attributes as $field) {
+
+			# если мы присвоили этому полю тип, то он его отрисовывает
+			if (isset($this->inputOptions[$field]['type'])) {
+				$function = $this->inputOptions[$field]['type'];
+				$formStr = $form->field($this->model, $field)
+					->$function(
+						isset($this->inputOptions[$field]['options'])
+							? $this->inputOptions[$field]['options'] : []
+					);
+			} # а если нет, то просто добавляет поле
+			else {
+				$formStr = $form->field($this->model, $field);
+			}
+			if (isset($this->labels[$field])) {
+				$formStr->label(\Yii::t($this->locale, $this->labels[$field]));
+			}
+			if (isset($this->inputOptions[$field]['template'])) {
+
+				$formStr = str_replace('{input}', $formStr, $this->inputOptions[$field]['template']);
+			}
+			$content .= $formStr;
+
+		}
+
+		$content .= $form->field($this->model, 'reCaptcha')->widget(\sashsvamir\yii2\recaptcha\ReCaptcha::className())->label(false);
+
+
+		$content .= str_replace('{button}', Html::submitButton(\Yii::t($this->locale, $this->buttonContent), $this->buttonOptions), $this->buttonTemplate);
+		$content = str_replace('{form}', $content, $this->templateForm);
+		echo $content;
+		ActiveForm::end();
+	}
+}
 \ No newline at end of file
@@ -11,6 +11,7 @@
     use frontend\assets\MapAsset;
     use yii\helpers\Html;
     use yii\web\View;
+use yii\widgets\ActiveForm;
     MapAsset::register($this);
     $settings = Settings::getInstance();
@@ -119,7 +120,9 @@ JS;
                 </div>
                 <div class="col-md-8 col-md-offset-2">
-                  <?=$module->renderForm($this)?>
+
+
+	                <?= $module->renderForm($this) ?>
                 </div>
             </div>
@@ -133,3 +133,11 @@ a.desc:after {
 .background-white {
     background-color: white;
 }
+
+/*
+Класс для выравнивания по центру формы инпута google ReCaptcha
+*/
+.f_center {
+    margin-left: 80%;
+    transform: translateX(-50%);
+}
 \ No newline at end of file
@@ -67,6 +67,9 @@ $(
         //                }
         //            );
+
+        $('.field-feedback-recaptcha').addClass('col-sm-12').addClass('f_center')
+
         /**
          * Button UP code
          */
 <?php
-//======================================================================================================================
-//Виджет, который получает массив данных о партнёрах, и делает html код для карусели
-
-namespace frontend\widgets;
-use yii\base\Widget;
-use common\models\Partner;
-
-
-class ParthnersList extends Widget
-{
-	public $filesList=[];
-	public $parthnersLinkList=[];
-	public function init()
-	{
-		parent::init();
-		#$this->filesList=preg_grep('$^customer-\d{1,3}\.(png|jpg|jpeg)$',scandir('../web/img',0));
-		$this->filesList=Partner::find()
-			->where(['status'=>true])
-			->all();
-
-
-	}
-
-
-	public function run(){
-		parent::run();
-		return $this->render('_parthnerList',['data'=>$this->filesList]);
-	}
-}
+    //======================================================================================================================
+    //Виджет, который получает массив данных о партнёрах, и делает html код для карусели
+    
+    namespace frontend\widgets;
+    
+    use yii\base\Widget;
+    use common\models\Partner;
+    
+    class ParthnersList extends Widget
+    {
+        public $filesList = [];
+        public $parthnersLinkList = [];
+        public function init()
+        {
+            parent::init();
+            #$this->filesList=preg_grep('$^customer-\d{1,3}\.(png|jpg|jpeg)$',scandir('../web/img',0));
+            $this->filesList = Partner::find()
+                                      ->where([ 'status' => true ])
+                                      ->all();
+            
+        }
+        
+        public function run()
+        {
+            parent::run();
+            return $this->render('_parthnerList', [ 'data' => $this->filesList ]);
+        }
+    }