Merge branch 'dev'

backend/controllers/CommandeController.php

             $id_etablissement = Yii::$app->user->identity->id_etablissement;
 
         $commandes = Commande::findBy([
-                    'date' => $date,
-                    'id_etablissement' => $id_etablissement,
-                    'orderby' => 'commentaire_point_vente ASC, user.nom ASC'
-                ]);
+            'date' => $date,
+            'id_etablissement' => $id_etablissement,
+            'orderby' => 'commentaire_point_vente ASC, user.nom ASC'
+        ]);
 
         foreach ($commandes as $c)
             $c->init();
                     foreach ($historique as $h) {
                         $html .= '<tr>'
                                 . '<td>' . date('d/m/Y H:i:s', strtotime($h->date)) . '</td>'
-                                . '<td>' . Html::encode($h->userAction->nom . ' ' . $h->userAction->prenom) . '</td>'
+                                . '<td>' . Html::encode($h->strUserAction()) . '</td>'
                                 . '<td>' . $h->getStrLibelle() . '</td>'
                                 . '<td>' . ($h->isTypeDebit() ? '- '.$h->getMontant(true) : '') . '</td>'
                                 . '<td>' . ($h->isTypeCredit() ? '+ '.$h->getMontant(true) : '') . '</td>'

backend/controllers/CronController.php

         }
     }
 
-    public function actionSendCommandes($key = '') {
+    public function actionProcessCommandes($key = '') {
         if ($key == '64ac0bdab7e9f5e48c4d991ec5201d57') {
             $heure = date('H');
 
                         ]);
 
                 if ($production && $heure == $e['heure_limite_commande']) {
+                    
+                    /*
+                     * Paiement des commandes (paiement automatique)
+                     */
+                    
+                    $commandes = Commande::find()
+                        ->with('commandeProduits', 'user')
+                        ->joinWith('production')
+                        ->where(['production.date' => $date])
+                        ->orderBy('date ASC')
+                        ->all();
+
+                    foreach($commandes as $c) {
+                        if($c->paiement_automatique && Etablissement::getConfig('credit_pain', $c->production->id_etablissement)) {
+                            $c->init() ;
+
+                            if ($c->getMontantRestant() > 0) {
+                                $c->creditHistorique(
+                                    CreditHistorique::TYPE_PAIEMENT, 
+                                    $c->getMontantRestant(), 
+                                    $c->production->id_etablissement, 
+                                    $c->id_user,
+                                    User::ID_USER_SYSTEM
+                                );
+                            }
+                        }
+                    }
+                    
+                    /*
+                     * Envoi des commandes par email au producteur
+                     */
+                    
                     $commandes = Commande::find()
                             ->with('commandeProduits', 'user')
                             ->joinWith('production')

backend/views/commande/report.php

         
         $html .= '<h3>'.$pv->nom.'</h3>' ;
 
+        $col_credit_pain = '' ;
+        if($pv->credit_pain) {
+            $col_credit_pain = '<th>Rappel crédit</th>' ;
+        }
+        
         $html .= '<table class="table table-bordered">'
             . '<thead>'
                 . '<tr>'
                     . '<th>Client</th>'
                     . '<th>Produits</th>'
                     . '<th>Commentaire</th>' 
+                    . $col_credit_pain 
                     . '<th>Montant</th>'
                 . '</tr>'
             . '<tbody>';
                     
                     $html .= '<td>'.substr($str_produits, 0, strlen($str_produits) - 2).'</td>';
                     $html .= '<td>'.$c->commentaire.'</td>';
-                    $html .= '<td>'.number_format($c->montant, 2) . ' € ';
+                    
+                    if($pv->credit_pain) {
+                        $credit = '' ;
+                        if(isset($c->user) && isset($c->user->userEtablissement)) {
+                            $credit = number_format($c->user->userEtablissement[0]->credit,2).' €' ;
+                        }
+                        $html .= '<td>'.$credit.'</td>' ;       
+                    }
+                    
+                    $html .= '<td><strong>'.number_format($c->montant, 2) . ' € ';
 
                     if($c->getStatutPaiement() == Commande::STATUT_PAYEE)
                     {
                         $html .= '(surplus : '.$c->getMontantSurplus(true).' à rembourser)' ;
                     }
                     
-                    
-                    $html .= '</td>' ;
+                    $html .= '</strong></td>' ;
                     
                     $html .= '</tr>' ;
                     
                 $str_produits = substr($str_produits, 0, strlen($str_produits) - 2) ;
                 
                 $html .= '<td>'.$str_produits.'</td><td></td>' ;
+                if($pv->credit_pain) {
+                    $html .= '<td></td>' ;
+                }
                 $html .= '<td><strong>'.number_format($pv->recettes_pain, 2) . ' €</strong></td>';
                 
                 $html .= '</tbody></table><pagebreak>' ;

backend/views/user/credit.php

                     <?php foreach($historique as $ch): ?>
                         <tr>
                             <td><?= $ch->getDate(true) ; ?></td>
-                            <td><?php if(isset($ch->userAction)): echo Html::encode($ch->userAction->nom. ' '.$ch->userAction->prenom) ; else: echo 'Administrateur' ;endif;  ?></td>
+                            <td><?= Html::encode($ch->strUserAction()); ?></td>
                             <td><?= $ch->getStrLibelle(); ?></td>
                             <td>
                                 <?php if($ch->isTypeDebit()): ?>

common/models/Commande.php

  * @property string $date_update
  * @property integer $id_point_vente
  * @property integer $id_production
+ * @property boolean $paiement_automatique
  */
 class Commande extends \yii\db\ActiveRecord {
 
         return [
             [['id_user', 'date', 'id_point_vente', 'id_production'], 'required', 'message' => ''],
             [['id_user', 'id_point_vente', 'id_production'], 'integer'],
+            [['paiement_automatique'], 'boolean'],
             [['date', 'date_update', 'commentaire', 'commentaire_point_vente'], 'safe']
         ];
     }
 
         $commandes = Commande::find()
                 ->with('commandeProduits', 'creditHistorique', 'pointVente')
-                ->joinWith(['production', 'user'])
+                ->joinWith(['production', 'user','user.userEtablissement'])
                 ->where(['production.id_etablissement' => $params['id_etablissement']]);
 
         if (isset($params['condition']))
             $commandes = $commandes->limit($params['limit']);
 
         $commandes = $commandes->all();
-
+        
         return $commandes;
     }
 

common/models/CommandeAuto.php

             $commande->type = Commande::TYPE_AUTO;
             $commande->id_point_vente = $this->id_point_vente;
             $commande->id_production = $production->id;
-
+            $commande->paiement_automatique = $this->paiement_automatique ;
+            
             $point_vente_user = PointVenteUser::find()
                     ->where(['id_point_vente' => $this->id_point_vente, 'id_user' => $this->id_user])
                     ->one();
 
             if (!$produits_add) {
                 $commande->delete();
-            } else {
-                // on débite automatiquement le crédit pain du client
-                if ($commande->id_user &&
-                        $this->paiement_automatique &&
-                        Etablissement::getConfig('credit_pain')) {
-                    $commande = Commande::find()
-                            ->with('commandeProduits')
-                            ->where(['id' => $commande->id])
-                            ->one();
-
-                    $commande->init();
-
-                    $user_action = User::find()->where([
-                                'id_etablissement' => $production->id_etablissement,
-                                'status' => 11
-                            ])->one();
-
-                    if ($user_action)
-                        $id_user_action = $user_action->id;
-                    else
-                        $id_user_action = NULL;
-
-                    if ($commande->getMontant() > 0) {
-                        $commande->creditHistorique(
-                            CreditHistorique::TYPE_PAIEMENT, 
-                            $commande->getMontant(), 
-                            $production->id_etablissement, 
-                            $commande->id_user,
-                            $id_user_action
-                        );
-                    }
-                }
-            }
+            } 
         }
     }
-
 }

common/models/CreditHistorique.php

             default: return 'Crédit pain' ;
         }
     }
+    
+    public function strUserAction() {
+        if($this->userAction) {
+            return $this->userAction->nom . ' ' . $this->userAction->prenom ;
+        }
+        else {
+            return 'Système' ;
+        }
+    }
 
 }

common/models/User.php

     const STATUS_BOULANGER = 11;
     const STATUS_ADMIN = 13;
 
+    const ID_USER_SYSTEM = 0 ;
+    
     var $password_old;
     var $password_new;
     var $password_new_confirm;

console/migrations/m180315_090156_add_champs_commande_paiement_auto.php

+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+class m180315_090156_add_champs_commande_paiement_auto extends Migration {
+
+    public function up() {
+        $this->addColumn('commande', 'paiement_automatique', Schema::TYPE_BOOLEAN.' DEFAULT 0') ;
+    }
+
+    public function down() {
+        $this->dropColumn('commande', 'paiement_automatique') ;
+    }
+}

frontend/web/css/screen.css

   font-weight: normal;
   font-style: normal;
 }
-/* line 26, ../sass/screen.scss */
+/* line 25, ../sass/screen.scss */
 html {
   height: 100%;
 }
 
-/* line 30, ../sass/screen.scss */
+/* line 29, ../sass/screen.scss */
 body {
   position: relative;
   color: #505050;
   padding: 0;
 }
 
-/* line 40, ../sass/screen.scss */
+/* line 39, ../sass/screen.scss */
 strong {
   font-weight: bold;
 }
 
-/* line 45, ../sass/screen.scss */
+/* line 44, ../sass/screen.scss */
 #main a {
   color: #505050;
   text-decoration: underline;
 }
-/* line 49, ../sass/screen.scss */
+/* line 48, ../sass/screen.scss */
 #main a:focus, #main a:active {
   outline-color: gray;
   color: #BB8757;
 }
-/* line 54, ../sass/screen.scss */
+/* line 53, ../sass/screen.scss */
 #main a:hover {
   color: #BB8757;
 }
-/* line 58, ../sass/screen.scss */
+/* line 57, ../sass/screen.scss */
 #main a.btn {
   text-decoration: none;
 }
-/* line 63, ../sass/screen.scss */
+/* line 62, ../sass/screen.scss */
 #main .btn-primary {
   background-color: #BB8757;
   border: solid 1px #BB8757;
   color: white;
 }
-/* line 68, ../sass/screen.scss */
+/* line 67, ../sass/screen.scss */
 #main .btn-primary:hover, #main .btn-primary:active, #main .btn-primary:focus {
   background-color: #b17a48;
   border: solid 1px #BB8757;
   color: white;
 }
-/* line 75, ../sass/screen.scss */
+/* line 74, ../sass/screen.scss */
 #main .form-control:focus {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   border: solid 1px #BB8757;
 }
 
-/* line 81, ../sass/screen.scss */
+/* line 80, ../sass/screen.scss */
 p {
   padding-bottom: 20px;
   line-height: 21px;
 }
 
-/* line 86, ../sass/screen.scss */
+/* line 85, ../sass/screen.scss */
 ul {
   padding-left: 20px;
   list-style-type: disc;
   margin-bottom: 10px;
 }
-/* line 91, ../sass/screen.scss */
+/* line 90, ../sass/screen.scss */
 ul li {
   padding-left: 5px;
 }
 
-/* line 96, ../sass/screen.scss */
+/* line 95, ../sass/screen.scss */
 .clr {
   clear: both;
 }
 
-/* line 100, ../sass/screen.scss */
+/* line 99, ../sass/screen.scss */
 .btn {
   background-image: none;
 }
 
-/* line 104, ../sass/screen.scss */
+/* line 103, ../sass/screen.scss */
 #main .alert {
   background-image: none;
   background-color: white;
   border-bottom-width: 3px;
 }
 
-/* line 112, ../sass/screen.scss */
+/* line 111, ../sass/screen.scss */
 .alert.alert-warning a {
   color: #8a6d3b;
 }
 
-/* line 121, ../sass/screen.scss */
+/* line 120, ../sass/screen.scss */
 #main {
   position: relative;
 }
-/* line 123, ../sass/screen.scss */
+/* line 122, ../sass/screen.scss */
 #main .inner {
   width: 960px;
   margin: 0px auto;
 }
 
-/* line 130, ../sass/screen.scss */
+/* line 129, ../sass/screen.scss */
 #content .content-text h1 {
   font-family: "myriadpro-regular";
   font-size: 30px;
   color: black;
   text-transform: uppercase;
 }
-/* line 137, ../sass/screen.scss */
+/* line 136, ../sass/screen.scss */
 #content .content-text h2 {
   font-family: "comfortaaregular";
   font-size: 20px;
   margin-top: 5px;
 }
 
-/* line 148, ../sass/screen.scss */
+/* line 147, ../sass/screen.scss */
 #content #the-content {
   padding-top: 100px;
   padding-left: 30px;
   padding-bottom: 50px;
 }
 
-/* line 156, ../sass/screen.scss */
+/* line 155, ../sass/screen.scss */
 #block-demo {
   padding: 10px 0px;
   background-color: #BB8757;
   color: white;
   text-align: center;
 }
-/* line 162, ../sass/screen.scss */
+/* line 161, ../sass/screen.scss */
 #block-demo a {
   color: white;
   text-decoration: underline;
 }
 
-/* line 168, ../sass/screen.scss */
+/* line 167, ../sass/screen.scss */
 #header {
   z-index: 100;
   border-bottom: solid 1px #e0e0e0;
   background-color: #f8f1dd;
   height: 86px;
 }
-/* line 174, ../sass/screen.scss */
+/* line 173, ../sass/screen.scss */
 #header .container {
   position: relative;
 }
-/* line 178, ../sass/screen.scss */
+/* line 177, ../sass/screen.scss */
 #header #env-dev {
   font-family: "comfortaabold";
   text-align: center;
   top: 18px;
   left: 79px;
 }
-/* line 191, ../sass/screen.scss */
+/* line 190, ../sass/screen.scss */
 #header #link-home {
   position: absolute;
   top: 10px;
   color: black;
   display: block;
 }
-/* line 200, ../sass/screen.scss */
+/* line 199, ../sass/screen.scss */
 #header #link-home img {
   height: 60px;
   margin-bottom: 5px;
   float: left;
 }
-/* line 206, ../sass/screen.scss */
+/* line 205, ../sass/screen.scss */
 #header #link-home .text {
   float: left;
   padding-left: 10px;
 }
-/* line 210, ../sass/screen.scss */
+/* line 209, ../sass/screen.scss */
 #header #link-home .text .bap {
   font-family: "comfortaalight";
   font-size: 24px;
 }
-/* line 215, ../sass/screen.scss */
+/* line 214, ../sass/screen.scss */
 #header #link-home .text .plateforme {
   font-size: 17px;
   font-family: "myriadpro-light";
   color: #BB8757;
 }
-/* line 223, ../sass/screen.scss */
+/* line 222, ../sass/screen.scss */
 #header #link-espace-boulanger {
   border-left: solid 1px #e0e0e0;
   color: #BB8757;
 }
-/* line 228, ../sass/screen.scss */
+/* line 227, ../sass/screen.scss */
 #header nav {
   padding-top: 22px;
 }
-/* line 230, ../sass/screen.scss */
+/* line 229, ../sass/screen.scss */
 #header nav ul {
   float: right;
 }
-/* line 233, ../sass/screen.scss */
+/* line 232, ../sass/screen.scss */
 #header nav ul li a {
   text-decoration: none;
   color: #505050;
 }
-/* line 236, ../sass/screen.scss */
+/* line 235, ../sass/screen.scss */
 #header nav ul li a.active {
   background-color: white;
 }
-/* line 240, ../sass/screen.scss */
+/* line 239, ../sass/screen.scss */
 #header nav ul li a:hover {
   color: black;
   background-color: white;
 }
-/* line 250, ../sass/screen.scss */
+/* line 249, ../sass/screen.scss */
 #header #link-logout .nom {
   color: gray;
   font-size: 10px;
   top: -4px;
 }
 
-/* line 267, ../sass/screen.scss */
+/* line 265, ../sass/screen.scss */
 #content {
   position: relative;
   padding: 20px 0px;
   padding-top: 35px;
   min-height: 500px;
 }
-/* line 274, ../sass/screen.scss */
+/* line 272, ../sass/screen.scss */
 #content h1#title-site {
   font-family: "comfortaalight";
   font-size: 50px;
 }
-/* line 281, ../sass/screen.scss */
+/* line 279, ../sass/screen.scss */
 #content h2 {
   color: black;
   padding-bottom: 15px;
   position: relative;
   margin-top: 30px;
 }
-/* line 292, ../sass/screen.scss */
+/* line 290, ../sass/screen.scss */
 #content h3 {
   color: black;
   font-size: 20px;
 }
-/* line 300, ../sass/screen.scss */
+/* line 298, ../sass/screen.scss */
 #content #description img {
   width: 100%;
 }
-/* line 305, ../sass/screen.scss */
+/* line 303, ../sass/screen.scss */
 #content #main-img {
   max-width: 100%;
   border: solid 1px #e0e0e0;
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-/* line 314, ../sass/screen.scss */
+/* line 312, ../sass/screen.scss */
 #content #row-presentation h1 {
   color: black;
 }
-/* line 317, ../sass/screen.scss */
+/* line 315, ../sass/screen.scss */
 #content #row-presentation strong {
   font-family: "myriadpro-light";
   font-size: 20px;
   color: #B17A48;
 }
-/* line 324, ../sass/screen.scss */
+/* line 322, ../sass/screen.scss */
 #content #row-signup {
   text-align: center;
   margin-top: 40px;
   padding-top: 40px;
 }
-/* line 329, ../sass/screen.scss */
+/* line 327, ../sass/screen.scss */
 #content #row-signup a.btn {
   padding: 10px 20px;
   font-size: 20px;
   text-transform: uppercase;
 }
-/* line 335, ../sass/screen.scss */
+/* line 333, ../sass/screen.scss */
 #content #row-signup a.btn-primary {
   margin-right: 15px;
 }
-/* line 340, ../sass/screen.scss */
+/* line 338, ../sass/screen.scss */
 #content #row-clients-boulanger {
   margin-bottom: 50px;
 }
-/* line 343, ../sass/screen.scss */
+/* line 341, ../sass/screen.scss */
 #content #row-clients-boulanger h2 {
   margin-bottom: 10px;
 }
-/* line 345, ../sass/screen.scss */
+/* line 343, ../sass/screen.scss */
 #content #row-clients-boulanger h2 .img {
   height: 50px;
 }
-/* line 348, ../sass/screen.scss */
+/* line 346, ../sass/screen.scss */
 #content #row-clients-boulanger h2 span {
   margin-left: 10px;
   font-size: 25px;
   position: relative;
   top: 5px;
 }
-/* line 356, ../sass/screen.scss */
+/* line 354, ../sass/screen.scss */
 #content #row-clients-boulanger ul {
   text-align: left;
 }
-/* line 358, ../sass/screen.scss */
+/* line 356, ../sass/screen.scss */
 #content #row-clients-boulanger ul li {
   list-style-type: circle;
   color: #BB8757;
 }
-/* line 364, ../sass/screen.scss */
+/* line 362, ../sass/screen.scss */
 #content #row-clients-boulanger p {
   padding-bottom: 4px;
 }
-/* line 370, ../sass/screen.scss */
+/* line 368, ../sass/screen.scss */
 #content #row-clients-boulanger .boulanger .prix span {
   background-color: #F8F1DD;
 }
-/* line 373, ../sass/screen.scss */
+/* line 371, ../sass/screen.scss */
 #content #row-clients-boulanger .boulanger .prix span a {
   color: #BB8757;
   text-decoration: none;
 }
-/* line 381, ../sass/screen.scss */
+/* line 379, ../sass/screen.scss */
 #content #row-clients-boulanger .prix {
   padding-top: 15px;
   font-size: 18px;
 }
-/* line 385, ../sass/screen.scss */
+/* line 383, ../sass/screen.scss */
 #content #row-clients-boulanger .prix span {
   color: #BB8757;
   border: solid 1px #BB8757;
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-/* line 400, ../sass/screen.scss */
+/* line 398, ../sass/screen.scss */
 #content #row-clients-boulanger #periode-essai {
   margin-top: 8px;
   text-align: center;
   color: gray;
   font-family: "comfortaaregular";
 }
-/* line 410, ../sass/screen.scss */
+/* line 408, ../sass/screen.scss */
 #content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
   color: black;
 }
-/* line 416, ../sass/screen.scss */
+/* line 414, ../sass/screen.scss */
 #content #modal-tarifs .commission {
   text-align: center;
   font-size: 20px;
   text-transform: uppercase;
   margin-bottom: 20px;
 }
-/* line 422, ../sass/screen.scss */
+/* line 420, ../sass/screen.scss */
 #content #modal-tarifs .commission span {
   padding: 10px 20px;
   border: solid 1px black;
   -webkit-border-radius: 10px;
   border-radius: 10px;
 }
-/* line 428, ../sass/screen.scss */
+/* line 426, ../sass/screen.scss */
 #content #modal-tarifs .exemple {
   color: gray;
 }
 
-/* line 435, ../sass/screen.scss */
+/* line 433, ../sass/screen.scss */
 #content #contact {
   display: none;
 }
-/* line 439, ../sass/screen.scss */
+/* line 437, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 448, ../sass/screen.scss */
+/* line 446, ../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 453, ../sass/screen.scss */
+/* line 451, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 457, ../sass/screen.scss */
+/* line 455, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 460, ../sass/screen.scss */
+/* line 458, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 467, ../sass/screen.scss */
+/* line 465, ../sass/screen.scss */
 .form-control:focus {
   /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
   border-color: $jaune ;*/
 }
 
-/* line 472, ../sass/screen.scss */
+/* line 470, ../sass/screen.scss */
 #footer {
   position: absolute;
   bottom: 0px;
   padding-top: 30px;
   padding-bottom: 60px;
 }
-/* line 486, ../sass/screen.scss */
+/* line 484, ../sass/screen.scss */
 #footer a {
   font-family: "myriadpro-regular";
   color: #7e7e7e;
   border-right: solid 1px #7e7e7e;
   border-right: solid 1px white;
 }
-/* line 497, ../sass/screen.scss */
+/* line 495, ../sass/screen.scss */
 #footer a:hover {
   color: gray;
 }
-/* line 501, ../sass/screen.scss */
+/* line 499, ../sass/screen.scss */
 #footer a:last-child {
   border: 0px none;
 }
 
-/* line 507, ../sass/screen.scss */
+/* line 505, ../sass/screen.scss */
 #content #mentions {
   padding-top: 20px;
 }
-/* line 510, ../sass/screen.scss */
+/* line 508, ../sass/screen.scss */
 #content #mentions div.content {
   width: 60%;
   font-size: 90%;
 }
-/* line 515, ../sass/screen.scss */
+/* line 513, ../sass/screen.scss */
 #content #mentions p {
   padding-bottom: 15px;
 }
-/* line 519, ../sass/screen.scss */
+/* line 517, ../sass/screen.scss */
 #content #mentions h2 {
   color: black;
   padding-bottom: 40px;
   line-height: 35px;
   font-family: "myriadpro-regular";
 }
-/* line 527, ../sass/screen.scss */
+/* line 525, ../sass/screen.scss */
 #content #mentions h3 {
   font-family: "comfortaaregular";
   font-size: 18px;
   color: black;
 }
 
-/* line 538, ../sass/screen.scss */
+/* line 536, ../sass/screen.scss */
 .mentions #main, .mentions body {
   background-color: white;
 }
 
-/* line 543, ../sass/screen.scss */
+/* line 541, ../sass/screen.scss */
 .vegas-loading {
   display: none;
 }
 
-/* line 550, ../sass/screen.scss */
+/* line 548, ../sass/screen.scss */
 #profil-user .form-group.field-user-no_mail label {
   font-weight: normal;
 }
-/* line 554, ../sass/screen.scss */
+/* line 552, ../sass/screen.scss */
 #profil-user .form-group label {
   cursor: pointer;
 }
-/* line 559, ../sass/screen.scss */
+/* line 557, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 562, ../sass/screen.scss */
+/* line 560, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group label {
   font-weight: normal;
 }
-/* line 568, ../sass/screen.scss */
+/* line 566, ../sass/screen.scss */
 #profil-user p.strong {
   font-weight: bold;
 }
 
 /* login */
-/* line 577, ../sass/screen.scss */
+/* line 575, ../sass/screen.scss */
 .site-login .col-lg-5 {
   margin: 0px auto;
   float: none;
 }
 
 /* signup */
-/* line 585, ../sass/screen.scss */
+/* line 583, ../sass/screen.scss */
 .modal-backdrop {
   z-index: -1;
 }
 
-/* line 590, ../sass/screen.scss */
+/* line 588, ../sass/screen.scss */
 .site-signup .col-lg-5 {
   margin: 0px auto;
   float: none;
 }
 
-/* line 600, ../sass/screen.scss */
+/* line 598, ../sass/screen.scss */
 #modal-cgv .modal-body h2 {
   margin-bottom: 5px;
   padding-bottom: 0px;
   margin-top: 0px;
 }
 
-/* line 610, ../sass/screen.scss */
+/* line 608, ../sass/screen.scss */
 #form-signup #client-boulanger {
   margin-bottom: 30px;
 }
-/* line 615, ../sass/screen.scss */
+/* line 613, ../sass/screen.scss */
 #form-signup #signupform-id_etablissement option:disabled {
   font-weight: bold;
   color: black;
 }
-/* line 621, ../sass/screen.scss */
+/* line 619, ../sass/screen.scss */
 #form-signup #champs-boulanger {
   display: none;
 }
-/* line 625, ../sass/screen.scss */
+/* line 623, ../sass/screen.scss */
 #form-signup #boutons-inscrire {
   margin-top: 30px;
 }
 
-/* line 630, ../sass/screen.scss */
+/* line 628, ../sass/screen.scss */
 #col-left {
   padding: 0px;
   z-index: 15;
 }
-/* line 634, ../sass/screen.scss */
+/* line 632, ../sass/screen.scss */
 #col-left .affix {
   width: 25%;
   border-right: solid 1px #e0e0e0;
   background-color: #FAFAFA;
   height: 100%;
 }
-/* line 641, ../sass/screen.scss */
+/* line 639, ../sass/screen.scss */
 #col-left #link-home {
   text-decoration: none;
   font-size: 22px;
   padding: 10px;
   background-color: #F8F1DD;
 }
-/* line 649, ../sass/screen.scss */
+/* line 647, ../sass/screen.scss */
 #col-left #link-home img {
   height: 50px;
   margin-bottom: 5px;
   float: left;
 }
-/* line 655, ../sass/screen.scss */
+/* line 653, ../sass/screen.scss */
 #col-left #link-home .text {
   padding-left: 62px;
 }
-/* line 658, ../sass/screen.scss */
+/* line 656, ../sass/screen.scss */
 #col-left #link-home .text .bap {
   font-family: "comfortaalight";
   font-size: 24px;
 }
-/* line 663, ../sass/screen.scss */
+/* line 661, ../sass/screen.scss */
 #col-left #link-home .text .plateforme {
   font-size: 17px;
   font-family: "myriadpro-light";
   color: #BB8757;
 }
-/* line 671, ../sass/screen.scss */
+/* line 669, ../sass/screen.scss */
 #col-left h2 {
   font-family: "myriadpro-regular";
   color: black;
   margin-bottom: 10px;
   padding: 15px 0px 5px 15px;
 }
-/* line 679, ../sass/screen.scss */
+/* line 677, ../sass/screen.scss */
 #col-left #links {
   background-color: white;
   margin-bottom: 20px;
 }
-/* line 685, ../sass/screen.scss */
+/* line 683, ../sass/screen.scss */
 #col-left #links ul li a {
   text-align: center;
   border-right: solid 1px #e0e0e0;
 }
-/* line 689, ../sass/screen.scss */
+/* line 687, ../sass/screen.scss */
 #col-left #links ul li a:hover {
   background-color: #BB8757;
   color: white;
 }
-/* line 695, ../sass/screen.scss */
+/* line 693, ../sass/screen.scss */
 #col-left #links ul li:last-child a {
   border-right: 0px none;
 }
-/* line 705, ../sass/screen.scss */
+/* line 703, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li a {
   padding-left: 50px;
   height: 40px;
 }
-/* line 711, ../sass/screen.scss */
+/* line 709, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li.active a {
   background-color: #BB8757;
   position: relative;
   color: white;
 }
-/* line 716, ../sass/screen.scss */
+/* line 714, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li.active a:after {
   right: -40px;
   top: 50%;
   border-width: 20px;
   margin-top: -20px;
 }
-/* line 735, ../sass/screen.scss */
+/* line 733, ../sass/screen.scss */
 #col-left ul {
   list-style-type: none;
   margin: 0px;
   padding: 0px;
 }
-/* line 739, ../sass/screen.scss */
+/* line 737, ../sass/screen.scss */
 #col-left ul li {
   margin: 0px;
   padding: 0px;
 }
-/* line 742, ../sass/screen.scss */
+/* line 740, ../sass/screen.scss */
 #col-left ul li a {
   text-decoration: none;
   font-family: "comfortaaregular";
   display: block;
   color: black;
 }
-/* line 752, ../sass/screen.scss */
+/* line 750, ../sass/screen.scss */
 #col-left ul li a span.nom, #col-left ul li a span.libelle {
   display: none;
 }
-/* line 759, ../sass/screen.scss */
+/* line 757, ../sass/screen.scss */
 #col-left p {
   padding: 20px;
   padding-top: 0px;
   color: gray;
 }
 
-/* line 767, ../sass/screen.scss */
+/* line 765, ../sass/screen.scss */
 #content .header-title {
   height: 79px;
   padding: 20px 20px;
   -webkit-box-shadow: 0px 0px 8px #e0e0e0;
   box-shadow: 0px 0px 8px #e0e0e0;
 }
-/* line 779, ../sass/screen.scss */
+/* line 777, ../sass/screen.scss */
 #content .header-title h1 {
   color: black;
   font-family: "myriadpro-regular";
   font-size: 25px;
   text-transform: uppercase;
 }
-/* line 787, ../sass/screen.scss */
+/* line 785, ../sass/screen.scss */
 #content .header-title h2 {
   color: gray;
   text-transform: none;
   line-height: 20px;
 }
 
-/* line 798, ../sass/screen.scss */
+/* line 796, ../sass/screen.scss */
 .header-etablissement {
   z-index: 1;
 }
-/* line 800, ../sass/screen.scss */
+/* line 798, ../sass/screen.scss */
 .header-etablissement #block-main-img {
   height: 144px;
   overflow: hidden;
 }
-/* line 804, ../sass/screen.scss */
+/* line 802, ../sass/screen.scss */
 .header-etablissement #block-main-img #main-img {
   width: 100%;
   height: auto;
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 813, ../sass/screen.scss */
+/* line 811, ../sass/screen.scss */
 .header-etablissement h1 {
   font-family: "comfortaaregular";
   text-align: center;
   top: 30px;
   left: 40px;
 }
-/* line 820, ../sass/screen.scss */
+/* line 818, ../sass/screen.scss */
 .header-etablissement h1 span {
   background-color: rgba(255, 255, 255, 0.8);
   padding: 10px 30px;
   border: dotted 1px black;
 }
 
-/* line 831, ../sass/screen.scss */
+/* line 829, ../sass/screen.scss */
 nav#menu-etablissement {
   border-bottom: solid 1px #e0e0e0;
 }
-/* line 835, ../sass/screen.scss */
+/* line 833, ../sass/screen.scss */
 nav#menu-etablissement ul li {
   padding: 0px;
   margin: 0px;
 }
-/* line 838, ../sass/screen.scss */
+/* line 836, ../sass/screen.scss */
 nav#menu-etablissement ul li a {
   border-right: solid 1px #e0e0e0;
   text-decoration: none;
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 843, ../sass/screen.scss */
+/* line 841, ../sass/screen.scss */
 nav#menu-etablissement ul li a:hover {
   background-color: #BB8757;
   color: white;

frontend/web/sass/screen.scss

 $color2: lighten($jaune,30%) ;
 $color2: #fff2c7 ;
 $color2: #fff6d5 ;
- 
 $color1: #BB8757 ;
 $color2: #F8F1DD ;
 
         }
 }
 
-
 .connected {
     #content {
         //padding-top: 15px ;

producer/config/.gitignore

+main-local.php
+params-local.php

producer/runtime/.gitignore

+*
+!.gitignore

producer/web/.gitignore

+/index.php
+/index-test.php

producer/web/assets/.gitignore

+*
+!.gitignore