From 87f1520d233b1f8d5a7aae0a92fcdc34d491bb68 Mon Sep 17 00:00:00 2001
From: timur <tamerlan8.05.92@gmail.com>
Date: Thu, 23 Nov 2017 11:46:03 +0200
Subject: [PATCH] mailing

---
 common/config/.gitignore                |  2 +-
 common/config/main.php                  |  4 ++--
 frontend/assets/AppAsset.php            |  5 ++---
 frontend/controllers/SiteController.php | 46 ++++++++++++++++++++++++++++++----------------
 frontend/views/layouts/main.php         | 37 +++++++++++++++++++------------------
 5 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/common/config/.gitignore b/common/config/.gitignore
index 0be4f93..b2e5776 100644
--- a/common/config/.gitignore
+++ b/common/config/.gitignore
@@ -2,4 +2,4 @@ main-local.php
 db*
 params-local.php
 test-local.php
-#settings.php
\ No newline at end of file
+settings.php
\ No newline at end of file
diff --git a/common/config/main.php b/common/config/main.php
index 0f169d8..e9e9350 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -58,8 +58,8 @@
                 'transport' => [
                     'class' => 'Swift_SmtpTransport',
                     'host' => 'smtp.gmail.com',
-                    'username' => 'kbenergy.kiev@gmail.com',
-                    'password' => '',
+                    'username' => 'clud.net.mails@gmail.com',
+                    'password' => 'a3E6yNb9KUtF',
                     'port' => '587',
                     'encryption' => 'tls',
                     ],
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index 7e49d89..4c6aa70 100644
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -12,9 +12,8 @@
         public $basePath = '@webroot';
         public $baseUrl = '@web';
         public $css = [
-            'css/site.css',
+//            'css/site.css',
             'css/animate.css',
-            //'css/style.css',
             'css/style.blue.kb.css',
             'css/owl.carousel.css',
             'css/owl.theme.css',
@@ -34,7 +33,7 @@
             'js/photoswipe.min.js',
             'js/photoswipe-ui-default.min.js',
             'js/script.js',
-            '//maps.googleapis.com/maps/api/js?key=AIzaSyCoR1Jb-mIFUjPwKiuSlmtYBEwnJOBnAgg&amp;callback=initMap',
+//            '//maps.googleapis.com/maps/api/js?key=AIzaSyCoR1Jb-mIFUjPwKiuSlmtYBEwnJOBnAgg&amp;callback=initMap',
             'js/gmaps.init.js',
         ];
         public $depends = [
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 6aab7cb..6cf9789 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -101,26 +101,40 @@
         public function actionFeedback()
         {
             Yii::$app->response->format = Response::FORMAT_JSON;
-            if (empty( Yii::$app->request->post() )) {
+            if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
                 $model = new Feedback();
                 if ($model->load(Yii::$app->request->post()) && $model->save()) {
-                    Yii::$app->mailer->compose('feedback.php', ['model' => $model])
-                        ->setFrom('zhegal@gmail.com')
-                        ->setTo($model->email)
-                        ->setSubject($model->title)
-                        ->send();
-                    return [
-                        'success' => true,
-                        'message' => 'Success message',
-                        'alert'   => '<div class="alert alert-success">
-            <h3>Success</h3>
-            <p>
-              Success text
-            </p>
-          </div>',
-                    ];
+                    $settings = Settings::getInstance();
+                    
+                    $mailer = Yii::$app->mailer->compose(
+                        'feedback.php',
+                        [ 'model' => $model ]
+                    )
+                        ->setFrom('clud.net.mails@gmail.com')
+                        ->setTo([$settings->email])
+                        ->setSubject($model->title);
+                    
+                    if ( $mailer->send() ){
+                        return [
+                            'success' => true,
+                            'message' => 'Success message',
+                            'alert'   => '<div class="alert alert-success">
+                                        <h3>Success</h3>
+                                        <p>
+                                          Success text
+                                        </p>
+                                      </div>',
+                        ];
+                    }
+                    else{
+                        return [
+                            'success' => false,
+                            'error'   => 'mail->send() didn\'t send email',
+                        ];
+                    }
+                    
                 } else {
                     return [
                         'success' => false,
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 71cccd3..bed67f8 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -93,8 +93,9 @@ _________________________________________________________ -->
                   <p class="hidden-sm hidden-xs">
                       <?php
                           if (!empty($settings->phone)) {
+                              $phone  = str_replace(" ", "", $settings->phone);
                               echo \Yii::t('app', 'Зв\'яжіться з нами по тел. ');
-                              echo Html::a($settings->phone, "tel: {$settings->phone}");
+                              echo Html::a($settings->phone, "tel:{$phone}");
                               if (!empty($settings->email)) {
                                   echo \Yii::t('app', ' або ');
                                   echo Html::a($settings->email, "mailto:$settings->email");
@@ -366,7 +367,7 @@ _________________________________________________________ -->
             
             <div class="modal-content">
               <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times</button>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h3 class="modal-title" id="Login">Зворотній зв'язок</h3>
               </div>
               <div class="modal-body">
@@ -398,16 +399,16 @@ _________________________________________________________ -->
                                ]
                            ); ?>
                 
-                <p class="text-center">
-                    <?= Html::submitButton(
-                        'Надіслати',
-                        [
-                            'class' => 'send-form btn btn-lg btn-template-primary button-consultation',
-                            'onclick' => "ga('send', 'event', 'button-consultation.cec', 'send')",
-                        ]
-                    ) ?>
-                </p>
-                  <p class="text-center">
+                    <p class="text-center">
+                        <?= Html::submitButton(
+                            'Надіслати',
+                            [
+                                'class'   => 'send-form btn btn-lg btn-template-primary button-consultation',
+                                'onclick' => "ga('send', 'event', 'button-consultation.cec', 'send')",
+                            ]
+                        ) ?>
+                    </p>
+                    <p class="text-center">
                       <?= Html::submitButton(
                           'Надіслати',
                           [
@@ -415,8 +416,8 @@ _________________________________________________________ -->
                               'onclick' => "ga('send', 'event', 'button-сalculate the cost.cec', 'send')",
                           ]
                       ) ?>
-                  </p>
-                  <p class="text-center">
+                    </p>
+                    <p class="text-center">
                       <?= Html::submitButton(
                           'Надіслати',
                           [
@@ -424,7 +425,7 @@ _________________________________________________________ -->
                               'onclick' => "ga('send', 'event', 'button-order station.cec', 'send')",
                           ]
                       ) ?>
-                  </p>
+                    </p>
                   
                   <?php ActiveForm::end(); ?>
               
@@ -443,12 +444,12 @@ _________________________________________________________ -->
             
             <div class="modal-content">
               <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times</button>
-                <h3 class="modal-title" id="Success">Success</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3 class="modal-title" id="Success">Спасибо за заявку</h3>
               </div>
               <div class="modal-body">
                 
-                <p>Thank for your reply, we will call you, maybe.</p>
+                <p>Мы свяжемся с вами в ближайшее время</p>
                 <p class="text-center">
                   <button type="button" class="btn btn-template-primary" data-dismiss="modal">Close</button>
                 </p>
--
libgit2 0.21.4