[Administration] Communication > Email : champs texte évolué

backend/controllers/CommunicateController.php

@@ -170,7 +170,7 @@ class CommunicateController extends BackendController
                 $this->setFlash('error', $messageError);
             }
 
-            return $this->redirect(['mail', 'idPointSale' => $idPointSale]);
+            return $this->redirect(['email', 'idPointSale' => $idPointSale]);
         }
 
         $incomingDistributionsArray = $distributionModule->findDistributionsIncoming();

backend/models/MailForm.php

@@ -109,12 +109,27 @@ class MailForm extends Model
         
         $messageAutoText = '' ;
         $messageAutoHtml = '' ;
+
+        $messageAutoHtml .= '    <style type="text/css">
+    h1, h2, h3, h4, h5, h6 {
+        padding: 0px;
+        margin: 0px;
+        margin-bottom: 10px;
+    }
+    
+      p {
+        margin: 0px;
+        padding: 0px;
+        margin-bottom: 5px;
+      }
+    </style>';
+
         if($this->id_distribution) {
             
             $messageAutoText = '
 
 ' ;
-            $messageAutoHtml = '<br /><br />' ;
+            $messageAutoHtml .= '<br /><br />' ;
             
             $distribution = Distribution::searchOne(['id' => $this->id_distribution]) ;
             

backend/views/communicate/email.php

@@ -61,7 +61,7 @@ $this->render('@backend/views/user/_menu.php',[
 ?>
 
 <div id="">
-    <div class="col-md-6">
+    <div class="col-md-8">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">Envoyer un email</h3>
@@ -72,15 +72,21 @@ $this->render('@backend/views/user/_menu.php',[
                         ->hint("Sélectionnez une distribution pour ajouter automatiquement au message un lien vers la prise de commande de cette distribution"); ?>
                 <?= $form->field($mailForm, 'integrate_product_list')->checkbox() ; ?>
                 <?= $form->field($mailForm, 'subject')->textInput() ; ?>
-                <?= $form->field($mailForm, 'message')->textarea(['rows' => '15']) ; ?>
-                <div class="form-group">
+                <?php //$form->field($mailForm, 'message')->textarea(['rows' => '15']) ; ?>
+                <?= $form->field($mailForm, 'message')->widget(letyii\tinymce\Tinymce::class, [
+                    'configs' => [
+                        'plugins' => Yii::$app->parameterBag->get('tinyMcePlugins'),
+                    ]
+                ]); ?>
+
+                <div class="form-group form-buttons">
                     <?= Html::submitButton( 'Envoyer', ['class' => 'btn btn-primary']) ?>
                 </div>
                 <?php ActiveForm::end(); ?>
             </div>
         </div>
     </div>
-    <div class="col-md-6">
+    <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">
@@ -88,13 +94,13 @@ $this->render('@backend/views/user/_menu.php',[
                 </h3>
             </div>
             <div class="panel-body">
-                
+
                 <?php if($idPointSaleActive): ?>
                     <a class="btn btn-xs <?php if($usersPointSaleLink): ?>btn-primary<?php else: ?>btn-default<?php endif; ?>" href="<?= Yii::$app->urlManager->createUrl(['communicate/email','idPointSale' => $idPointSaleActive, 'idDistribution' => $idDistributionActive, 'usersPointSaleLink' => 1]); ?>">Liés au point de vente</a>
                     <a class="btn btn-xs <?php if($usersPointSaleHasOrder): ?>btn-primary<?php else: ?>btn-default<?php endif; ?>" href="<?= Yii::$app->urlManager->createUrl(['communicate/email','idPointSale' => $idPointSaleActive, 'idDistribution' => $idDistributionActive, 'usersPointSaleHasOrder' => 1]); ?>">Déjà commandés dans ce point de vente</a>
                     <br /><br />
                 <?php endif; ?>
-                
+
                 <?= implode(', ', $usersArray); ?>
             </div>
         </div>

backend/views/producer/update.php

@@ -105,12 +105,8 @@ $this->addBreadcrumb($this->getTitle());
                         ->hint('Affiché sur la page d\'accueil')*/ ?>
 
                     <?= $form->field($model, 'description')->widget(letyii\tinymce\Tinymce::class, [
-                        'options' => [
-                            'id' => 'testid',
-                        ],
-                        'configs' => [ // Read more: https://www.tiny.cloud/docs/tinymce/6/full-featured-open-source-demo/
-                            //'plugins' => 'preview importcss searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link media template codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount help charmap quickbars emoticons accordion' ,
-                            'plugins' => 'preview searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link lists wordcount help' ,
+                        'configs' => [
+                            'plugins' => Yii::$app->parameterBag->get('tinyMcePlugins'),
                         ]
                     ])->hint('Affiché sur la page d\'accueil') ; ?>
 

backend/web/css/screen.css

@@ -1837,50 +1837,55 @@ body.skin-black .content-wrapper .form-actions {
 body.skin-black .content-wrapper .form-actions a, body.skin-black .content-wrapper .form-actions button {
   margin-left: 10px;
 }
-/* line 325, ../sass/_adminlte.scss */
+/* line 323, ../sass/_adminlte.scss */
+body.skin-black .content-wrapper .form-buttons {
+  margin-top: 25px;
+  text-align: right;
+}
+/* line 330, ../sass/_adminlte.scss */
 body.skin-black .main-footer a {
   color: #F39C12;
 }
-/* line 330, ../sass/_adminlte.scss */
+/* line 335, ../sass/_adminlte.scss */
 body.skin-black .gridview-pagesize {
   float: right;
   margin-bottom: 8px;
 }
-/* line 335, ../sass/_adminlte.scss */
+/* line 340, ../sass/_adminlte.scss */
 body.skin-black #yii-debug-toolbar {
   bottom: 64px;
 }
 
-/* line 340, ../sass/_adminlte.scss */
+/* line 345, ../sass/_adminlte.scss */
 body.login-page {
   background: none;
   background-color: white;
 }
-/* line 344, ../sass/_adminlte.scss */
+/* line 349, ../sass/_adminlte.scss */
 body.login-page .login-box .login-logo {
   text-align: center;
   font-family: 'highvoltageregular';
 }
-/* line 348, ../sass/_adminlte.scss */
+/* line 353, ../sass/_adminlte.scss */
 body.login-page .login-box .login-logo img {
   width: 50px;
 }
-/* line 353, ../sass/_adminlte.scss */
+/* line 358, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body .btn-primary {
   background-color: #F39C12;
   border-color: #F39C12;
   padding: 5px 10px;
 }
-/* line 358, ../sass/_adminlte.scss */
+/* line 363, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body .btn-primary:active {
   background-color: #f4a62a;
   border-color: #F39C12;
 }
-/* line 364, ../sass/_adminlte.scss */
+/* line 369, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body a {
   color: #F39C12;
 }
-/* line 366, ../sass/_adminlte.scss */
+/* line 371, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body a:hover {
   color: #f4a62a;
 }

backend/web/sass/_adminlte.scss

@@ -319,6 +319,11 @@ body.skin-black {
                 margin-left: 10px;
             }
         }
+
+        .form-buttons {
+            margin-top: 25px;
+            text-align: right;
+        }
     }
     
     .main-footer {

common/config/params.php

@@ -40,6 +40,7 @@ return [
         'version' => '24.2.B',
         'maintenanceMode' => false,
         'siteName' => 'Opendistrib',
+        'tinyMcePlugins' => 'preview searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link lists wordcount help',
         'adminEmail' => 'contact@opendistrib.net',
         'supportEmail' => 'contact@opendistrib.net',
         'user.passwordResetTokenExpire' => 3600,