simplify start

akiraz2 · Oct 16, 2018 · 89f35bc · 89f35bc
1 parent 6c9a776
commit 89f35bc
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 61 deletions.
diff --git a/Mailer.php b/Mailer.php
@@ -68,7 +68,7 @@ public function sendMessage($to, $subject, $view, $params = [])
         if ($this->sender === null) {
             $this->sender = isset(Yii::$app->params['adminEmail']) ? Yii::$app->params['adminEmail'] : 'no-reply@example.com';
         }
-        return $mailer->compose(['html' => $view . '-html', 'text' => $view . '-text'],
+        return $mailer->compose(['text' => $view . '-text'],
             $params)
             ->setTo($to)
             ->setFrom($this->sender)

diff --git a/Module.php b/Module.php
@@ -178,7 +178,7 @@ public function fetchMail()
                 $reply->mail_id = $mail->id;
                 $reply->fetch_date = $mail->date;
                 $reply->user_id = $ticket->user_id;
-                $reply->content = $mail->textHtml ?? $mail->textPlain;
+                $reply->content = strip_tags($mail->textHtml ?? $mail->textPlain);
                 $reply->info = $mail->headersRaw;
                 $reply->save();
                 $ticket->status = Ticket::STATUS_OPEN;
@@ -189,7 +189,7 @@ public function fetchMail()
                 $ticket->loadFromEmail($mail);
                 $ticket->save();
             }
-            $mailbox->deleteMail($mailsIds[$i]);
+            //$mailbox->deleteMail($mailsIds[$i]);
         }
         return true;
     }

diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php
@@ -64,6 +64,6 @@ public function actionFetchMail()
         if ($id) {
             \Yii::$app->session->setFlash('success', \akiraz2\support\Module::t('support', 'Added job to fetch tickets from mailbox, please wait'));
         }
-        return $this->redirect('index');
+        return $this->redirect('/support/ticket/manage');
     }
 }
diff --git a/mail/reply-ticket-html.php b/mail/reply-ticket-html.php
@@ -10,55 +10,10 @@
 /* @var $model \akiraz2\support\models\Content */
 
 ?>
-<div itemscope="" itemtype="http://schema.org/EmailMessage">
-    <div itemprop="potentialAction" itemscope="" itemtype="http://schema.org/ViewAction">
-        <link itemprop="target" href="<?= $model->ticket->getUrl(true) ?>">
-        <meta itemprop="name" content="<?= \akiraz2\support\Module::t('support', 'View Ticket') ?>">
-    </div>
-    <meta itemprop="description"
-          content="<?= \akiraz2\support\Module::t('support', '{APP}: Ticket #{ID} updated',
-              ['APP' => Yii::$app->name, 'ID' => $model->ticket->id]) ?>">
-</div>
-
-<table class="body-wrap" style="background-color: #f6f6f6; width: 100%;" width="100%" bgcolor="#f6f6f6">
-    <tr>
-        <td style="vertical-align: top;" valign="top"></td>
-        <td class="container" width="600"
-            style="vertical-align: top; display: block !important; max-width: 600px !important; margin: 0 auto !important; clear: both !important;"
-            valign="top">
-            <div class="content" style="max-width: 600px; margin: 0 auto; display: block; padding: 20px;">
-                <table class="main" width="100%" cellpadding="0" cellspacing="0"
-                       style="background-color: #fff; border: 1px solid #e9e9e9; border-radius: 3px;" bgcolor="#fff">
-                    <tr>
-                        <td class="content-wrap" style="vertical-align: top; padding: 20px;" valign="top">
-
-                            <table width="100%" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td class="content-block" style="vertical-align: top; padding: 0 0 20px;"
-                                        valign="top">
-                                        <?= \akiraz2\support\Module::t('support',
-                                            'Ticket #{ID}: New reply from {NAME}:', [
-                                                'ID' => $model->ticket->hash_id,
-                                                'NAME' => $model->getUsername()
-                                            ]) ?>
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td class="content-block" style="vertical-align: top; padding: 0 0 20px;"
-                                        valign="top">
-                                        <?= Yii::$app->formatter->asHtml($model->content) ?>
-                                    </td>
-                                </tr>
-
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-
-            </div>
-
-        </td>
-        <td style="vertical-align: top;" valign="top"></td>
-    </tr>
-</table>
+<?= \akiraz2\support\Module::t('support',
+    'Ticket #{ID}: New reply from {NAME}:', [
+        'ID' => $model->ticket->hash_id,
+        'NAME' => $model->getUsername()
+    ]) ?>
+<br>
+<?= Yii::$app->formatter->asHtml($model->content) ?>
diff --git a/mail/reply-ticket-text.php b/mail/reply-ticket-text.php
@@ -9,11 +9,9 @@
 /* @var $this yii\web\View */
 /* @var $model \akiraz2\support\models\Content */
 ?>
-
 <?= \akiraz2\support\Module::t('support', 'Ticket #{ID}: New reply from {NAME}:', [
-    'ID' => $model->ticket->id,
-    'NAME' => !empty($model->user_id) ? $model->user->{\Yii::$app->getModule('support')->userName} : \akiraz2\support\Module::t('support',
-        'Ticket System')
+    'ID' => $model->ticket->hash_id,
+    'NAME' => $model->getUsername()
 ]) ?>
 
 <?= Yii::$app->formatter->asNtext($model->content) ?>
diff --git a/views/ticket/manage.php b/views/ticket/manage.php
@@ -25,6 +25,53 @@
 $this->registerJs('$(document).on("pjax:send", function(){ $(".grid-view-overlay").removeClass("hidden");});$(document).on("pjax:complete", function(){ $(".grid-view-overlay").addClass("hidden");})');
 
 ?>
+<div class="ticket-default-index">
+    <div class="clearfix" style="margin-bottom: 10px;">
+        <div class="pull-right">
+            <?= \yii\helpers\Html::a('fetch mail', ['default/fetch-mail'], ['class' => 'btn btn-sm btn-warning']);?>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6 col-sm-6 col-xs-12">
+            <div class="info-box">
+                <span class="info-box-icon bg-aqua"><i class="fa fa-question-circle"></i></span>
+
+                <div class="info-box-content">
+                    <span class="info-box-text"><?= \akiraz2\support\Module::t('support', 'New Tickets Today');?></span>
+                    <span class="info-box-number">0</span>
+                </div>
+                <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+        </div>
+        <!-- /.col -->
+        <div class="col-md-6 col-sm-6 col-xs-12">
+            <div class="info-box">
+                <span class="info-box-icon bg-red"><i class="fa fa-fire"></i></span>
+
+                <div class="info-box-content">
+                    <span class="info-box-text"><?= \akiraz2\support\Module::t('support', 'Unanswered tickets');?></span>
+                    <span class="info-box-number">0</span>
+                </div>
+                <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+        </div>
+        <!-- /.col -->
+    </div>
+    <div class="row">
+        <div class="col-md-6">
+            <h2><?= \akiraz2\support\Module::t('support', 'Categories');?></h2>
+            <?= \yii\helpers\Html::a(\akiraz2\support\Module::t('support', 'Categories'), ['category/index']);?>
+        </div>
+        <div class="col-md-6">
+            <h2><?= \akiraz2\support\Module::t('support', 'Last tickets');?></h2>
+            <?= \yii\helpers\Html::a(\akiraz2\support\Module::t('support', 'Last tickets'), ['ticket/manage']);?>
+        </div>
+    </div>
+</div>
+
 <div class="ticket-index">
     <div class="box box-primary">
         <div class="box-body">

diff --git a/views/ticket/view.php b/views/ticket/view.php
@@ -67,7 +67,7 @@ class="fa fa-clock-o"></i> <?= Yii::$app->formatter->asDatetime($post->createdAt
                 <?php $form = ActiveForm::begin(); ?>
                 <?php
                 if (Yii::$app->getModule('support')->getIsBackend()) {
-                    echo $form->field($reply, 'content')->widget(\yii\redactor\widgets\Redactor::className())->label(false);
+                    echo $form->field($reply, 'content')->textarea()->label(false);
                 } else {
                     echo $form->field($reply, 'content')->textarea()->label(false);
                 }