Merge branch 'develop'

backend/controllers/DistributionController.php

@@ -318,6 +318,8 @@ class DistributionController extends BackendController
         $productOrderModule = $this->getProductOrderModule();
         $userProducerModule = $this->getUserProducerModule();
 
+
+
         if ($ordersArray) {
             foreach ($ordersArray as &$order) {
 
@@ -395,15 +397,15 @@ class DistributionController extends BackendController
                     'productOrder' => $productOrderArray,
                     'paymentsArray' => $paymentArray,
                     'oneProductUnactivated' => $oneProductUnactivated,
-                    'isLinkedToValidDocument' => $orderModule->isLinkedToValidDocument($order),
-                    'isLinkedToValidInvoice' => $orderModule->isLinkedToValidInvoice($order),
-                    'isCreditAutoPayment' => $orderModule->isCreditAutoPayment($order),
-                    'isCreditContext' => $orderModule->isCreditContext($order),
-                    'isPaid' => $orderModule->isOrderPaid($order),
-                    'isPaidViaInvoice' => $orderModule->isOrderPaidViaInvoice($order),
-                    'paymentLabelShort' => $orderModule->getPaymentLabelShort($order),
-                    'isCreditFunctioningMandatory' => $orderModule->isOrderCreditFunctioningMandatory($order),
-                    'isCreditFunctioningUser' => $orderModule->isOrderCreditFunctioningUser($order),
+                    'isLinkedToValidDocument' => $orderModule->getSolver()->isLinkedToValidDocument($order),
+                    'isLinkedToValidInvoice' => $orderModule->getSolver()->isLinkedToValidInvoice($order),
+                    'isCreditAutoPayment' => $orderModule->getRepository()->isCreditAutoPayment($order),
+                    'isCreditContext' => $orderModule->getRepository()->isCreditContext($order),
+                    'isPaid' => $orderModule->getRepository()->isOrderPaid($order),
+                    'isPaidViaInvoice' => $orderModule->getRepository()->isOrderPaidViaInvoice($order),
+                    'paymentLabelShort' => $orderModule->getRepository()->getPaymentLabelShort($order),
+                    'isCreditFunctioningMandatory' => $orderModule->getRepository()->isOrderCreditFunctioningMandatory($order),
+                    'isCreditFunctioningUser' => $orderModule->getRepository()->isOrderCreditFunctioningUser($order),
                     'debitCredit' => false,
                     'deliveryNote' => $order->deliveryNote ? $order->deliveryNote->getAttributes() : null
                 ]);

backend/controllers/DocumentController.php

@@ -578,7 +578,7 @@ class DocumentController extends BackendController
 
             if ($document) {
                 $ordersArray = [];
-                $productsArray = $productModule->findProducts(false);
+                $productsArray = $productModule->getRepository()->findProducts(true);
 
                 foreach ($document->orders as $order) {
                     $orderModule->initOrder($order);

backend/controllers/ProductController.php

@@ -343,7 +343,7 @@ class ProductController extends BackendController
         $orderArray = json_decode(stripslashes($array));
 
         foreach ($orderArray as $id => $order) {
-            $product = $this->findModel($id);
+            $product = $this->findModel((int) $id);
             $product->order = $order;
             $product->save();
         }

backend/views/layouts/left.php

@@ -135,7 +135,7 @@ $isUserCurrentGrantedAsProducer = $userModule->getAuthorizationChecker()->isGran
                     ],
                     [
                         'label' => 'Producteurs',
-                        'icon' => 'th-list',
+                        'icon' => 'bookmark',
                         'url' => ['/producer-admin/index'],
                         'visible' => $isUserCurrentGrantedAsAdministrator
                     ],

backend/views/user/_form.php

@@ -163,7 +163,7 @@ $distributionModule = DistributionModule::getInstance();
             <div class="panel-heading">
                 <h3 class="panel-title">
                     <i class="fa fa-paper-plane"></i>
-                    Bulletin d'information
+                    Infolettres
                 </h3>
             </div>
             <div class="panel-body">
@@ -176,6 +176,17 @@ $distributionModule = DistributionModule::getInstance();
                         ],
                     ]
                 ); ?>
+                <?php if($userModule->getAuthorizationChecker()->isGrantedAsAdministrator($userCurrent)): ?>
+                    <?= $form->field($model, 'newsletter_souke')->widget(Toggle::class,
+                        [
+                            'options' => [
+                                'data-id' => $model->id,
+                                'data-on' => 'Oui',
+                                'data-off' => 'Non',
+                            ],
+                        ]
+                    ); ?>
+                <?php endif; ?>
             </div>
         </div>
 

backend/views/user/view.php

@@ -36,6 +36,7 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
+use common\helpers\GlobalParam;
 use common\helpers\Price;
 use domain\Order\Order\OrderModule;
 use domain\User\User\UserModule;
@@ -43,6 +44,7 @@ use domain\User\UserProducer\UserProducerModule;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
+$userCurrent = GlobalParam::getCurrentUser();
 $orderModule = OrderModule::getInstance();
 $userModule = UserModule::getInstance();
 $userProducerModule = UserProducerModule::getInstance();
@@ -115,7 +117,7 @@ $this->addBreadcrumb('Récapitulatif') ;
                         </li>
                     <?php endif; ?>
                     <li class="list-group-item">
-                        <strong>Bulletin d'information</strong>
+                        <strong>Infolettre</strong>
                         <span class="pull-right">
                             <?php $isUserSubscribedNewsletter = $userModule->getNewsletterManager()->isUserSubscribedNewsletter($model); ?>
                             <span class="label label-<?= $isUserSubscribedNewsletter ? 'success' : 'default' ?>">
@@ -123,6 +125,17 @@ $this->addBreadcrumb('Récapitulatif') ;
                             </span>
                         </span>
                     </li>
+                    <?php if($userModule->getAuthorizationChecker()->isGrantedAsAdministrator($userCurrent)): ?>
+                    <li class="list-group-item">
+                        <strong>Infolettre Souke</strong>
+                        <span class="pull-right">
+                            <?php $isUserSubscribedNewsletterSouke = $model->newsletter_souke; ?>
+                            <span class="label label-<?= $isUserSubscribedNewsletterSouke ? 'success' : 'default' ?>">
+                                <?= $isUserSubscribedNewsletterSouke ? 'Oui' : 'Non' ?>
+                            </span>
+                        </span>
+                    </li>
+                    <?php endif; ?>
                     <?php if($model->userPointSale): ?>
                     <li class="list-group-item">
                         <strong>Points de vente</strong>

common/config/params.php

@@ -37,12 +37,14 @@
  */
 
 return [
-        'version' => '24.5.B',
+        'version' => '24.5.C',
         'maintenanceMode' => false,
         'siteName' => 'Souke',
         'tinyMcePlugins' => 'preview searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link lists wordcount help',
         'adminEmail' => 'contact@souke.fr',
         'supportEmail' => 'contact@souke.fr',
+        'newsletterProducerDescription' => "Pour recevoir les emails de prise de commande et d'information",
+        'newsletterSoukeDescription' => "Pour suivre l'actualité de la plateforme",
         'user.passwordResetTokenExpire' => 3600,
         'producer' => false,
         'orderStatus' => [

common/versions/24.5.C.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once dirname(__FILE__).'/_macros.php';
+
+version(
+    '13/05/2024',
+    [
+        [
+        ],
+        [
+            "[Administration] Distributions : optimisation du chargement des jours de distribution",
+            "[Administration] Documents : correctif bug nom produit non affiché et TVA en NaN",
+            "[Site] Inscription : ajout description infolettres",
+        ]
+    ],
+    [
+        [
+        ],
+        [
+
+        ]
+    ],
+    $userCurrent
+);
+
+?>

console/migrations/m240508_093106_create_indexes_performance.php

@@ -0,0 +1,41 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m240508_093106_create_indexes_performance
+ */
+class m240508_093106_create_indexes_performance extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createIndex('id_user', 'user_producer', 'id_user');
+        $this->createIndex('id_producer', 'user_producer', 'id_producer');
+        $this->createIndex('id_product', 'product_price', 'id_product');
+        $this->createIndex('status', 'user', 'status');
+        $this->createIndex('email', 'user', 'email');
+        $this->createIndex('type', 'user', 'type');
+        $this->createIndex('id_producer', 'user', 'id_producer');
+        $this->createIndex('date', 'distribution', 'date');
+        $this->createIndex('id_producer', 'distribution', 'id_producer');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropIndex('id_user', 'user_producer');
+        $this->dropIndex('id_producer', 'user_producer');
+        $this->dropIndex('id_product', 'product_prices');
+        $this->dropIndex('status', 'user');
+        $this->dropIndex('email', 'user');
+        $this->dropIndex('type', 'user');
+        $this->dropIndex('id_producer', 'user');
+        $this->dropIndex('date', 'distribution');
+        $this->dropIndex('id_producer', 'distribution');
+    }
+}

domain/Product/Product/Product.php

@@ -181,6 +181,8 @@ class Product extends ActiveRecordCommon implements StatusInterface
 
     public function afterFind()
     {
+        // @TODO : à optimiser en rendant obligatoire le champs taxrate au niveau des produits pour ne pas avoir à la
+        // charger depuis le producteur si elle n'est pas définie
         if ($this->taxRate == null) {
             if(GlobalParam::getCurrentProducerId() && $this->id_producer == GlobalParam::getCurrentProducerId()) {
                 $producer = GlobalParam::getCurrentProducer();

domain/User/User/User.php

@@ -151,13 +151,13 @@ class User extends ActiveRecordCommon implements IdentityInterface
             'product_price_percent' => 'Prix produits : pourcentage',
             'user_groups' => "Groupes d'utilisateurs",
             'evoliz_code' => 'Code client Evoliz',
-            'newsletter' => "Inscrit au bulletin d'information",
+            'newsletter' => "Inscrit à l'infolettre",
             'exclude_export_shopping_cart_labels' => "Exclure de l'export d'étiquettes",
             'send_mail_welcome' => "Envoyer un email de bienvenue",
             'email_sending_invoicing_documents' => 'Email facturation',
             'trust_alert' => 'Alerte confiance',
             'trust_alert_comment' => 'Commentaire',
-            'newsletter_souke' => 'Infolettre Souke'
+            'newsletter_souke' => "S'abonner à l'infolettre de Souke"
         ];
     }
 
@@ -223,9 +223,9 @@ class User extends ActiveRecordCommon implements IdentityInterface
     public function verifyEmail($attribute, $params)
     {
         if ($this->id) {
-            $user = User::find()->where("email LIKE :email AND type != :guest AND id != :id")->params(array(':email' => '%' . $this->email . '%', ':id' => $this->id, ':guest' => 'guest'))->one();
+            $user = User::find()->where("email LIKE :email AND type != :guest AND id != :id")->params(array(':email' => $this->email, ':id' => $this->id, ':guest' => 'guest'))->one();
         } else {
-            $user = User::find()->where("email LIKE :email AND type != :guest")->params(array(':email' => '%' . $this->email . '%', ':guest' => 'guest'))->one();
+            $user = User::find()->where("email LIKE :email AND type != :guest")->params(array(':email' => $this->email, ':guest' => 'guest'))->one();
         }
 
         if ($user) {

domain/User/UserProducer/UserProducerRepository.php

@@ -17,7 +17,7 @@ class UserProducerRepository extends AbstractRepository
     public function getDefaultOptionsSearch(): array
     {
         return [
-            self::WITH => ['producer'],
+            self::WITH => [],
             self::JOIN_WITH => [],
             self::ORDER_BY => '',
             self::ATTRIBUTE_ID_PRODUCER => 'user_producer.id_producer'

frontend/forms/SignupForm.php

@@ -73,6 +73,7 @@ class SignupForm extends Model
     public $verifyCode;
     public $is_test;
     public $newsletter = false;
+    public $newsletter_souke = false;
 
     /**
      * @inheritdoc
@@ -105,7 +106,7 @@ class SignupForm extends Model
                 return !$model->signup_producer_only;
             }],
             ['password', 'string', 'min' => 6, 'tooShort' => 'Votre mot de passe doit contenir au moins 6 caractères'],
-            [['is_producer', 'newsletter'], 'boolean'],
+            [['is_producer', 'newsletter', 'newsletter_souke'], 'boolean'],
             ['cgv', 'boolean'],
             ['cgv', function ($attribute, $params) {
                 $cgv = $this->$attribute;
@@ -218,10 +219,10 @@ class SignupForm extends Model
             'city' => 'Commune',
             'id_producer' => 'Producteur',
             'type' => 'Type de producteur',
-//            'free_price' => 'Prix libre',
             'id_tax_rate_default' => 'TVA par défaut',
             'verifyCode' => 'Code de vérification',
-            'newsletter' => "S'abonner au bulletin d'information de ce producteur"
+            'newsletter' => "S'abonner à l'infolettre de ce producteur",
+            'newsletter_souke' => "S'abonner à l'infolettre de Souke",
         ];
     }
 
@@ -318,6 +319,7 @@ class SignupForm extends Model
         $user->name = $this->name;
         $user->lastname = $this->lastname;
         $user->phone = $this->phone;
+        $user->newsletter_souke = $this->newsletter_souke;
     }
 
     public function populateProducer($producer)

frontend/views/site/producer.php

@@ -110,7 +110,6 @@ $this->setMeta('description', 'Veuillez vous connecter pour réserver les produi
                     <?= $form->field($signupForm, 'lastname') ?>
                     <?= $form->field($signupForm, 'name') ?>
                     <?= $form->field($signupForm, 'phone') ?>
-                    <?= $form->field($signupForm, 'newsletter')->checkbox() ?>
                     <?php if(strlen($producer->code)): ?>
                         <?= $form->field($signupForm, 'code',[
                             'inputTemplate' => '<div class="input-group"><span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>{input}</div>',
@@ -118,6 +117,14 @@ $this->setMeta('description', 'Veuillez vous connecter pour réserver les produi
                             ->label('Code du producteur')
                             ->hint('Renseignez-vous auprès de votre producteur pour qu\'il vous fournisse le code d\'accès') ;  ?>
                     <?php endif; ?>
+                    <div class="block-newsletter">
+                        <?= $form->field($signupForm, 'newsletter')
+                                ->hint(Yii::$app->parameterBag->get('newsletterProducerDescription'))
+                                ->checkbox() ?>
+                        <?= $form->field($signupForm, 'newsletter_souke')
+                                ->hint(Yii::$app->parameterBag->get('newsletterSoukeDescription'))
+                                ->checkbox() ?>
+                    </div>
                     <?= $form->field($signupForm, 'verifyCode')->widget(\yii\captcha\Captcha::className(), [
                         'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
                     ]) ?>

frontend/views/site/signup.php

@@ -90,7 +90,6 @@ $this->params['breadcrumbs'][] = $this->title;
                     <div id="fields-user">
                         <?= $form->field($model, 'id_producer')
                             ->dropDownList($dataProducers, ['prompt' => '--','encode' => false,'options' => $optionsProducers]) ?>
-                        <?= $form->field($model, 'newsletter')->checkbox() ?>
                         <div id="bloc-code-acces">
                         <?= $form->field($model, 'code',[
                                     'inputTemplate' => '<div class="input-group"><span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>{input}</div>',
@@ -99,6 +98,18 @@ $this->params['breadcrumbs'][] = $this->title;
                                 ->label('Code')
                                 ->hint('Renseignez-vous auprès de votre producteur pour qu\'il vous fournisse le code d\'accès') ;  ?>
                         </div>
+
+                        <div class="block-newsletter">
+                            <?= $form->field($model, 'newsletter')
+                                    ->hint(Yii::$app->parameterBag->get('newsletterProducerDescription'))
+                                    ->checkbox() ?>
+                        </div>
+                    </div>
+
+                    <div class="block-newsletter">
+                        <?= $form->field($model, 'newsletter_souke')
+                            ->hint(Yii::$app->parameterBag->get('newsletterSoukeDescription'))
+                            ->checkbox() ?>
                     </div>
 
                     <?= $form->field($model, 'verifyCode')->widget(\yii\captcha\Captcha::className(), [

frontend/views/site/signup_confirm.php

@@ -51,7 +51,7 @@ if($userModule->isProducer($user)) {
 }
 elseif($producerRedirect) {
     $urlRedirect = $this->getUrlManagerProducer()->createAbsoluteUrl(['site/index', 'slug_producer' => $producerRedirect->slug]);
-    $redirectLabel = "Redirection vers l'espace de votre producteur ...";
+    $redirectLabel = "Redirection vers la boutique de votre producteur ...";
 }
 
 ?>

frontend/views/user/update.php

@@ -59,6 +59,11 @@ $this->setIcon('user');
                 <?= $form->field($model, 'phone')->textInput() ?>
                 <?= $form->field($model, 'email')->textInput(); ?>
                 <?= $form->field($model, 'address')->textarea() ?>
+                <div class="block-newsletter">
+                    <?= $form->field($model, 'newsletter_souke')
+                            ->hint(Yii::$app->parameterBag->get('newsletterSoukeDescription'))
+                            ->checkbox() ?>
+                </div>
 
                 <h2>Mot de passe</h2>
                 <p>Renseignez les champs ci-dessous si vous souhaitez modifier votre mot de passe.</p>
@@ -66,9 +71,7 @@ $this->setIcon('user');
                 <?= $form->field($model, 'password_new')->passwordInput() ?>
                 <?= $form->field($model, 'password_new_confirm')->passwordInput() ?>
 
-
                 <div class="clr"></div>
-
                 <div class="form-group form-buttons">
                     <?= Html::submitButton('<i class="bi bi-pencil"></i> Modifier', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary', 'name' => 'user-profile-button']) ?>
                 </div>

frontend/web/css/screen.css

@@ -545,76 +545,76 @@ section#header-title h1 .glyphicon {
 #content #row-functionalities-rates .block-points-sale-products img {
   width: 40px;
 }
-/* line 540, ../sass/screen.scss */
+/* line 539, ../sass/screen.scss */
 #content #block-services .panel-body .panel-default {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-/* line 543, ../sass/screen.scss */
+/* line 542, ../sass/screen.scss */
 #content #block-services .panel-body .panel-default .panel-body {
   padding: 5px;
 }
-/* line 546, ../sass/screen.scss */
+/* line 545, ../sass/screen.scss */
 #content #block-services .panel-body .panel-default .panel-body h3 {
   margin-top: 0px;
   color: black;
   font-size: 1.2rem;
 }
-/* line 558, ../sass/screen.scss */
+/* line 556, ../sass/screen.scss */
 #content #block-rates .panel-default {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-/* line 560, ../sass/screen.scss */
+/* line 558, ../sass/screen.scss */
 #content #block-rates .panel-default .panel-heading {
   padding: 0px;
   margin-bottom: 20px;
 }
-/* line 564, ../sass/screen.scss */
+/* line 562, ../sass/screen.scss */
 #content #block-rates .panel-default .panel-body {
   padding: 0px;
 }
-/* line 570, ../sass/screen.scss */
+/* line 568, ../sass/screen.scss */
 #content #block-rates table th {
   font-weight: bold;
   font-size: 14px;
 }
-/* line 578, ../sass/screen.scss */
+/* line 576, ../sass/screen.scss */
 #content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
   color: black;
 }
 
-/* line 588, ../sass/screen.scss */
+/* line 586, ../sass/screen.scss */
 #content #contact {
   display: none;
 }
-/* line 592, ../sass/screen.scss */
+/* line 590, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 598, ../sass/screen.scss */
+/* line 596, ../sass/screen.scss */
 #content #contact .form-control:focus {
   /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
   border-color: $jaune ;*/
 }
-/* line 603, ../sass/screen.scss */
+/* line 601, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 607, ../sass/screen.scss */
+/* line 605, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 610, ../sass/screen.scss */
+/* line 608, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 616, ../sass/screen.scss */
+/* line 614, ../sass/screen.scss */
 #bookmarked-producers {
   padding: 0px;
   padding-top: 15px;
@@ -623,7 +623,7 @@ section#header-title h1 .glyphicon {
   border-bottom: solid 1px #e0e0e0;
   background-color: white;
 }
-/* line 624, ../sass/screen.scss */
+/* line 622, ../sass/screen.scss */
 #bookmarked-producers h2 {
   float: left;
   font-family: 'highvoltageregular';
@@ -634,30 +634,30 @@ section#header-title h1 .glyphicon {
   padding: 0px;
   color: black;
 }
-/* line 635, ../sass/screen.scss */
+/* line 633, ../sass/screen.scss */
 #bookmarked-producers #producers {
   position: relative;
   top: -5px;
   left: 5px;
 }
-/* line 641, ../sass/screen.scss */
+/* line 639, ../sass/screen.scss */
 #bookmarked-producers #discover {
   padding-bottom: 20px;
   text-align: center;
 }
-/* line 645, ../sass/screen.scss */
+/* line 643, ../sass/screen.scss */
 #bookmarked-producers #discover p {
   padding-bottom: 0px;
   color: #e4ac07;
 }
-/* line 650, ../sass/screen.scss */
+/* line 648, ../sass/screen.scss */
 #bookmarked-producers #discover .btn {
   background-color: #e4ac07;
   color: #ee6f42;
   border: solid 1px #e4ac07;
 }
 
-/* line 659, ../sass/screen.scss */
+/* line 657, ../sass/screen.scss */
 #footer {
   position: absolute;
   bottom: 0px;
@@ -669,7 +669,7 @@ section#header-title h1 .glyphicon {
   border-top: 0px none;
   color: white;
 }
-/* line 670, ../sass/screen.scss */
+/* line 668, ../sass/screen.scss */
 #footer a {
   color: white;
   font-family: 'worksans_light';
@@ -680,26 +680,26 @@ section#header-title h1 .glyphicon {
   border-right: solid 1px white;
   border: 0px none;
 }
-/* line 680, ../sass/screen.scss */
+/* line 678, ../sass/screen.scss */
 #footer a:hover {
   text-decoration: underline;
 }
-/* line 684, ../sass/screen.scss */
+/* line 682, ../sass/screen.scss */
 #footer a:last-child {
   border: 0px none;
 }
 
-/* line 692, ../sass/screen.scss */
+/* line 690, ../sass/screen.scss */
 .site-iamproducer .panel {
   text-align: center;
 }
-/* line 696, ../sass/screen.scss */
+/* line 694, ../sass/screen.scss */
 .site-iamproducer .word-animate {
   margin-top: 40px;
   margin-bottom: 60px;
   height: auto;
 }
-/* line 701, ../sass/screen.scss */
+/* line 699, ../sass/screen.scss */
 .site-iamproducer .word-animate span.functionality {
   display: inline-block;
   -moz-border-radius: 15px;
@@ -709,13 +709,13 @@ section#header-title h1 .glyphicon {
   color: black;
   padding: 15px 30px;
 }
-/* line 708, ../sass/screen.scss */
+/* line 706, ../sass/screen.scss */
 .site-iamproducer .word-animate span.functionality .glyphicon {
   position: relative;
   top: 4px;
   right: 6px;
 }
-/* line 716, ../sass/screen.scss */
+/* line 714, ../sass/screen.scss */
 .site-iamproducer .hook {
   font-size: 23px;
   line-height: 28px;
@@ -723,14 +723,14 @@ section#header-title h1 .glyphicon {
   margin-bottom: 30px;
 }
 
-/* line 727, ../sass/screen.scss */
+/* line 725, ../sass/screen.scss */
 .site-producers #producers-list #producer-search {
   margin-bottom: 40px;
   -moz-box-shadow: 0px 0px 15px #d5d5d5;
   -webkit-box-shadow: 0px 0px 15px #d5d5d5;
   box-shadow: 0px 0px 15px #d5d5d5;
 }
-/* line 731, ../sass/screen.scss */
+/* line 729, ../sass/screen.scss */
 .site-producers #producers-list #producer-search .input-group-text {
   padding: 20px;
   background-color: #f4efe8;
@@ -744,7 +744,7 @@ section#header-title h1 .glyphicon {
   -webkit-box-shadow: -30px 0px 15px -15px #ece4d8 inset;
   box-shadow: -30px 0px 15px -15px #ece4d8 inset;
 }
-/* line 741, ../sass/screen.scss */
+/* line 739, ../sass/screen.scss */
 .site-producers #producers-list #producer-search .form-control {
   border: 0px none;
   -moz-border-radius: 0px;
@@ -755,64 +755,64 @@ section#header-title h1 .glyphicon {
   padding: 10px 20px;
   color: black;
 }
-/* line 749, ../sass/screen.scss */
+/* line 747, ../sass/screen.scss */
 .site-producers #producers-list #producer-search .form-control:focus {
   -moz-box-shadow: none !important;
   -webkit-box-shadow: none !important;
   box-shadow: none !important;
 }
-/* line 753, ../sass/screen.scss */
+/* line 751, ../sass/screen.scss */
 .site-producers #producers-list #producer-search .form-control::placeholder {
   color: gray;
 }
-/* line 759, ../sass/screen.scss */
+/* line 757, ../sass/screen.scss */
 .site-producers #producers-list .alert-no-results {
   display: none;
 }
-/* line 763, ../sass/screen.scss */
+/* line 761, ../sass/screen.scss */
 .site-producers #producers-list .panel {
   margin-bottom: 40px;
 }
-/* line 766, ../sass/screen.scss */
+/* line 764, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body {
   border: 0px none;
   overflow: hidden;
 }
-/* line 770, ../sass/screen.scss */
+/* line 768, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body h2 {
   margin-top: 0px;
   margin-bottom: 10px;
   padding-bottom: 0px;
 }
-/* line 775, ../sass/screen.scss */
+/* line 773, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body h2 a.producer-link {
   color: #e4ac07;
   text-decoration: none;
 }
-/* line 780, ../sass/screen.scss */
+/* line 778, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body h2 .btn-bookmark {
   position: relative;
   top: 0px;
   font-size: 1.3rem;
   color: gray;
 }
-/* line 788, ../sass/screen.scss */
+/* line 786, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body p {
   padding-bottom: 0px;
 }
-/* line 792, ../sass/screen.scss */
+/* line 790, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-body .producer-type {
   font-family: 'worksans_regular';
   font-size: 1.05rem;
   text-transform: uppercase;
   margin-bottom: 10px;
 }
-/* line 800, ../sass/screen.scss */
+/* line 798, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-footer {
   border: 0px none;
   padding: 0px;
 }
-/* line 804, ../sass/screen.scss */
+/* line 802, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-footer a {
   display: block;
   width: 100%;
@@ -823,7 +823,7 @@ section#header-title h1 .glyphicon {
   padding-bottom: 0px;
   margin: 0px;
 }
-/* line 814, ../sass/screen.scss */
+/* line 812, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-footer a.btn-secondary {
   color: #e4ac07;
   background-color: white;
@@ -832,7 +832,7 @@ section#header-title h1 .glyphicon {
   -webkit-box-shadow: -30px 0px 15px -15px #ece4d8 inset;
   box-shadow: -30px 0px 15px -15px #ece4d8 inset;
 }
-/* line 820, ../sass/screen.scss */
+/* line 818, ../sass/screen.scss */
 .site-producers #producers-list .panel .panel-footer a.btn-secondary:hover {
   background-color: #f4efe8;
   border: solid 1px #f4efe8;
@@ -840,7 +840,7 @@ section#header-title h1 .glyphicon {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-/* line 836, ../sass/screen.scss */
+/* line 834, ../sass/screen.scss */
 .site-producers #producers-list .panel .logo {
   float: right;
   position: relative;
@@ -854,7 +854,7 @@ section#header-title h1 .glyphicon {
   text-align: right;
   overflow: hidden;
 }
-/* line 847, ../sass/screen.scss */
+/* line 845, ../sass/screen.scss */
 .site-producers #producers-list .panel .logo .img-logo {
   position: absolute;
   top: 50%;
@@ -863,91 +863,91 @@ section#header-title h1 .glyphicon {
   max-width: 90px;
   max-height: 90px;
 }
-/* line 859, ../sass/screen.scss */
+/* line 857, ../sass/screen.scss */
 .site-producers #wrapper-producers-map {
   z-index: 10;
 }
-/* line 862, ../sass/screen.scss */
+/* line 860, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map {
   height: 750px;
   border: solid 1px #e0e0e0;
 }
-/* line 866, ../sass/screen.scss */
+/* line 864, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map.fixed {
   position: fixed !important;
   top: 20px;
   width: 300px;
   height: 750px;
 }
-/* line 874, ../sass/screen.scss */
+/* line 872, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map a {
   text-decoration: none;
 }
-/* line 878, ../sass/screen.scss */
+/* line 876, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map .popup-producer {
   font-size: 14px;
   color: #505050;
 }
-/* line 882, ../sass/screen.scss */
+/* line 880, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map .popup-producer .name {
   font-family: 'worksans_bold';
   color: #e4ac07;
   font-size: 23px;
   margin-bottom: 2px;
 }
-/* line 889, ../sass/screen.scss */
+/* line 887, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map .popup-producer .type {
   font-family: 'worksans_regular';
   text-transform: uppercase;
   font-size: 16px;
   margin-bottom: 5px;
 }
-/* line 896, ../sass/screen.scss */
+/* line 894, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map .popup-producer .address {
   font-family: 'worksans_regular';
   margin-bottom: 14px;
   color: gray;
 }
-/* line 902, ../sass/screen.scss */
+/* line 900, ../sass/screen.scss */
 .site-producers #wrapper-producers-map #producers-map .popup-producer .link {
   color: white;
   text-align: right;
 }
 
-/* line 914, ../sass/screen.scss */
+/* line 912, ../sass/screen.scss */
 #content .site-about .panel .panel-heading h2 {
   margin: 0px;
   padding: 0px;
 }
-/* line 921, ../sass/screen.scss */
+/* line 919, ../sass/screen.scss */
 #content .site-about .panel .panel-body h2 {
   margin-bottom: 20px;
   padding-bottom: 0px;
   margin-top: 0px;
 }
-/* line 927, ../sass/screen.scss */
+/* line 925, ../sass/screen.scss */
 #content .site-about .panel .panel-body p:last-child {
   margin-bottom: 0px;
   padding-bottom: 5px;
 }
-/* line 936, ../sass/screen.scss */
+/* line 934, ../sass/screen.scss */
 #content .site-about #few-numbers .panel-body {
   padding: 0px 20px 20px 20px;
 }
-/* line 940, ../sass/screen.scss */
+/* line 938, ../sass/screen.scss */
 #content .site-about #few-numbers .item {
   text-align: center;
   padding-top: 20px;
   padding-bottom: 10px;
 }
-/* line 945, ../sass/screen.scss */
+/* line 943, ../sass/screen.scss */
 #content .site-about #few-numbers .item .number {
   font-family: 'worksans_bold';
   font-weight: bold;
   font-size: 35px;
   color: #ee6f42;
 }
-/* line 952, ../sass/screen.scss */
+/* line 950, ../sass/screen.scss */
 #content .site-about #few-numbers .item .description {
   font-size: 16px;
   line-height: 20px;
@@ -955,28 +955,28 @@ section#header-title h1 .glyphicon {
   font-family: 'worksans_medium';
   text-transform: uppercase;
 }
-/* line 960, ../sass/screen.scss */
+/* line 958, ../sass/screen.scss */
 #content .site-about #few-numbers .item .detail {
   color: gray;
 }
-/* line 966, ../sass/screen.scss */
+/* line 964, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials {
   transition: all 0.4s;
 }
-/* line 969, ../sass/screen.scss */
+/* line 967, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .item, #content .site-about #carousel-producers-testimonials .carousel-caption {
   transition: all 0.4s;
 }
-/* line 973, ../sass/screen.scss */
+/* line 971, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-indicators {
   display: none;
 }
-/* line 977, ../sass/screen.scss */
+/* line 975, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-control-next,
 #content .site-about #carousel-producers-testimonials .carousel-control-prev {
   background: none;
 }
-/* line 982, ../sass/screen.scss */
+/* line 980, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-control-next .bi,
 #content .site-about #carousel-producers-testimonials .carousel-control-prev .bi {
   position: absolute;
@@ -984,63 +984,63 @@ section#header-title h1 .glyphicon {
   font-size: 35px;
   color: black;
 }
-/* line 989, ../sass/screen.scss */
+/* line 987, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-control-next.carousel-control-next .bi,
 #content .site-about #carousel-producers-testimonials .carousel-control-prev.carousel-control-next .bi {
   right: 0px;
 }
-/* line 993, ../sass/screen.scss */
+/* line 991, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-control-next.carousel-control-prev .bi,
 #content .site-about #carousel-producers-testimonials .carousel-control-prev.carousel-control-prev .bi {
   left: 0px;
 }
-/* line 999, ../sass/screen.scss */
+/* line 997, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-item .carousel-caption {
   top: 20px;
   color: black;
   text-shadow: none;
   padding: 0px;
 }
-/* line 1005, ../sass/screen.scss */
+/* line 1003, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-item .carousel-caption img {
   display: block;
   width: 150px;
   height: auto;
   margin: 0px auto 15px auto;
 }
-/* line 1013, ../sass/screen.scss */
+/* line 1011, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-item .carousel-caption .producer-testimony {
   margin-bottom: 12px;
 }
-/* line 1017, ../sass/screen.scss */
+/* line 1015, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-item .carousel-caption .producer-details {
   font-style: italic;
   color: gray;
 }
-/* line 1021, ../sass/screen.scss */
+/* line 1019, ../sass/screen.scss */
 #content .site-about #carousel-producers-testimonials .carousel-item .carousel-caption .producer-details .producer-name {
   color: #ee6f42;
 }
 
-/* line 1031, ../sass/screen.scss */
+/* line 1029, ../sass/screen.scss */
 #content .site-service #panel-go-further {
   text-align: center;
 }
 
-/* line 1036, ../sass/screen.scss */
+/* line 1034, ../sass/screen.scss */
 #content #mentions {
   padding-top: 20px;
 }
-/* line 1039, ../sass/screen.scss */
+/* line 1037, ../sass/screen.scss */
 #content #mentions div.content {
   width: 60%;
   font-size: 90%;
 }
-/* line 1044, ../sass/screen.scss */
+/* line 1042, ../sass/screen.scss */
 #content #mentions p {
   padding-bottom: 15px;
 }
-/* line 1048, ../sass/screen.scss */
+/* line 1046, ../sass/screen.scss */
 #content #mentions h2 {
   color: black;
   padding-bottom: 40px;
@@ -1048,7 +1048,7 @@ section#header-title h1 .glyphicon {
   line-height: 35px;
   font-family: 'highvoltageregular';
 }
-/* line 1056, ../sass/screen.scss */
+/* line 1054, ../sass/screen.scss */
 #content #mentions h3 {
   font-family: "highvoltageregular";
   font-size: 18px;
@@ -1057,44 +1057,44 @@ section#header-title h1 .glyphicon {
   color: black;
 }
 
-/* line 1071, ../sass/screen.scss */
+/* line 1069, ../sass/screen.scss */
 .vegas-loading {
   display: none;
 }
 
-/* line 1078, ../sass/screen.scss */
+/* line 1076, ../sass/screen.scss */
 #profil-user .form-group.field-user-no_mail label {
   font-weight: normal;
 }
-/* line 1082, ../sass/screen.scss */
+/* line 1080, ../sass/screen.scss */
 #profil-user .form-group label {
   cursor: pointer;
 }
-/* line 1087, ../sass/screen.scss */
+/* line 1085, ../sass/screen.scss */
 #profil-user #mails-days-distribution .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 1091, ../sass/screen.scss */
+/* line 1089, ../sass/screen.scss */
 #profil-user #mails-days-distribution .form-group label {
   font-weight: normal;
 }
-/* line 1097, ../sass/screen.scss */
+/* line 1095, ../sass/screen.scss */
 #profil-user p.strong {
   font-weight: bold;
 }
-/* line 1101, ../sass/screen.scss */
+/* line 1099, ../sass/screen.scss */
 #profil-user h2 {
   text-transform: none;
   font-size: 25px;
 }
-/* line 1105, ../sass/screen.scss */
+/* line 1103, ../sass/screen.scss */
 #profil-user h2:first-child {
   margin-top: 0px;
 }
 
 /* login */
-/* line 1116, ../sass/screen.scss */
+/* line 1114, ../sass/screen.scss */
 .back-white, .site-login .col-lg-5, .site-signup .col-lg-5 {
   background-color: white;
   padding: 30px;
@@ -1103,7 +1103,7 @@ section#header-title h1 .glyphicon {
   border-radius: 5px;
 }
 
-/* line 1123, ../sass/screen.scss */
+/* line 1121, ../sass/screen.scss */
 .site-login .col-lg-5 {
   margin: 0px auto;
   float: none;
@@ -1111,53 +1111,64 @@ section#header-title h1 .glyphicon {
 }
 
 /* signup */
-/* line 1133, ../sass/screen.scss */
+/* line 1132, ../sass/screen.scss */
+form .block-newsletter .help-block-error {
+  display: none;
+}
+/* line 1135, ../sass/screen.scss */
+form .block-newsletter .help-block {
+  margin-top: 3px;
+  padding-left: 20px;
+  color: gray;
+}
+
+/* line 1142, ../sass/screen.scss */
 .modal-backdrop {
   z-index: 999;
 }
 
-/* line 1138, ../sass/screen.scss */
+/* line 1147, ../sass/screen.scss */
 .site-signup .col-lg-5 {
   margin: 0px auto;
   float: none;
   max-width: 500px;
 }
 
-/* line 1151, ../sass/screen.scss */
+/* line 1160, ../sass/screen.scss */
 #form-signup #user-producer {
   margin-bottom: 30px;
 }
-/* line 1156, ../sass/screen.scss */
+/* line 1165, ../sass/screen.scss */
 #form-signup #signupform-id_producer option:disabled {
   font-weight: bold;
   color: black;
 }
-/* line 1162, ../sass/screen.scss */
+/* line 1171, ../sass/screen.scss */
 #form-signup #champs-producer {
   display: none;
 }
-/* line 1166, ../sass/screen.scss */
+/* line 1175, ../sass/screen.scss */
 #form-signup #buttons-signup {
   margin-top: 30px;
 }
-/* line 1170, ../sass/screen.scss */
+/* line 1179, ../sass/screen.scss */
 #form-signup .field-signupform-is_test {
   display: none;
 }
 
-/* line 1175, ../sass/screen.scss */
+/* line 1184, ../sass/screen.scss */
 #col-left {
   padding: 0px;
   z-index: 15;
 }
-/* line 1179, ../sass/screen.scss */
+/* line 1188, ../sass/screen.scss */
 #col-left .affix {
   width: 25%;
   border-right: solid 1px #e0e0e0;
   background-color: #FAFAFA;
   height: 100%;
 }
-/* line 1186, ../sass/screen.scss */
+/* line 1195, ../sass/screen.scss */
 #col-left #link-home {
   text-decoration: none;
   font-size: 22px;
@@ -1166,28 +1177,28 @@ section#header-title h1 .glyphicon {
   padding: 10px;
   background-color: #e4ac07;
 }
-/* line 1194, ../sass/screen.scss */
+/* line 1203, ../sass/screen.scss */
 #col-left #link-home img {
   height: 50px;
   margin-bottom: 5px;
   float: left;
 }
-/* line 1200, ../sass/screen.scss */
+/* line 1209, ../sass/screen.scss */
 #col-left #link-home .text {
   padding-left: 62px;
 }
-/* line 1203, ../sass/screen.scss */
+/* line 1212, ../sass/screen.scss */
 #col-left #link-home .text .bap {
   font-family: "comfortaalight";
   font-size: 24px;
 }
-/* line 1208, ../sass/screen.scss */
+/* line 1217, ../sass/screen.scss */
 #col-left #link-home .text .plateforme {
   font-size: 17px;
   font-family: "myriadpro-light";
   color: #ee6f42;
 }
-/* line 1216, ../sass/screen.scss */
+/* line 1225, ../sass/screen.scss */
 #col-left h2 {
   font-family: 'myriadpro-regular';
   color: black;
@@ -1195,37 +1206,37 @@ section#header-title h1 .glyphicon {
   margin-bottom: 10px;
   padding: 15px 0px 5px 15px;
 }
-/* line 1224, ../sass/screen.scss */
+/* line 1233, ../sass/screen.scss */
 #col-left #links {
   background-color: white;
   margin-bottom: 20px;
 }
-/* line 1230, ../sass/screen.scss */
+/* line 1239, ../sass/screen.scss */
 #col-left #links ul li a {
   text-align: center;
   border-right: solid 1px #e0e0e0;
 }
-/* line 1234, ../sass/screen.scss */
+/* line 1243, ../sass/screen.scss */
 #col-left #links ul li a:hover {
   background-color: #ee6f42;
   color: white;
 }
-/* line 1240, ../sass/screen.scss */
+/* line 1249, ../sass/screen.scss */
 #col-left #links ul li:last-child a {
   border-right: 0px none;
 }
-/* line 1250, ../sass/screen.scss */
+/* line 1259, ../sass/screen.scss */
 #col-left #producers nav.nav-producers ul li a {
   padding-left: 50px;
   height: 40px;
 }
-/* line 1256, ../sass/screen.scss */
+/* line 1265, ../sass/screen.scss */
 #col-left #producers nav.nav-producers ul li.active a {
   background-color: #ee6f42;
   position: relative;
   color: white;
 }
-/* line 1261, ../sass/screen.scss */
+/* line 1270, ../sass/screen.scss */
 #col-left #producers nav.nav-producers ul li.active a:after {
   right: -40px;
   top: 50%;
@@ -1240,18 +1251,18 @@ section#header-title h1 .glyphicon {
   border-width: 20px;
   margin-top: -20px;
 }
-/* line 1280, ../sass/screen.scss */
+/* line 1289, ../sass/screen.scss */
 #col-left ul {
   list-style-type: none;
   margin: 0px;
   padding: 0px;
 }
-/* line 1285, ../sass/screen.scss */
+/* line 1294, ../sass/screen.scss */
 #col-left ul li {
   margin: 0px;
   padding: 0px;
 }
-/* line 1289, ../sass/screen.scss */
+/* line 1298, ../sass/screen.scss */
 #col-left ul li a {
   text-decoration: none;
   font-family: 'comfortaaregular';
@@ -1262,18 +1273,18 @@ section#header-title h1 .glyphicon {
   display: block;
   color: black;
 }
-/* line 1299, ../sass/screen.scss */
+/* line 1308, ../sass/screen.scss */
 #col-left ul li a span.name, #col-left ul li a span.wording {
   display: none;
 }
-/* line 1306, ../sass/screen.scss */
+/* line 1315, ../sass/screen.scss */
 #col-left p {
   padding: 20px;
   padding-top: 0px;
   color: gray;
 }
 
-/* line 1314, ../sass/screen.scss */
+/* line 1323, ../sass/screen.scss */
 #content .header-title {
   height: 79px;
   padding: 20px 20px;
@@ -1288,7 +1299,7 @@ section#header-title h1 .glyphicon {
   -webkit-box-shadow: 0px 0px 8px #e0e0e0;
   box-shadow: 0px 0px 8px #e0e0e0;
 }
-/* line 1326, ../sass/screen.scss */
+/* line 1335, ../sass/screen.scss */
 #content .header-title h1 {
   color: black;
   font-family: 'myriadpro-regular';
@@ -1296,7 +1307,7 @@ section#header-title h1 .glyphicon {
   font-size: 25px;
   text-transform: uppercase;
 }
-/* line 1334, ../sass/screen.scss */
+/* line 1343, ../sass/screen.scss */
 #content .header-title h2 {
   color: gray;
   text-transform: none;
@@ -1305,16 +1316,16 @@ section#header-title h1 .glyphicon {
   line-height: 20px;
 }
 
-/* line 1345, ../sass/screen.scss */
+/* line 1354, ../sass/screen.scss */
 .header-producer {
   z-index: 1;
 }
-/* line 1348, ../sass/screen.scss */
+/* line 1357, ../sass/screen.scss */
 .header-producer #block-main-img {
   height: 144px;
   overflow: hidden;
 }
-/* line 1352, ../sass/screen.scss */
+/* line 1361, ../sass/screen.scss */
 .header-producer #block-main-img #main-img {
   width: 100%;
   height: auto;
@@ -1324,7 +1335,7 @@ section#header-title h1 .glyphicon {
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 1361, ../sass/screen.scss */
+/* line 1370, ../sass/screen.scss */
 .header-producer h1 {
   font-family: 'comfortaaregular';
   text-align: center;
@@ -1332,23 +1343,23 @@ section#header-title h1 .glyphicon {
   top: 30px;
   left: 40px;
 }
-/* line 1368, ../sass/screen.scss */
+/* line 1377, ../sass/screen.scss */
 .header-producer h1 span {
   background-color: rgba(255, 255, 255, 0.8);
   padding: 10px 30px;
   border: dotted 1px black;
 }
 
-/* line 1379, ../sass/screen.scss */
+/* line 1388, ../sass/screen.scss */
 nav#menu-producer {
   border-bottom: solid 1px #e0e0e0;
 }
-/* line 1383, ../sass/screen.scss */
+/* line 1392, ../sass/screen.scss */
 nav#menu-producer ul li {
   padding: 0px;
   margin: 0px;
 }
-/* line 1387, ../sass/screen.scss */
+/* line 1396, ../sass/screen.scss */
 nav#menu-producer ul li a {
   border-right: solid 1px #e0e0e0;
   text-decoration: none;
@@ -1356,47 +1367,47 @@ nav#menu-producer ul li a {
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 1392, ../sass/screen.scss */
+/* line 1401, ../sass/screen.scss */
 nav#menu-producer ul li a:hover {
   background-color: #ee6f42;
   color: white;
 }
 
-/* line 1402, ../sass/screen.scss */
+/* line 1411, ../sass/screen.scss */
 .site-contact .col-lg-6 {
   margin: 0px auto;
   float: none;
 }
-/* line 1407, ../sass/screen.scss */
+/* line 1416, ../sass/screen.scss */
 .site-contact .form-group.submit {
   text-align: right;
 }
 
-/* line 1413, ../sass/screen.scss */
+/* line 1422, ../sass/screen.scss */
 .site-opinion .col-lg-6 {
   margin: 0px auto;
   float: none;
 }
-/* line 1418, ../sass/screen.scss */
+/* line 1427, ../sass/screen.scss */
 .site-opinion .field-opinionform-istest {
   display: none;
 }
-/* line 1422, ../sass/screen.scss */
+/* line 1431, ../sass/screen.scss */
 .site-opinion .form-group.submit {
   text-align: center;
 }
 
-/* line 1429, ../sass/screen.scss */
+/* line 1438, ../sass/screen.scss */
 #site-prices .panel p {
   padding-bottom: 0px;
 }
 
-/* line 1436, ../sass/screen.scss */
+/* line 1445, ../sass/screen.scss */
 #contact-form .field-contactform-istest {
   display: none;
 }
 
-/* line 1442, ../sass/screen.scss */
+/* line 1451, ../sass/screen.scss */
 .site-request-password-reset .col-lg-6 {
   margin: 0px auto;
 }

frontend/web/sass/screen.scss

@@ -536,7 +536,6 @@ section#header-title {
 
   #block-services {
     .panel-body {
-
       .panel-default {
         @include box-shadow(none);
 
@@ -554,7 +553,6 @@ section#header-title {
   }
 
   #block-rates {
-
     .panel-default {
       @include box-shadow(none);
       .panel-heading {
@@ -1130,6 +1128,17 @@ $max-width-form: 500px;
 
 /* signup */
 
+form .block-newsletter {
+  .help-block-error {
+    display: none;
+  }
+  .help-block {
+    margin-top: 3px;
+    padding-left: 20px;
+    color: gray;
+  }
+}
+
 .modal-backdrop {
   z-index: 999;
 }

producer/views/order/order.php

@@ -79,7 +79,7 @@ $this->setTitle('Commander');
         </div>
     </div>
     <div class="wrapper">
-        <div v-if="!loadingInit && distributions.length == 0" class="alert alert-warning">
+        <div v-if="!loadingInit && !pointSaleActive && distributions.length == 0" class="alert alert-warning">
             Aucune distribution à venir chez ce producteur.
         </div>
         <div v-else>
@@ -128,19 +128,11 @@ $this->setTitle('Commander');
                             {{ countProductOrdered() }} produit{{ (countProductOrdered() > 1) ? 's' : '' }}
                         </div>
                     </li>
-                    <!--<li id="step-payment" :class="'col-md-3 '+((step == 'payment') ? 'active' : '')">
-                        <button @click="changeStep('payment')"
-                                :class="'btn '+ (step == 'payment' ? 'btn-primary' : 'btn-secondary')"
-                                :disabled="step == 'date' || step == 'point-sale' || step == 'products'">
-                            <span class="button-content"><span
-                                        class="glyphicon glyphicon-ok"></span> Confirmation</span>
-                        </button>
-                    </li>-->
                 </ul>
                 <div class="clr"></div>
             </div>
             <div class="content">
-                <div v-if="order" class="alert alert-warning alert-edit-order">
+                <div v-if="order && date" class="alert alert-warning alert-edit-order">
                     <div class="glyphicon glyphicon-pencil"></div>
                     Attention, vous êtes en train de modifier votre commande du <strong>{{ dateFormat }}</strong>.
                 </div>
@@ -160,13 +152,15 @@ $this->setTitle('Commander');
                 </div>
                 <transition name="slide">
                     <div id="content-step-date" v-if="step == 'date'">
-                        <div v-if="!loading">
+                        <div v-if="!loading && pointSaleActive && distributions.length == 0" class="alert alert-warning">
+                            Aucune distribution à venir sur ce point de vente.
+                        </div>
+                        <div v-else-if="!loading">
                             <?php if ($producer->behavior_order_select_distribution == Producer::BEHAVIOR_ORDER_SELECT_DISTRIBUTION_LIST): ?>
                             <div style="display:none ;">
                                 <?php endif; ?>
                                 <div id="legend">
-                                    <div><span id="distribution-date-color"></span> Prochains jours de distribution
-                                    </div>
+                                    <div><span id="distribution-date-color"></span> Prochains jours de distribution</div>
                                     <div><span id="order-date-color"></span> Vos commandes déjà enregistrées</div>
                                 </div>
                                 <div id="calendar">
@@ -503,7 +497,7 @@ $this->setTitle('Commander');
                                                             </label>
                                                         </div>
                                                         <div class="col-md-4" v-if="isPaymentMethodCreditActive()">
-                                                            <template v-if="user && (pointSaleActive.credit_functioning == 'mandatory' || (pointSaleActive.credit_functioning == 'user' && user.credit_active)) && !checkCreditLimit(order) ">
+                                                            <template v-if="errorCreditMandatoryAndLimit()">
                                                                 <div class="alert alert-danger">
                                                                     <i class="bi bi-piggy-bank"></i>
                                                                     Vous devez
@@ -614,7 +608,7 @@ $this->setTitle('Commander');
                                                 </div>
                                             </div>
                                             <div class="block-actions">
-                                                <button class="btn btn-primary" disabled="disabled" v-if="disableConfirmButton || !oneProductOrdered()">
+                                                <button class="btn btn-primary" disabled="disabled" v-if="disableConfirmButton || errorCreditMandatoryAndLimit() || !oneProductOrdered()">
                                                     <span v-if="disableConfirmButton" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
                                                     Je confirme ma commande
                                                 </button>

producer/web/js/vuejs/order-order.js

@@ -145,8 +145,8 @@ var app = new Vue({
                     app.calendar.availableDates = [];
 
                     var distributions = response.data.distributions;
+                    app.distributions = distributions;
                     if (distributions.length) {
-                        app.distributions = distributions;
                         var arrayDate;
                         var highlightStyle = {
                             style: {
@@ -579,6 +579,13 @@ var app = new Vue({
                 && !this.isPaymentMethodCreditActiveFunctioningUser(true)
                 && !this.isPaymentMethodCreditActiveFunctioningMandatory()
         },
+        errorCreditMandatoryAndLimit: function() {
+            return this.user && (
+                    this.pointSaleActive.credit_functioning == 'mandatory'
+                    || (this.pointSaleActive.credit_functioning == 'user' && user.credit_active)
+                )
+                && !this.checkCreditLimit(this.order);
+        },
         confirmClick: function() {
 
             var app = this ;