Merge branch 'prix_libre' into dev

backend/views/etablissement/facturation.php

@@ -42,13 +42,13 @@ use common\models\User ;
 use common\models\Etablissement ;
 use yii\bootstrap\ActiveForm;
 
-$this->title = 'Facturation';
+$this->title = 'Mon abonnement';
 $this->params['breadcrumbs'][] = 'Administration' ;
 $this->params['breadcrumbs'][] = $this->title;
 
 ?>
 
-<h1>Facturation</h1>
+<h1>Mon abonnement</h1>
 
 <p class="">
     Vous seuls savez ce que vous apporte cet outil et dans quelle mesure vous souhaitez le soutenir.<br />
@@ -61,15 +61,15 @@ $this->params['breadcrumbs'][] = $this->title;
     
     <?php if($alert_prix_libre): ?>
         <div class="alert alert-success">
-            Le prix libre a bien été mis à jour. 
+            Le montant de votre abonnement a bien été mis à jour. 
             <?php if($etablissement->prix_libre != 0): ?>
-                Vos prochaines factures mensuelles auront un montant de <strong><?= number_format(Html::encode($etablissement->prix_libre),2).' € TTC' ; ?></strong>.
+                Vos prochaines factures mensuelles auront un montant de <strong><?= number_format(Html::encode($etablissement->prix_libre),2).' € HT' ; ?></strong>.
             <?php endif; ?>
         </div>
     <?php endif; ?>
     
     <?php $form = ActiveForm::begin([
-        'layout' => 'horizontal',
+        //'layout' => 'vertical',
         'fieldConfig' => [
             'template' => "{label}\n{beginWrapper}\n{input}\n{hint}\n{error}\n{endWrapper}",
             'horizontalCssClasses' => [
@@ -78,7 +78,10 @@ $this->params['breadcrumbs'][] = $this->title;
         ],
     ]); ?>
     
-    <?= $form->field($etablissement, 'prix_libre')->textInput()->label('Prix libre<br /><span>€ TTC / mois</span>') ?>
+    <?= $form->field($etablissement, 'prix_libre',[
+            'inputTemplate' => '<div class="input-group">{input}<span class="input-group-addon"><span class="glyphicon glyphicon-euro"></span> HT / mois</span></div>',
+        ])
+        ->label('Prix libre');  ?>
     
     <div class="form-group field-user-prix_libre">
         <label class="control-label col-sm-2" for=""></label>
@@ -92,6 +95,7 @@ $this->params['breadcrumbs'][] = $this->title;
 </div>
 
 
+<!--
 <h2>Dernières factures</h2>
 <?= GridView::widget([
     'dataProvider' => $datas_factures,
@@ -129,4 +133,6 @@ $this->params['breadcrumbs'][] = $this->title;
             }
         ]
     ],
-]); ?>
+]); ?>
+
+-->

backend/views/layouts/main.php

@@ -137,7 +137,7 @@ if(!Yii::$app->user->isGuest)
                             'visible' => !Yii::$app->user->isGuest
                         ],
                         [
-                            'label' => '<span class="glyphicon glyphicon-euro"></span> Facturation',
+                            'label' => '<span class="glyphicon glyphicon-euro"></span> Mon abonnement',
                             'url' => ['/etablissement/facturation'],
                             'visible' => !Yii::$app->user->isGuest,
                         ],

backend/views/site/index.php

@@ -225,12 +225,12 @@ $this->title = 'Tableau de bord';
             </div>
         </div>
 
-        <!-- Facturation -->
+        <!-- Mon abonnement -->
         <div class="" id="facturation">
             <div class="panel panel-default">
                 <div class="panel-heading">
                   <h3 class="panel-title">
-                      Facturation
+                      Mon abonnement
                       <?= Html::a('Voir',['etablissement/facturation'],['class' => 'btn btn-default btn-xs']) ; ?>
                   </h3>
                 </div>

backend/web/css/screen.css

@@ -1347,7 +1347,15 @@ a:hover, a:focus, a:active {
 #estimation-facture label span {
   font-size: 16px;
 }
-/* line 1334, ../sass/screen.scss */
+/* line 1335, ../sass/screen.scss */
+#estimation-facture .field-etablissement-prix_libre .input-group {
+  width: 200px;
+}
+/* line 1341, ../sass/screen.scss */
+#estimation-facture .field-user-prix_libre label {
+  display: none;
+}
+/* line 1346, ../sass/screen.scss */
 #estimation-facture #etablissement-prix_libre {
   width: 100px;
   height: 60px;
@@ -1356,37 +1364,37 @@ a:hover, a:focus, a:active {
   text-align: center;
 }
 
-/* line 1344, ../sass/screen.scss */
+/* line 1356, ../sass/screen.scss */
 .developpement-index ul#tabs-statuts-developpements {
   margin-bottom: 30px;
   border-bottom: solid 3px #BB8757;
 }
-/* line 1348, ../sass/screen.scss */
+/* line 1360, ../sass/screen.scss */
 .developpement-index ul#tabs-statuts-developpements a {
   text-transform: uppercase;
 }
-/* line 1351, ../sass/screen.scss */
+/* line 1363, ../sass/screen.scss */
 .developpement-index ul#tabs-statuts-developpements .active {
   border: 0px none;
   background: none;
 }
-/* line 1354, ../sass/screen.scss */
+/* line 1366, ../sass/screen.scss */
 .developpement-index ul#tabs-statuts-developpements .active a {
   background-color: #BB8757;
   color: white;
 }
-/* line 1362, ../sass/screen.scss */
+/* line 1374, ../sass/screen.scss */
 .developpement-index #tab-developpements .btn-group-priorite {
   width: 100%;
   margin-bottom: 5px;
 }
-/* line 1366, ../sass/screen.scss */
+/* line 1378, ../sass/screen.scss */
 .developpement-index #tab-developpements .btn-group-priorite .btn-priorite {
   display: block;
   float: none;
   width: 100%;
 }
-/* line 1373, ../sass/screen.scss */
+/* line 1385, ../sass/screen.scss */
 .developpement-index #tab-developpements .label-priorite {
   display: block;
   width: 100%;
@@ -1395,24 +1403,24 @@ a:hover, a:focus, a:active {
 }
 
 /* stats */
-/* line 1386, ../sass/screen.scss */
+/* line 1398, ../sass/screen.scss */
 .stats-produits #nav-year {
   float: right;
 }
-/* line 1391, ../sass/screen.scss */
+/* line 1403, ../sass/screen.scss */
 .stats-produits tr.mois th {
   text-align: center;
 }
-/* line 1396, ../sass/screen.scss */
+/* line 1408, ../sass/screen.scss */
 .stats-produits tr.sub-head th {
   font-weight: normal;
   font-size: 12px;
 }
-/* line 1402, ../sass/screen.scss */
+/* line 1414, ../sass/screen.scss */
 .stats-produits td.nom {
   text-transform: uppercase;
 }
-/* line 1406, ../sass/screen.scss */
+/* line 1418, ../sass/screen.scss */
 .stats-produits td.align-center {
   text-align: center;
 }

backend/web/sass/screen.scss

@@ -1331,6 +1331,18 @@ a {
         }
     }
     
+    .field-etablissement-prix_libre {
+        .input-group {
+            width: 200px ;
+        }
+    }
+    
+    .field-user-prix_libre {
+        label {
+            display: none ;
+        }
+    }
+    
     #etablissement-prix_libre {
         width: 100px ;
         height: 60px ;

common/models/Etablissement.php

@@ -262,7 +262,7 @@ class Etablissement extends \yii\db\ActiveRecord {
 
     public function getPrixLibre() {
         if (!is_null($this->prix_libre)) {
-            return number_format($this->prix_libre, 2, ',', false) . ' €';
+            return number_format($this->prix_libre, 2, ',', false) . ' € HT';
         }
     }
     

frontend/models/SignupForm.php

@@ -66,6 +66,7 @@ class SignupForm extends Model {
     public $cgv;
     public $code;
     public $type;
+    public $prix_libre ;
 
     /**
      * @inheritdoc
@@ -176,6 +177,7 @@ class SignupForm extends Model {
                         $this->addError($attribute, 'Code incorrect');
                     }
                 }],
+            ['prix_libre', 'number'],
         ];
     }
 
@@ -205,6 +207,7 @@ class SignupForm extends Model {
                 $etablissement->heure_limite_commande = 20;
                 $etablissement->delai_commande = 1;
                 $etablissement->gratuit = 1;
+                $etablissement->prix_libre = (float) abs($this->prix_libre);
                 $etablissement->slug = \common\helpers\Url::slugify($this->nom_magasin) ;
 
                 // génération d'un code
@@ -293,6 +296,7 @@ class SignupForm extends Model {
             'ville' => 'Commune',
             'id_etablissement' => 'Producteur',
             'type' => 'Type d\'établissement',
+            'prix_libre' => 'Prix libre'
         ];
     }
 

frontend/views/site/_cgv_content.php

@@ -103,9 +103,9 @@ termes.
 
 <h2>8. Redevances d'utilisation du Site</h2>
 <p>La création d’un compte et l’utilisation de la partie du Site réservée aux Boulangers 
-    implique le paiement mensuel par les Boulangers d’un montant équivalent à deux (2) % 
-    du chiffre d’affaires mensuel réalisé à partir des commandes enregistrées sur le Site. 
-    La Société émettra à l’issue de chaque mois une facture au Boulanger, payable 
+    implique le paiement mensuel par les Boulangers d'un montant (HT) défini par eux-même dans
+    la section Facturation. Si ce montant est supérieur à 0€, la Société émettra à l’issue 
+    de chaque mois une facture au Boulanger, payable 
     par virement bancaire ou par chèque dans les trente (30) jours à compter 
     de la date d’émission de la facture. Tout défaut ou retard de paiement emportera 
     immédiatement application de pénalités de retard à un taux qui est de trois fois 

frontend/views/site/_tarifs_producteur.php

@@ -47,12 +47,9 @@ termes.
         <h4 class="modal-title" id="myModalLabel">Tarifs</h4>
       </div>
       <div class="modal-body">
-            <div class="alert alert-warning"><em>La boîte à pain</em> fonctionne grâce à un système de <strong>facturation mensuelle</strong> basée
-                    sur le chiffre d'affaire réalisé à partir des commandes enregistrées sur la plateforme. Fonctionner ainsi permet de faire contribuer chaque
-                    producteur à la hauteur de son utilisation de la plateforme.</div>
-            <div class="commission"><span><strong>2 %</strong> du chiffre d'affaire TTC</span></div>                
-            <div class="exemple">Exemple : si pour un mois donné, vous avez comptabilisé <em>2500 € TTC</em> de chiffre d'affaire réalisé sur la plateforme, 
-            vous recevrez une facture d'un montant de <em>50 € TTC</em> pour ce mois.</div>
+          <p><em>La boîte à pain</em> fonctionne grâce à un système d'abonnement à <strong>prix libre</strong>.
+          Chaque producteur définit lui-même le prix mensuel (HT) de son abonnement à la plateforme, selon son intérêt et le soutien qu'il veut apporter. Ce montant est modifiable à tout moment dans la section <em>Mon abonnement</em> de l'interface d'administration.</p>
+          <p>Toutes les demandes de formation ou de développement spécifique feront l'objet d'un devis.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>

frontend/views/site/index.php

@@ -61,24 +61,24 @@ $this->setPageTitle('Plateforme de réservation de pain') ;
                 <img class="img" src="<?= Yii::$app->urlManager->getBaseUrl(); ?>/img/clients.png" id="img-clients" />
                 <span>Clients</span>
             </h2>
-            <p><em>Réservez vos produits en ligne et récupérez votre commande
-            chez votre producteur ou dans un dépôt près de chez vous.</em></p>
+            <p>Réservez vos produits en ligne et récupérez votre commande
+            chez votre producteur ou dans un dépôt près de chez vous.</p>
             <ul>
                 <li>Garantie d'avoir vos produits</li>
                 <li>Moyen simple de commander</li>
                 <li>Possibilité de choisir un dépôt proche de chez soi</li>
             </ul>
             <div class="prix">
-                <span>Gratuit</span>
+                <div>Gratuit</div>
             </div>
         </div>
         <div class="col-md-6 boulanger">
             <h2>
                 <img class="img" src="<?= Yii::$app->urlManager->getBaseUrl(); ?>/img/boulanger1.png" id="img-boulanger" />
-                <span>Producteur</span>
+                <span>Producteurs</span>
             </h2>
 
-            <p><em>Simplifiez la gestion de vos commandes et optimisez votre production.</em></p>
+            <p>Simplifiez la gestion de vos commandes et optimisez votre production.</p>
 
             <ul>
                 <li>Prise de commande en ligne automatisée</li>
@@ -88,7 +88,9 @@ $this->setPageTitle('Plateforme de réservation de pain') ;
             </ul>
 
             <div class="prix">
-                <span><a data-toggle="modal" data-target="#modal-tarifs" href="javascript:void(0);">Commission : 2% du CA</a></span>
+                <a data-toggle="modal" data-target="#modal-tarifs" href="javascript:void(0);">Abonnement à <strong>prix libre</strong><br />
+                Formation & développement spécifique <strong>sur devis</strong>
+                </a>
             </div>
         </div>
     </div>

frontend/views/site/signup.php

@@ -80,6 +80,11 @@ $this->params['breadcrumbs'][] = $this->title;
                         <?= $form->field($model, 'siret') ?>
                         <?= $form->field($model, 'code_postal') ?>
                         <?= $form->field($model, 'ville') ?>
+                        <?= $form->field($model, 'prix_libre',[
+                                    'inputTemplate' => '<div class="input-group">{input}<span class="input-group-addon"><span class="glyphicon glyphicon-euro"></span></span></div>',
+                                ])
+                                ->label('Prix libre HT / mois')
+                                ->hint('Laissez ce champs vide si vous souhaitez dans un premier temps simplement tester la plateforme. Une fois l\'outil mis en place dans votre structure, vous pourrez modifier ce coût dans la section "Mon abonnement" de votre panneau d\'administration.') ;  ?>
                         <?= $form->field($model, 'cgv')->checkbox()->label('J\'accepte les <a class="btn btn-xs btn-default" data-toggle="modal" data-target="#modal-cgv" href="javascript:void(0);">conditions générales de service</a> et les <a class="btn btn-xs btn-default" data-toggle="modal" data-target="#modal-tarifs" href="javascript:void(0);">conditions tarifaires</a> (prix libre).') ?>
                     </div>
                     <div id="champs-client">

frontend/web/css/screen.css

@@ -466,48 +466,49 @@ ul li {
 }
 /* line 412, ../sass/screen.scss */
 #content #row-clients-boulanger h2 {
+  text-align: center;
   margin-bottom: 10px;
 }
-/* line 414, ../sass/screen.scss */
+/* line 415, ../sass/screen.scss */
 #content #row-clients-boulanger h2 .img {
-  height: 50px;
+  height: 35px;
 }
-/* line 417, ../sass/screen.scss */
+/* line 418, ../sass/screen.scss */
 #content #row-clients-boulanger h2 span {
   margin-left: 10px;
   font-size: 25px;
   position: relative;
   top: 5px;
 }
-/* line 425, ../sass/screen.scss */
+/* line 426, ../sass/screen.scss */
 #content #row-clients-boulanger ul {
   text-align: left;
 }
-/* line 427, ../sass/screen.scss */
+/* line 428, ../sass/screen.scss */
 #content #row-clients-boulanger ul li {
   list-style-type: circle;
   color: #BB8757;
 }
-/* line 433, ../sass/screen.scss */
+/* line 434, ../sass/screen.scss */
 #content #row-clients-boulanger p {
   padding-bottom: 4px;
 }
-/* line 439, ../sass/screen.scss */
-#content #row-clients-boulanger .boulanger .prix span {
+/* line 440, ../sass/screen.scss */
+#content #row-clients-boulanger .boulanger .prix a {
   background-color: #F8F1DD;
-}
-/* line 442, ../sass/screen.scss */
-#content #row-clients-boulanger .boulanger .prix span a {
   color: #BB8757;
   text-decoration: none;
 }
-/* line 450, ../sass/screen.scss */
+/* line 448, ../sass/screen.scss */
 #content #row-clients-boulanger .prix {
   padding-top: 15px;
   font-size: 18px;
 }
-/* line 454, ../sass/screen.scss */
-#content #row-clients-boulanger .prix span {
+/* line 452, ../sass/screen.scss */
+#content #row-clients-boulanger .prix a, #content #row-clients-boulanger .prix div {
+  text-decoration: none;
+  text-align: center;
+  display: block;
   color: #BB8757;
   border: solid 1px #BB8757;
   font-weight: normal;
@@ -521,7 +522,7 @@ ul li {
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-/* line 469, ../sass/screen.scss */
+/* line 473, ../sass/screen.scss */
 #content #row-clients-boulanger #periode-essai {
   margin-top: 8px;
   text-align: center;
@@ -529,18 +530,18 @@ ul li {
   color: gray;
   font-family: "comfortaaregular";
 }
-/* line 479, ../sass/screen.scss */
+/* line 483, ../sass/screen.scss */
 #content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
   color: black;
 }
-/* line 485, ../sass/screen.scss */
+/* line 489, ../sass/screen.scss */
 #content #modal-tarifs .commission {
   text-align: center;
   font-size: 20px;
   text-transform: uppercase;
   margin-bottom: 20px;
 }
-/* line 491, ../sass/screen.scss */
+/* line 495, ../sass/screen.scss */
 #content #modal-tarifs .commission span {
   padding: 10px 20px;
   border: solid 1px black;
@@ -548,40 +549,40 @@ ul li {
   -webkit-border-radius: 10px;
   border-radius: 10px;
 }
-/* line 497, ../sass/screen.scss */
+/* line 501, ../sass/screen.scss */
 #content #modal-tarifs .exemple {
   color: gray;
 }
 
-/* line 504, ../sass/screen.scss */
+/* line 508, ../sass/screen.scss */
 #content #contact {
   display: none;
 }
-/* line 508, ../sass/screen.scss */
+/* line 512, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 517, ../sass/screen.scss */
+/* line 521, ../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 522, ../sass/screen.scss */
+/* line 526, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 526, ../sass/screen.scss */
+/* line 530, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 529, ../sass/screen.scss */
+/* line 533, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 536, ../sass/screen.scss */
+/* line 540, ../sass/screen.scss */
 #favorite-producers {
   background-color: #BB8757;
   border-top: solid 1px #e0e0e0;
@@ -589,7 +590,7 @@ ul li {
   padding-top: 20px;
   margin: 0px;
 }
-/* line 543, ../sass/screen.scss */
+/* line 547, ../sass/screen.scss */
 #favorite-producers h2 {
   font-family: "myriadpro-regular";
   color: #F8F1DD;
@@ -600,23 +601,23 @@ ul li {
   margin-left: 15px;
   margin-bottom: 15px;
 }
-/* line 554, ../sass/screen.scss */
+/* line 558, ../sass/screen.scss */
 #favorite-producers .col-md-12, #favorite-producers .col-md-6, #favorite-producers .col-md-3 {
   float: left;
 }
-/* line 558, ../sass/screen.scss */
+/* line 562, ../sass/screen.scss */
 #favorite-producers .col-md-12 .producer {
   background-size: 920px auto;
 }
-/* line 561, ../sass/screen.scss */
+/* line 565, ../sass/screen.scss */
 #favorite-producers .col-md-6 .producer {
   background-size: 460px auto;
 }
-/* line 565, ../sass/screen.scss */
+/* line 569, ../sass/screen.scss */
 #favorite-producers .col-md-3 .producer {
   background-size: 230px auto;
 }
-/* line 569, ../sass/screen.scss */
+/* line 573, ../sass/screen.scss */
 #favorite-producers .producer {
   position: relative;
   height: 100px;
@@ -628,7 +629,7 @@ ul li {
   background-repeat: no-repeat;
   border: solid 1px #F8F1DD;
 }
-/* line 580, ../sass/screen.scss */
+/* line 584, ../sass/screen.scss */
 #favorite-producers .producer a {
   position: absolute;
   bottom: 0px;
@@ -638,30 +639,30 @@ ul li {
   border-color: #F8F1DD;
   color: #BB8757;
 }
-/* line 589, ../sass/screen.scss */
+/* line 593, ../sass/screen.scss */
 #favorite-producers .producer a:hover {
   background-color: #fafafa;
   border-color: #F8F1DD;
   color: #BB8757;
 }
-/* line 597, ../sass/screen.scss */
+/* line 601, ../sass/screen.scss */
 #favorite-producers #discover {
   padding-bottom: 20px;
   text-align: center;
 }
-/* line 601, ../sass/screen.scss */
+/* line 605, ../sass/screen.scss */
 #favorite-producers #discover p {
   padding-bottom: 0px;
   color: #F8F1DD;
 }
-/* line 606, ../sass/screen.scss */
+/* line 610, ../sass/screen.scss */
 #favorite-producers #discover .btn {
   background-color: #F8F1DD;
   color: #BB8757;
   border: solid 1px #F8F1DD;
 }
 
-/* line 615, ../sass/screen.scss */
+/* line 619, ../sass/screen.scss */
 #footer {
   width: 100%;
   background-color: #F8F1DD;
@@ -670,7 +671,7 @@ ul li {
   padding-top: 30px;
   padding-bottom: 17px;
 }
-/* line 623, ../sass/screen.scss */
+/* line 627, ../sass/screen.scss */
 #footer a {
   font-family: "myriadpro-regular";
   color: #7e7e7e;
@@ -683,33 +684,33 @@ ul li {
   border-right: solid 1px #7e7e7e;
   border-right: solid 1px white;
 }
-/* line 634, ../sass/screen.scss */
+/* line 638, ../sass/screen.scss */
 #footer a:hover {
   color: gray;
 }
-/* line 638, ../sass/screen.scss */
+/* line 642, ../sass/screen.scss */
 #footer a:last-child {
   border: 0px none;
 }
-/* line 644, ../sass/screen.scss */
+/* line 648, ../sass/screen.scss */
 #footer #code-source img {
   height: 20px;
 }
 
-/* line 650, ../sass/screen.scss */
+/* line 654, ../sass/screen.scss */
 #content #mentions {
   padding-top: 20px;
 }
-/* line 653, ../sass/screen.scss */
+/* line 657, ../sass/screen.scss */
 #content #mentions div.content {
   width: 60%;
   font-size: 90%;
 }
-/* line 658, ../sass/screen.scss */
+/* line 662, ../sass/screen.scss */
 #content #mentions p {
   padding-bottom: 15px;
 }
-/* line 662, ../sass/screen.scss */
+/* line 666, ../sass/screen.scss */
 #content #mentions h2 {
   color: black;
   padding-bottom: 40px;
@@ -717,7 +718,7 @@ ul li {
   line-height: 35px;
   font-family: "myriadpro-regular";
 }
-/* line 670, ../sass/screen.scss */
+/* line 674, ../sass/screen.scss */
 #content #mentions h3 {
   font-family: "comfortaaregular";
   font-size: 18px;
@@ -726,58 +727,58 @@ ul li {
   color: black;
 }
 
-/* line 681, ../sass/screen.scss */
+/* line 685, ../sass/screen.scss */
 .mentions #main, .mentions body {
   background-color: white;
 }
 
-/* line 686, ../sass/screen.scss */
+/* line 690, ../sass/screen.scss */
 .vegas-loading {
   display: none;
 }
 
-/* line 693, ../sass/screen.scss */
+/* line 697, ../sass/screen.scss */
 #profil-user .form-group.field-user-no_mail label {
   font-weight: normal;
 }
-/* line 697, ../sass/screen.scss */
+/* line 701, ../sass/screen.scss */
 #profil-user .form-group label {
   cursor: pointer;
 }
-/* line 702, ../sass/screen.scss */
+/* line 706, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 705, ../sass/screen.scss */
+/* line 709, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group label {
   font-weight: normal;
 }
-/* line 711, ../sass/screen.scss */
+/* line 715, ../sass/screen.scss */
 #profil-user p.strong {
   font-weight: bold;
 }
 
 /* login */
-/* line 720, ../sass/screen.scss */
+/* line 724, ../sass/screen.scss */
 .site-login .col-lg-5 {
   margin: 0px auto;
   float: none;
 }
 
 /* signup */
-/* line 728, ../sass/screen.scss */
+/* line 732, ../sass/screen.scss */
 .modal-backdrop {
   z-index: 999;
 }
 
-/* line 733, ../sass/screen.scss */
+/* line 737, ../sass/screen.scss */
 .site-signup .col-lg-5 {
   margin: 0px auto;
   float: none;
 }
 
-/* line 743, ../sass/screen.scss */
+/* line 747, ../sass/screen.scss */
 #modal-cgv .modal-body h2 {
   margin-bottom: 5px;
   padding-bottom: 0px;
@@ -785,37 +786,37 @@ ul li {
   margin-top: 0px;
 }
 
-/* line 753, ../sass/screen.scss */
+/* line 757, ../sass/screen.scss */
 #form-signup #client-boulanger {
   margin-bottom: 30px;
 }
-/* line 758, ../sass/screen.scss */
+/* line 762, ../sass/screen.scss */
 #form-signup #signupform-id_etablissement option:disabled {
   font-weight: bold;
   color: black;
 }
-/* line 764, ../sass/screen.scss */
+/* line 768, ../sass/screen.scss */
 #form-signup #champs-boulanger {
   display: none;
 }
-/* line 768, ../sass/screen.scss */
+/* line 772, ../sass/screen.scss */
 #form-signup #boutons-inscrire {
   margin-top: 30px;
 }
 
-/* line 773, ../sass/screen.scss */
+/* line 777, ../sass/screen.scss */
 #col-left {
   padding: 0px;
   z-index: 15;
 }
-/* line 777, ../sass/screen.scss */
+/* line 781, ../sass/screen.scss */
 #col-left .affix {
   width: 25%;
   border-right: solid 1px #e0e0e0;
   background-color: #FAFAFA;
   height: 100%;
 }
-/* line 784, ../sass/screen.scss */
+/* line 788, ../sass/screen.scss */
 #col-left #link-home {
   text-decoration: none;
   font-size: 22px;
@@ -824,28 +825,28 @@ ul li {
   padding: 10px;
   background-color: #F8F1DD;
 }
-/* line 792, ../sass/screen.scss */
+/* line 796, ../sass/screen.scss */
 #col-left #link-home img {
   height: 50px;
   margin-bottom: 5px;
   float: left;
 }
-/* line 798, ../sass/screen.scss */
+/* line 802, ../sass/screen.scss */
 #col-left #link-home .text {
   padding-left: 62px;
 }
-/* line 801, ../sass/screen.scss */
+/* line 805, ../sass/screen.scss */
 #col-left #link-home .text .bap {
   font-family: "comfortaalight";
   font-size: 24px;
 }
-/* line 806, ../sass/screen.scss */
+/* line 810, ../sass/screen.scss */
 #col-left #link-home .text .plateforme {
   font-size: 17px;
   font-family: "myriadpro-light";
   color: #BB8757;
 }
-/* line 814, ../sass/screen.scss */
+/* line 818, ../sass/screen.scss */
 #col-left h2 {
   font-family: "myriadpro-regular";
   color: black;
@@ -853,37 +854,37 @@ ul li {
   margin-bottom: 10px;
   padding: 15px 0px 5px 15px;
 }
-/* line 822, ../sass/screen.scss */
+/* line 826, ../sass/screen.scss */
 #col-left #links {
   background-color: white;
   margin-bottom: 20px;
 }
-/* line 828, ../sass/screen.scss */
+/* line 832, ../sass/screen.scss */
 #col-left #links ul li a {
   text-align: center;
   border-right: solid 1px #e0e0e0;
 }
-/* line 832, ../sass/screen.scss */
+/* line 836, ../sass/screen.scss */
 #col-left #links ul li a:hover {
   background-color: #BB8757;
   color: white;
 }
-/* line 838, ../sass/screen.scss */
+/* line 842, ../sass/screen.scss */
 #col-left #links ul li:last-child a {
   border-right: 0px none;
 }
-/* line 848, ../sass/screen.scss */
+/* line 852, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li a {
   padding-left: 50px;
   height: 40px;
 }
-/* line 854, ../sass/screen.scss */
+/* line 858, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li.active a {
   background-color: #BB8757;
   position: relative;
   color: white;
 }
-/* line 859, ../sass/screen.scss */
+/* line 863, ../sass/screen.scss */
 #col-left #producteurs nav.nav-producteurs ul li.active a:after {
   right: -40px;
   top: 50%;
@@ -898,18 +899,18 @@ ul li {
   border-width: 20px;
   margin-top: -20px;
 }
-/* line 878, ../sass/screen.scss */
+/* line 882, ../sass/screen.scss */
 #col-left ul {
   list-style-type: none;
   margin: 0px;
   padding: 0px;
 }
-/* line 882, ../sass/screen.scss */
+/* line 886, ../sass/screen.scss */
 #col-left ul li {
   margin: 0px;
   padding: 0px;
 }
-/* line 885, ../sass/screen.scss */
+/* line 889, ../sass/screen.scss */
 #col-left ul li a {
   text-decoration: none;
   font-family: "comfortaaregular";
@@ -920,18 +921,18 @@ ul li {
   display: block;
   color: black;
 }
-/* line 895, ../sass/screen.scss */
+/* line 899, ../sass/screen.scss */
 #col-left ul li a span.nom, #col-left ul li a span.libelle {
   display: none;
 }
-/* line 902, ../sass/screen.scss */
+/* line 906, ../sass/screen.scss */
 #col-left p {
   padding: 20px;
   padding-top: 0px;
   color: gray;
 }
 
-/* line 910, ../sass/screen.scss */
+/* line 914, ../sass/screen.scss */
 #content .header-title {
   height: 79px;
   padding: 20px 20px;
@@ -946,7 +947,7 @@ ul li {
   -webkit-box-shadow: 0px 0px 8px #e0e0e0;
   box-shadow: 0px 0px 8px #e0e0e0;
 }
-/* line 922, ../sass/screen.scss */
+/* line 926, ../sass/screen.scss */
 #content .header-title h1 {
   color: black;
   font-family: "myriadpro-regular";
@@ -954,7 +955,7 @@ ul li {
   font-size: 25px;
   text-transform: uppercase;
 }
-/* line 930, ../sass/screen.scss */
+/* line 934, ../sass/screen.scss */
 #content .header-title h2 {
   color: gray;
   text-transform: none;
@@ -963,16 +964,16 @@ ul li {
   line-height: 20px;
 }
 
-/* line 941, ../sass/screen.scss */
+/* line 945, ../sass/screen.scss */
 .header-etablissement {
   z-index: 1;
 }
-/* line 943, ../sass/screen.scss */
+/* line 947, ../sass/screen.scss */
 .header-etablissement #block-main-img {
   height: 144px;
   overflow: hidden;
 }
-/* line 947, ../sass/screen.scss */
+/* line 951, ../sass/screen.scss */
 .header-etablissement #block-main-img #main-img {
   width: 100%;
   height: auto;
@@ -982,7 +983,7 @@ ul li {
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 956, ../sass/screen.scss */
+/* line 960, ../sass/screen.scss */
 .header-etablissement h1 {
   font-family: "comfortaaregular";
   text-align: center;
@@ -990,23 +991,23 @@ ul li {
   top: 30px;
   left: 40px;
 }
-/* line 963, ../sass/screen.scss */
+/* line 967, ../sass/screen.scss */
 .header-etablissement h1 span {
   background-color: rgba(255, 255, 255, 0.8);
   padding: 10px 30px;
   border: dotted 1px black;
 }
 
-/* line 974, ../sass/screen.scss */
+/* line 978, ../sass/screen.scss */
 nav#menu-etablissement {
   border-bottom: solid 1px #e0e0e0;
 }
-/* line 978, ../sass/screen.scss */
+/* line 982, ../sass/screen.scss */
 nav#menu-etablissement ul li {
   padding: 0px;
   margin: 0px;
 }
-/* line 981, ../sass/screen.scss */
+/* line 985, ../sass/screen.scss */
 nav#menu-etablissement ul li a {
   border-right: solid 1px #e0e0e0;
   text-decoration: none;
@@ -1014,7 +1015,7 @@ nav#menu-etablissement ul li a {
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 986, ../sass/screen.scss */
+/* line 990, ../sass/screen.scss */
 nav#menu-etablissement ul li a:hover {
   background-color: #BB8757;
   color: white;

frontend/web/sass/screen.scss

@@ -410,9 +410,10 @@ ul {
             margin-bottom: 50px ;
             
             h2 {
+                text-align: center ;
                 margin-bottom: 10px ;
                 .img {
-                    height: 50px ;
+                    height: 35px ;
                }
                span {
                     margin-left: 10px ;
@@ -436,13 +437,10 @@ ul {
             
             .boulanger {
                 .prix {
-                    span {
+                    a {
                         background-color: $color2 ;
-                        
-                        a {
-                            color: $color1 ;
-                            text-decoration: none ;
-                        }
+                        color: $color1 ;
+                        text-decoration: none ;
                     }
                 }
             }
@@ -450,10 +448,12 @@ ul {
             .prix {
                 padding-top: 15px ;
                 font-size: 18px ;
-                
-                span {
+ 
+                a, div {
+                    text-decoration: none ;
+                    text-align: center ;
+                    display: block ;
                     color: $color1 ;
-                    //background-color: $color2 ;
                     border: solid 1px $color1 ;
                     font-weight: normal ;
                     font-size: 18px ;
@@ -464,6 +464,10 @@ ul {
                     padding-bottom: 7px ;
                     @include border-radius(5px) ;
                 }
+                
+                span {
+                    
+                }
             }
             
             #periode-essai {