Merge branch 'master' of gitlab.artweb.com.ua:steska/clinica

Alexey Boroda
2 parents 771cb13e f972afc1
Showing 13 changed files with 639 additions and 65 deletions Show diff stats
common/components/MailerComponent.php
common/config/params.php
common/models/Feedback.php
common/models/Settings.php
common/models/Visit.php
frontend/components/UrlManager.php
frontend/config/main.php
frontend/controllers/SiteController.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/layouts/main.php
+<?php
+
+namespace common\components;
+
+use yii\base\Component;
+use common\models\Visit;
+use backend\models\Mail;
+use common\models\Settings;
+
+
+
+
+/**
+ * =====================================================================================================================
+ *      Компонент, созданный для того, чтобы обьявлять аналогичные по логике письма с 1 места
+ * =====================================================================================================================
+ */
+class MailerComponent extends Component
+{
+
+	/**
+	 * Отправляет письмо админу по backend\models\Mail если такая запись есть
+	 * ***Если запись есть, но творится вакханалия с почтовым адресом, сервер начнёт валить Exception,
+	 *  а мы пишем нашему админу, что у них там почтовые настройки есть, но некорректы
+	 *
+	 * @param $mode 1|2|3|4
+	 *  1|2|3 ==> используется для site/callback
+	 *  4     ==> site/contact
+	 */
+	public static function sendListToAdminAfterSubmit(int $mode, array $params = [])
+	{
+		$mail = Mail::findOne(1);
+		if ($mail != null) {
+			$time = Visit::getTimeTitles($mode);
+			$settings = Settings::getInstance();
+			# если у них всё же почтовые настройки есть, НО письмо не может отправится,
+			# прокидываю сообщение об этом нам обратно
+			try {
+				if (!empty($mail->user) && !empty($settings->email)) {
+					$mail1 = \Yii::$app->mailer
+						->compose()
+						->setFrom($mail->user)
+						->setTo($settings->email)
+						->setSubject('Запись на прием: обратная связь')
+						->setTextBody('Контакт пациента: :' . $params['user_data'] . "  просил перезвонить ему  " . $time);
+					if ($mail1->send() == false) {
+						\Yii::info(\Yii::$app->params['artwebAdminEmail'] . " - неполучается отправить письмо за указанным адресом", 'mail_error');
+					}
+				}
+
+
+
+
+			} catch (\Exception $e) {
+				\Yii::error(\Yii::$app->params['artwebAdminEmail'] . " - неполучается отправить письмо за указанным адресом", 'mail_error');
+			}
+
+		}
+	}
+
+
+}
 \ No newline at end of file
@@ -3,4 +3,5 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
+	'artwebAdminEmail' => 'alkhonko@gmail.com',
 ];
@@ -25,10 +25,9 @@
         const SCENARIO_FEEDBACK = 'feedback';
         const SCENARIO_CALLBACK = 'callback';
-    
-        
-        
-        public $returnUrl;
+
+
+	    public $returnUrl;
@@ -186,7 +186,8 @@
         public static function getInstance()
         {
             if (empty( self::$instance )) {
-                self::$instance = self::find()->with('languages')->where([ 'id' => 1 ])->one();
+
+	            self::$instance = self::find()->with('languages')->where([ 'id' => 1 ])->one();
                 return self::$instance;
             }
@@ -43,6 +43,39 @@
         {
             return 'visit';
         }
+
+
+	    /**
+	     * Метод, который нужен для универсальных тайтлов для временных меток
+	     *
+	     * @param int $inputMode
+	     * @return string
+	     */
+	    public static function getTimeTitles(int $inputMode): string
+	    {
+		    $resultTimeMessage = '';
+		    switch ($inputMode) {
+			    case 1:
+				    $resultTimeMessage = "В течение 30 минут";
+				    break;
+			    case 2:
+				    $resultTimeMessage = 'с 9:00 до 12:00';
+				    break;
+			    case 3:
+				    $resultTimeMessage = ' с 12:00 до 18:00';
+				    break;
+			    default:
+				    $resultTimeMessage = ' Время не указано';
+
+		    }
+		    return $resultTimeMessage;
+	    }
+
+
+
+
+
+
         /**
          * {@inheritdoc}
@@ -103,8 +103,8 @@
                               ]
                           )
                           ->one();
-            
-            if ($alias !== null) {
+
+	        if ($alias !== null) {
                 $params = Json::decode($alias->route);
                 $route = array_shift($params);
 <?php
     use common\models\SlashRedirect;
     use frontend\components\UrlManager;
-use yii\helpers\Url;
+use common\models\Settings;
+
+
     $params = array_merge(
         require( __DIR__ . '/../../common/config/params.php' ),
@@ -9,7 +11,7 @@ use yii\helpers\Url;
         require( __DIR__ . '/params.php' ),
         require( __DIR__ . '/params-local.php' )
     );
-    
+
     return [
         'id'                  => 'app-frontend',
         'homeUrl'             => '/',
@@ -79,8 +81,9 @@ use yii\helpers\Url;
             ],
             'contact' => [
-                'class'      => 'artbox\core\forms\Module',
+	            'class' => 'frontend\modules\forms\Module',
                 'activeRecord' => "artbox\core\models\Feedback",
+	            'alternateMailLogic' => true,
                 'attributes' => [
                     'name',
                     'phone',
@@ -117,7 +120,7 @@ use yii\helpers\Url;
                 'buttonTemplate'  => '<div class="button-wr submit-close-wr-c-a">{button}</div>',
                 'buttonOptions'   => [],
                 'buttonContent'   => 'Send',
-                'sendEmail'       => false,
+	            'sendEmail' => true,
                 'ajax'            => true,
                 'formId'          => 'contact-form',
                 'scenario'        => 'callback',
@@ -348,6 +351,22 @@ use yii\helpers\Url;
                 'csrfParam' => '_csrf-frontend',
                 'baseUrl'   => '',
             ],
+//	        'mailer' => [
+//		        'class' => 'yii\swiftmailer\Mailer',
+//		        'viewPath' => '@frontend/mail',
+//		        'useFileTransport' => false,
+//
+//		        'transport' => [
+//			        'class' => 'Swift_SmtpTransport',
+//			        'host' => 'smtp.gmail.com',
+//			        # пока что стоят мои данные, потому что я пробивал свою почту
+//			        # для возможности отправки писем
+//			        'username' => 'alkhonko@gmail.com',
+//			        'password' => 'jakirothebest123',
+//			        'port' => '587',
+//			        'encryption' => 'tls',
+//		        ],
+//	        ],
             'user'         => [
                 'identityClass'   => 'common\models\User',
                 'enableAutoLogin' => true,
@@ -370,6 +389,35 @@ use yii\helpers\Url;
                             'warning',
                         ],
                     ],
+	                [
+		                'class' => 'yii\log\EmailTarget',
+		                'categories' => ['mail_error'],
+		                'levels' => [
+			                'error',
+			                'warning',
+			                'info'
+		                ],
+		                'mailer' => [
+			                'class' => 'yii\swiftmailer\Mailer',
+			                'viewPath' => '@frontend/mail',
+			                'useFileTransport' => false,
+
+			                'transport' => [
+				                'class' => 'Swift_SmtpTransport',
+				                'host' => 'smtp.gmail.com',
+				                'username' => 'artboxcore@gmail.com',
+				                'password' => 'upfly2000',
+				                'port' => '587',
+				                'encryption' => 'tls',
+			                ],
+		                ],
+		                'logVars' => [],
+		                'message' => [
+			                'from' => ['artboxcore@gmail.com' => 'ABClinic'],
+			                'to' => [\Yii::$app->params['artboxAdminEmail']],
+			                'subject' => 'Ошибка в почтовом адресе  ABClinic. Письма не доставляются после обработки одной из форм',
+		                ],
+	                ],
                 ],
             ],
             'errorHandler' => [
@@ -388,53 +436,53 @@ use yii\helpers\Url;
                     SlashRedirect::className(),
                 ],
             ],
-            'assetsAutoCompress' => [
-                'class'   => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
-                'enabled' => false,
-    
-                'readFileTimeout' => 3,
-                //Time in seconds for reading each asset file
-    
-                'jsCompress'                => true,
-                //Enable minification js in html code
-                'jsCompressFlaggedComments' => true,
-                //Cut comments during processing js
-    
-                'cssCompress' => true,
-                //Enable minification css in html code
-    
-                'cssFileCompile'        => true,
-                //Turning association css files
-                'cssFileRemouteCompile' => false,
-                //Trying to get css files to which the specified path as the remote file, skchat him to her.
-                'cssFileCompress'       => true,
-                //Enable compression and processing before being stored in the css file
-                'cssFileBottom'         => false,
-                //Moving down the page css files
-                'cssFileBottomLoadOnJs' => false,
-                //Transfer css file down the page and uploading them using js
-    
-                'jsFileCompile'                 => true,
-                //Turning association js files
-                'jsFileRemouteCompile'          => false,
-                //Trying to get a js files to which the specified path as the remote file, skchat him to her.
-                'jsFileCompress'                => true,
-                //Enable compression and processing js before saving a file
-                'jsFileCompressFlaggedComments' => true,
-                //Cut comments during processing js
-    
-                'htmlCompress'           => true,
-                //Enable compression html
-                'noIncludeJsFilesOnPjax' => true,
-                //Do not connect the js files when all pjax requests
-                'htmlCompressOptions'    =>              //options for compressing output result
-                    [
-                        'extra'       => false,
-                        //use more compact algorithm
-                        'no-comments' => true
-                        //cut all the html comments
-                    ],
-            ],
+	        'assetsAutoCompress' => [
+		        'class' => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
+		        'enabled' => false,
+
+		        'readFileTimeout' => 3,
+		        //Time in seconds for reading each asset file
+
+		        'jsCompress' => true,
+		        //Enable minification js in html code
+		        'jsCompressFlaggedComments' => true,
+		        //Cut comments during processing js
+
+		        'cssCompress' => true,
+		        //Enable minification css in html code
+
+		        'cssFileCompile' => true,
+		        //Turning association css files
+		        'cssFileRemouteCompile' => false,
+		        //Trying to get css files to which the specified path as the remote file, skchat him to her.
+		        'cssFileCompress' => true,
+		        //Enable compression and processing before being stored in the css file
+		        'cssFileBottom' => false,
+		        //Moving down the page css files
+		        'cssFileBottomLoadOnJs' => false,
+		        //Transfer css file down the page and uploading them using js
+
+		        'jsFileCompile' => true,
+		        //Turning association js files
+		        'jsFileRemouteCompile' => false,
+		        //Trying to get a js files to which the specified path as the remote file, skchat him to her.
+		        'jsFileCompress' => true,
+		        //Enable compression and processing js before saving a file
+		        'jsFileCompressFlaggedComments' => true,
+		        //Cut comments during processing js
+
+		        'htmlCompress' => true,
+		        //Enable compression html
+		        'noIncludeJsFilesOnPjax' => true,
+		        //Do not connect the js files when all pjax requests
+		        'htmlCompressOptions' =>              //options for compressing output result
+			        [
+				        'extra' => false,
+				        //use more compact algorithm
+				        'no-comments' => true
+				        //cut all the html comments
+			        ],
+	        ],
         ],
         'params'              => $params,
@@ -22,6 +22,7 @@
     use yii\web\BadRequestHttpException;
     use yii\web\Controller;
     use yii\web\Response;
+    use common\components\MailerComponent;
     /**
      * Site controller
@@ -62,7 +63,7 @@
          */
         public function actionIndex()
         {
-            $slides = Slide::find()
+	        $slides = Slide::find()
                            ->with('language')
                            ->where([ 'status' => true ])
                            ->orderBy('sort')
@@ -176,12 +177,15 @@
             $response->headers->set('Content-Type', 'text/plain');
             return $this->renderFile($meta[ 'uri' ]);
         }
-        
+
         public function actionCallback(){
-            \Yii::$app->response->format = Response::FORMAT_JSON;
+
+	        \Yii::$app->response->format = Response::FORMAT_JSON;
             $model = new Visit();
             if ($model->load(\Yii::$app->request->post()) && $model->save()){
-                return ['success' => true];
+	            $mode = $model->time;
+	            MailerComponent::sendListToAdminAfterSubmit($mode, ['user_data' => $model->phone]);
+	            return ['success' => true];
             }else{
                 return ['success' => false, 'errors' => $model->errors];
             }
@@ -196,8 +200,8 @@
              */
             $mailer = \Yii::$app->get('smtpmailer');
             $settings = Settings::getInstance();
-            
-            if (empty(Yii::$app->request->post())) {
+
+	        if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
                 $model = new Feedback();
+<?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';
+
+	/**
+	 * Свойство, которое заменяет логику для отправки письма, если установлено $this->sendMail=true
+	 * @var null
+	 */
+	public $alternateMailLogic = false;
+
+
+	/**
+	 * @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 = '';
+		# var_dump($this->labels);
+		# die(var_dump($this->attributes));
+		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 .= str_replace('{button}', Html::submitButton(\Yii::t($this->locale, $this->buttonContent), $this->buttonOptions), $this->buttonTemplate);
+
+		$content = str_replace('{form}', $content, $this->templateForm);
+		# die(var_dump(htmlspecialchars($content)));
+		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;
+use common\components\MailerComponent;
+
+/**
+ * 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;
+		#die(var_dump(\Yii::$app->request->post()));
+		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()) {
+					if ($this->module->sendEmail) {
+						if ($this->module->alternateMailLogic) {
+							MailerComponent::sendListToAdminAfterSubmit(4, ['user_data' => $model->phone]);
+						} else {
+							$this->sendEmail($model);
+						}
+
+						return ['status' => 'success'];
+					}
+					return ['status' => 'success'];
+				} else {
+					return ['status' => 'error'];
+				}
+			}
+
+		}
+		return ['status' => 'error'];
+	}
+
+	/**
+	 * @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']);
+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();
@@ -652,7 +652,7 @@
         <div class="style title-callback">Записаться на прием</div>
           <?php
               $model = new Visit(['agree' => 1, 'time' => 1]);
-              $form = ActiveForm::begin([ 'action' => 'site/callback', 'id' => 'callback-form' ]); ?>
+          $form = ActiveForm::begin(['action' => '/site/callback', 'id' => 'callback-form']); ?>
         <div class="input-wr phones_mask required">
             <?= $form->field($model, 'phone')
                      ->textInput([ 'placeholder' => '+38(0__)___-__-__' ])