-Emails on feedback and in settings ready

Alexey Boroda
1 parent 44ff20b4
Showing 10 changed files with 183 additions and 30 deletions Show diff stats
backend/controllers/SettingsController.php
backend/views/settings/_mail_tab.php
backend/views/settings/settings.php
common/config/.gitignore
common/config/mail.php
common/config/main.php
common/config/settings.php
common/mail/feedback.php
common/models/Mail.php
frontend/controllers/SiteController.php
 <?php
     namespace backend\controllers;
+    use common\models\Mail;
     use common\models\Settings;
     use yii\base\InvalidConfigException;
     use yii\filters\AccessControl;
@@ -47,6 +48,11 @@
         public function actionIndex()
         {
             $model = $this->findSettings();
+            $mail = Mail::findOne(1);
+            
+            if ($mail->load(\Yii::$app->request->post())) {
+                $mail->save();
+            }
             if ($model->load(Yii::$app->request->post()) && $model->save()) {
                 Yii::$app->session->setFlash('success', \Yii::t('core', 'Settings saved'));
@@ -58,6 +64,7 @@
                 'settings',
                 [
                     'model' => $model,
+                    'mail' => $mail,
                 ]
             );
         }
+<?php
+    
+    use common\models\Mail;
+    use yii\bootstrap\ActiveForm;
+    use yii\web\View;
+    
+    /**
+     * @var View       $this
+     * @var Mail       $mail
+     * @var ActiveForm $form
+     */
+    
+    echo $form->field($mail, 'host')
+              ->textInput();
+    
+    echo $form->field($mail, 'user')
+              ->textInput();
+    
+    echo $form->field($mail, 'pass')
+              ->textInput();
 \ No newline at end of file
@@ -2,8 +2,10 @@
     /**
      * @var View     $this
      * @var Settings $model
+     * @var Mail     $mail
      */
+    use common\models\Mail;
     use common\models\Settings;
     use yii\bootstrap\ActiveForm;
     use yii\bootstrap\Html;
@@ -26,7 +28,7 @@
     <?php
         $form = ActiveForm::begin();
-    
+        
         echo Tabs::widget(
             [
                 'options' => [
@@ -73,10 +75,20 @@
                             ]
                         ),
                     ],
+                    [
+                        'label'   => \Yii::t('core', 'Email'),
+                        'content' => $this->render(
+                            '_mail_tab',
+                            [
+                                'form' => $form,
+                                'mail' => $mail,
+                            ]
+                        ),
+                    ],
                 ],
             ]
         );
-    
+        
         echo Html::submitButton(
             'Save',
             [
@@ -2,4 +2,5 @@ main-local.php
 db*
 params-local.php
 test-local.php
-settings.php
 \ No newline at end of file
+settings.php
+mail.php
 \ No newline at end of file
+<?php
+
+return [
+    1 => [
+        'host' => 'smtp.gmail.com',
+        'user' => 'kennen.md@gmail.com',
+        'pass' => 'nobeernoparty',
+        'id' => 1,
+    ],
+];
 \ No newline at end of file
 <?php
     use artbox\core\components\SeoComponent;
+    $mail = require( 'mail.php' );
+    
     return [
         'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
         'modules'    => [
@@ -22,11 +24,11 @@
             ],
             'i18n'         => [
                 'translations' => [
-                    'core'    => [
+                    'core' => [
                         'class'    => 'yii\i18n\PhpMessageSource',
                         'basePath' => '@artbox/core/messages',
                     ],
-                    'app'     => [
+                    'app'  => [
                         'class'    => 'yii\i18n\PhpMessageSource',
                         'basePath' => '@common/messages',
                     ],
@@ -51,5 +53,17 @@
                 'useFilename' => true,
                 'absoluteUrl' => false,
             ],
+            'smtpmailer'   => [
+                'class'     => 'yii\swiftmailer\Mailer',
+                'transport' => [
+                    'class'      => 'Swift_SmtpTransport',
+                    'host'       => $mail[ 1 ][ 'host' ],
+                    'username'   => $mail[ 1 ][ 'user' ],
+                    'password'   => $mail[ 1 ][ 'pass' ],
+                    'port'       => '587',
+                    'encryption' => 'tls',
+                ],
+                'viewPath' => '@common/mail'
+            ],
         ],
     ];
@@ -2,32 +2,32 @@
 return [
     1 => [
-        'phone'    => '+38 (044) 593-73-76',
-        'phone2'   => '+38 (098) 468-07-64',
-        'skype'    => 'artwebstudio',
-        'email'    => 'artweb.ua@gmail.com',
-        'house'    => '1-М',
-        'street'   => 'пр. М. Бажана',
-        'office'   => '25',
-        'city'     => 'Киев',
-        'country'  => 'Украина',
-        'lat'      => '50.403696',
-        'lon'      => '30.641481',
+        'phone' => '+38 (044) 593-73-76',
+        'phone2' => '+38 (098) 468-07-64',
+        'skype' => 'artwebstudio',
+        'email' => 'kennen.md@gmail.com',
+        'house' => '1-М',
+        'street' => 'пр. М. Бажана',
+        'office' => '25',
+        'city' => 'Киев',
+        'country' => 'Украина',
+        'lat' => '50.403696',
+        'lon' => '30.641481',
         'facebook' => 'https://www.facebook.com/ArtWeb.ua/',
-        'vk'       => 'https://vk.com/artwebua',
-        'ok'       => 'https://ok.ru/artwebua',
-        'google'   => 'https://plus.google.com/+ArtwebUaAgency',
-        'twitter'       => 'https://twitter.com/ArtWeb_ua',
-        'name'          => 'Artweb',
-        'logo'          => '11',
-        'about'         => 'Строим бизнес в онлайне',
+        'vk' => 'https://vk.com/artwebua',
+        'ok' => 'https://ok.ru/artwebua',
+        'google' => 'https://plus.google.com/+ArtwebUaAgency',
+        'twitter' => 'https://twitter.com/ArtWeb_ua',
+        'name' => 'Artweb',
+        'logo' => null,
+        'about' => 'Строим бизнес в онлайне',
         'analytics_key' => '119240817',
-        'robots'        => 'User-agent: Google
+        'robots' => 'User-agent: Google
 Disallow:
 ',
-        'ga_code'       => '796967',
-        'ya_code'       => '08908908',
-        'tag_manager'   => '',
-        'id'            => 1,
+        'ga_code' => '796967',
+        'ya_code' => '08908908',
+        'tag_manager' => '',
+        'id' => 1,
     ],
 ];
 \ No newline at end of file
+<?php
+    use artbox\core\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', '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', 'Message: ') ?></b></td>
+      <td><?= $model->message ?></td>
+    </tr>
+  </tbody>
+</table>
+<?php
+    
+    namespace common\models;
+    
+    use yii2tech\filedb\ActiveRecord;
+    
+    /**
+     * Class Mail
+     *
+     * @property string $host
+     * @property string $user
+     * @property string $pass
+     * @package common\models
+     */
+    class Mail extends ActiveRecord
+    {
+        /**
+         * @inheritdoc
+         */
+        public static function fileName()
+        {
+            return 'mail';
+        }
+        
+        public function rules()
+        {
+            return [
+                [
+                    [
+                        'user',
+                        'host',
+                        'pass',
+                    ],
+                    'string',
+                ],
+            ];
+        }
+    }
 \ No newline at end of file
@@ -4,9 +4,10 @@
     use artbox\core\models\Feedback;
     use common\models\Settings;
     use Yii;
+    use yii\filters\VerbFilter;
+    use yii\swiftmailer\Mailer;
     use yii\web\BadRequestHttpException;
     use yii\web\Controller;
-    use yii\filters\VerbFilter;
     use yii\web\Response;
     /**
@@ -101,11 +102,30 @@
         public function actionFeedback()
         {
             Yii::$app->response->format = Response::FORMAT_JSON;
-            if (empty( Yii::$app->request->post() )) {
+            
+            /**
+             * @var Mailer $mailer
+             */
+            $mailer = \Yii::$app->get('smtpmailer');
+            $settings = Settings::getInstance();
+            
+            if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
                 $model = new Feedback();
                 if ($model->load(Yii::$app->request->post()) && $model->save()) {
+                    
+                    $mailer->compose(
+                        'feedback',
+                        [
+                            'model' => $model,
+                        ]
+                    )
+                           ->setFrom('artbox@domain.com')
+                           ->setTo($settings->email)
+                           ->setSubject(\Yii::t('app', 'Feedback'))
+                           ->send();
+                    
                     return [
                         'success' => true,
                         'message' => 'Success message',