Pouvoir ajouter et supprimer des boulangeries du tableau de bord de l'utilisateur

common/helpers/Departements.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace common\helpers;
+
+class Departements {
+
+    public static function get() 
+    {
+        $depts = array();
+        $depts["01"] = "Ain";
+        $depts["02"] = "Aisne";
+        $depts["03"] = "Allier";
+        $depts["04"] = "Alpes de Haute Provence";
+        $depts["05"] = "Hautes Alpes";
+        $depts["06"] = "Alpes Maritimes";
+        $depts["07"] = "Ardèche";
+        $depts["08"] = "Ardennes";
+        $depts["09"] = "Ariège";
+        $depts["10"] = "Aube";
+        $depts["11"] = "Aude";
+        $depts["12"] = "Aveyron";
+        $depts["13"] = "Bouches du Rhône";
+        $depts["14"] = "Calvados";
+        $depts["15"] = "Cantal";
+        $depts["16"] = "Charente";
+        $depts["17"] = "Charente Maritime";
+        $depts["18"] = "Cher";
+        $depts["19"] = "Corrèze";
+        $depts["2A"] = "Corse du Sud";
+        $depts["2B"] = "Haute Corse";
+        $depts["21"] = "Côte d'Or";
+        $depts["22"] = "Côtes d'Armor";
+        $depts["23"] = "Creuse";
+        $depts["24"] = "Dordogne";
+        $depts["25"] = "Doubs";
+        $depts["26"] = "Drôme";
+        $depts["27"] = "Eure";
+        $depts["28"] = "Eure et Loir";
+        $depts["29"] = "Finistère";
+        $depts["30"] = "Gard";
+        $depts["31"] = "Haute Garonne";
+        $depts["32"] = "Gers";
+        $depts["33"] = "Gironde";
+        $depts["34"] = "Hérault";
+        $depts["35"] = "Ille et Vilaine";
+        $depts["36"] = "Indre";
+        $depts["37"] = "Indre et Loire";
+        $depts["38"] = "Isère";
+        $depts["39"] = "Jura";
+        $depts["40"] = "Landes";
+        $depts["41"] = "Loir et Cher";
+        $depts["42"] = "Loire";
+        $depts["43"] = "Haute Loire";
+        $depts["44"] = "Loire Atlantique";
+        $depts["45"] = "Loiret";
+        $depts["46"] = "Lot";
+        $depts["47"] = "Lot et Garonne";
+        $depts["48"] = "Lozère";
+        $depts["49"] = "Maine et Loire";
+        $depts["50"] = "Manche";
+        $depts["51"] = "Marne";
+        $depts["52"] = "Haute Marne";
+        $depts["53"] = "Mayenne";
+        $depts["54"] = "Meurthe et Moselle";
+        $depts["55"] = "Meuse";
+        $depts["56"] = "Morbihan";
+        $depts["57"] = "Moselle";
+        $depts["58"] = "Nièvre";
+        $depts["59"] = "Nord";
+        $depts["60"] = "Oise";
+        $depts["61"] = "Orne";
+        $depts["62"] = "Pas de Calais";
+        $depts["63"] = "Puy de Dôme";
+        $depts["64"] = "Pyrénées Atlantiques";
+        $depts["65"] = "Hautes Pyrénées";
+        $depts["66"] = "Pyrénées Orientales";
+        $depts["67"] = "Bas Rhin";
+        $depts["68"] = "Haut Rhin";
+        $depts["69"] = "Rhône";
+        $depts["70"] = "Haute Saône";
+        $depts["71"] = "Saône et Loire";
+        $depts["72"] = "Sarthe";
+        $depts["73"] = "Savoie";
+        $depts["74"] = "Haute Savoie";
+        $depts["75"] = "Paris";
+        $depts["76"] = "Seine Maritime";
+        $depts["77"] = "Seine et Marne";
+        $depts["78"] = "Yvelines";
+        $depts["79"] = "Deux Sèvres";
+        $depts["80"] = "Somme";
+        $depts["81"] = "Tarn";
+        $depts["82"] = "Tarn et Garonne";
+        $depts["83"] = "Var";
+        $depts["84"] = "Vaucluse";
+        $depts["85"] = "Vendée";
+        $depts["86"] = "Vienne";
+        $depts["87"] = "Haute Vienne";
+        $depts["88"] = "Vosges";
+        $depts["89"] = "Yonne";
+        $depts["90"] = "Territoire de Belfort";
+        $depts["91"] = "Essonne";
+        $depts["92"] = "Hauts de Seine";
+        $depts["93"] = "Seine St Denis";
+        $depts["94"] = "Val de Marne";
+        $depts["95"] = "Val d'Oise";
+        $depts["97"] = "DOM";
+        
+        return $depts ;
+    }
+    
+
+
+}

common/models/UserEtablissement.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "user_etablissement".
+ *
+ * @property integer $id_user
+ * @property integer $id_etablissement
+ */
+class UserEtablissement extends \yii\db\ActiveRecord {
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName() {
+        return 'user_etablissement';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules() {
+        return [
+            [['id_user', 'id_etablissement'], 'required'],
+            [['id_user', 'id_etablissement'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels() {
+        return [
+            'id_user' => 'Id User',
+            'id_etablissement' => 'Id Etablissement',
+        ];
+    }
+
+}

frontend/controllers/CommandeController.php

@@ -10,6 +10,11 @@ use common\models\Commande;
 use common\models\PointVente;
 use common\models\Production;
 use common\models\Produit;
+use common\models\Etablissement;
+use common\helpers\Departements;
+use yii\helpers\Html;
+use frontend\models\AddEtablissementForm;
+use common\models\UserEtablissement;
 
 class CommandeController extends \yii\web\Controller {
 
@@ -138,9 +143,37 @@ class CommandeController extends \yii\web\Controller {
 
     public function actionIndex() {
 
-        // liste des boulangeries
-        $boulangeries = Yii::$app->user->identity->getEtablissementsFavoris();
-
+        $model_form_etablissement = new AddEtablissementForm() ;
+        if($model_form_etablissement->load(Yii::$app->request->post()) 
+            && $model_form_etablissement->validate()) 
+        {
+            $model_form_etablissement->add() ;
+            $model_form_etablissement->id_etablissement = 0 ;
+        }
+        
+        // liste des etablissements
+        $etablissements = Yii::$app->user->identity->getEtablissementsFavoris();
+
+        // liste des boulangeries disponibles
+        $etablissements_dispos = Etablissement::find()
+                ->orderby('code_postal, ville ASC')
+                ->all() ;
+        
+        $departements = Departements::get() ;
+        $data_etablissements_dispos = [] ;
+        $options_etablissements_dispos = [] ;
+        foreach($etablissements_dispos as $e) 
+        {
+            if(!key_exists('d'.  substr($e['code_postal'], 0, 2), $data_etablissements_dispos)) 
+            {
+                $data_etablissements_dispos['d'.  substr($e['code_postal'], 0, 2)] = '<strong>'.$departements[substr($e['code_postal'], 0, 2)].'</strong>' ;
+                $options_etablissements_dispos['d'.  substr($e['code_postal'], 0, 2)] = ['disabled' => true] ;
+            }
+            
+            $data_etablissements_dispos[$e['id']] = Html::encode($e['nom']).' - '.Html::encode($e['code_postal']).' '.Html::encode($e['ville']) ;
+            
+        }
+        
         // liste des commandes
         $commandes = Commande::find()
                 ->with('commandeProduits', 'pointVente')
@@ -154,15 +187,28 @@ class CommandeController extends \yii\web\Controller {
         // initilisation commandes
         foreach ($commandes as $c)
             $c->init();
-
+         
         return $this->render('index', [
             'commandes' => $commandes,
             'commande_ok' => Yii::$app->getRequest()->get('commande_ok', false),
             'annule_ok' => Yii::$app->getRequest()->get('annule_ok', false),
             'pate_deja_petrie' => Yii::$app->getRequest()->get('pate_deja_petrie', false),
-            'boulangeries' => $boulangeries
+            'etablissements' => $etablissements,
+            'model_form_etablissement' => $model_form_etablissement,
+            'data_etablissements_dispos' => $data_etablissements_dispos,
+            'options_etablissements_dispos' => $options_etablissements_dispos,
         ]);
     }
+    
+    public function actionRemoveEtablissement($id = 0)
+    {
+        $user_etablissement = UserEtablissement::find()
+                ->where(['id_etablissement'=>$id, 'id_user' => Yii::$app->user->identity->id])
+                ->one() ;
+        
+        $user_etablissement->delete() ;
+        $this->redirect(['commande/index']) ;
+    }
 
     public function actionCreate() {
 

frontend/models/AddEtablissementForm.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use common\models\UserEtablissement;
+
+/**
+ * ContactForm is the model behind the contact form.
+ */
+class AddEtablissementForm extends Model
+{
+    public $id_etablissement;
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            ['id_etablissement', 'required', 'message' => 'Champs obligatoire'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+        	'id_etablissement' => 'Ajouter une boulangerie',
+        ];
+    }
+
+    /**
+     * Sends an email to the specified email address using the information collected by this model.
+     *
+     * @param  string  $email the target email address
+     * @return boolean whether the email was sent
+     */
+    public function add()
+    {
+        $user_etablissement_exist = UserEtablissement::find()
+                ->where(['id_user'=>Yii::$app->user->identity->id, 'id_etablissement' =>$this->id_etablissement])
+                ->one() ;
+        
+        if(!$user_etablissement_exist)
+        {
+            $user_etablissement = new UserEtablissement() ;
+            $user_etablissement->id_user = Yii::$app->user->identity->id ;
+            $user_etablissement->id_etablissement = $this->id_etablissement ;
+            $user_etablissement->save() ;
+        }
+    }
+}

frontend/views/commande/index.php

@@ -2,6 +2,7 @@
 /* @var $this yii\web\View */
 
 use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
 
 $this->title = 'Commande' ;
 
@@ -12,34 +13,42 @@ $this->title = 'Commande' ;
 <h1 class="title-systeme-commande"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/order.png" alt="" /> Tableau de bord</h1>
 
 <h2>Boulangeries</h2>
-<?php if(count($boulangeries)): ?>
+
     <div id="liste-boulangeries">
-        <?php foreach($boulangeries as $b): ?>
+        <div id="bloc-liste-boulangeries" class="col-md-6">
+        <?php if(count($etablissements)): ?>
+        <?php foreach($etablissements as $e): ?>
         <div class="">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                  <h3 class="panel-title"><?php echo Html::encode($b['nom']); ?></h3>
+                  <h3 class="panel-title">
+                      <?php echo Html::encode($e['nom']); ?>
+                      <span class="localite"> - <?php echo Html::encode($e['ville']).' ('.Html::encode($e['code_postal']).')'; ?></span>
+                      <a href="<?= Yii::$app->urlManager->createUrl(['commande/remove-etablissement','id'=>$e['id']]); ?>" class="btn btn-xs btn-default remove"><span class="glyphicon glyphicon-remove"></span></a>
+                  </h3>
                 </div>
                 <div class="panel-body">
-                  <?php if(strlen($b['logo'])): ?>
-                    <img class="logo" src="uploads/<?= Html::encode($b['logo']); ?>" />
-                  <?php endif; ?>
-                  
-                    <a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl('commande/create') ?>">Commander</a>
-                    
-                  <?php //nl2br(Html::encode($b['description'])); ?>
+                    <a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">Commander</a>
+                    <?php if(strlen($e['logo'])): ?>
+                        <img class="logo" src="uploads/<?= Html::encode($e['logo']); ?>" />
+                    <?php endif; ?>
                 </div>
             </div>
         </div>
         <?php endforeach; ?>
-        <div class="">
-            <a class="btn btn-default" href="javascript:void(0);"><span class="glyphicon glyphicon-plus"></span> Ajouter une boulangerie</a>
+        <?php else: ?> 
+            <div class="alert alert-info">Aucune boulangerie.<br />
+            Utilisez le formulaire pour ajouter une boulangerie proche de chez vous.</div>
+        <?php endif; ?>
+        </div>
+        <div class="col-md-6" id="bloc-add-etablissement">
+            <?php $form = ActiveForm::begin(['id' => 'form-add-boulanger','enableClientValidation'=> false]); ?>
+                <?= $form->field($model_form_etablissement, 'id_etablissement')->dropDownList($data_etablissements_dispos, ['prompt' => '--','encode' => false,'options' => $options_etablissements_dispos]) ?>
+                <?= Html::submitButton('<span class="glyphicon glyphicon-plus"></span> Ajouter', ['class' => 'btn btn-default', 'name' => 'add-etablissement-button']) ?>
+            <?php ActiveForm::end(); ?>
         </div>
     </div>
     <div class="clr"></div>
-<?php else: ?>
-    <div class="alert alert-info">Aucune boulangerie</div>
-<?php endif; ?>
 
 <!--<div class="accueil">
     <a class="btn btn-primary btn-lg" href="<?php echo Yii::$app->urlManager->createUrl(['commande/create']); ?>">Passer une commande</a>

frontend/web/css/screen.css

@@ -474,90 +474,106 @@ h2 {
   text-align: center;
   padding-bottom: 20px;
 }
-/* line 44, ../sass/_systeme_commandes.scss */
+/* line 49, ../sass/_systeme_commandes.scss */
+#index-commande #liste-boulangeries .remove {
+  float: right;
+}
+/* line 53, ../sass/_systeme_commandes.scss */
 #index-commande #liste-boulangeries .logo {
   width: 30%;
   max-width: 200px;
-  float: left;
-  padding-right: 20px;
-  padding-bottom: 20px;
+  float: right;
+  padding-left: 20px;
+}
+/* line 63, ../sass/_systeme_commandes.scss */
+#index-commande #liste-boulangeries h3 .localite {
+  color: gray;
 }
-/* line 54, ../sass/_systeme_commandes.scss */
+/* line 72, ../sass/_systeme_commandes.scss */
+#index-commande #bloc-add-etablissement .help-block {
+  padding-bottom: 0px;
+}
+/* line 78, ../sass/_systeme_commandes.scss */
+#index-commande #addetablissementform-id_etablissement option:disabled {
+  font-weight: bold;
+  color: black;
+}
+/* line 85, ../sass/_systeme_commandes.scss */
 #index-commande #historique-commandes .statut, #index-commande #historique-commandes .montant {
   width: 175px;
 }
-/* line 57, ../sass/_systeme_commandes.scss */
+/* line 88, ../sass/_systeme_commandes.scss */
 #index-commande #historique-commandes .montant {
   width: 100px;
 }
-/* line 64, ../sass/_systeme_commandes.scss */
+/* line 95, ../sass/_systeme_commandes.scss */
 #index-commande #historique-commandes .localite {
   font-size: 11px;
   lin-height: 11px;
 }
-/* line 69, ../sass/_systeme_commandes.scss */
+/* line 100, ../sass/_systeme_commandes.scss */
 #index-commande #historique-commandes a {
   text-decoration: none;
 }
 
-/* line 76, ../sass/_systeme_commandes.scss */
+/* line 107, ../sass/_systeme_commandes.scss */
 .commande-form {
   min-height: 600px;
 }
-/* line 80, ../sass/_systeme_commandes.scss */
+/* line 111, ../sass/_systeme_commandes.scss */
 .commande-form h2 {
   font-family: "myriadpro-regular";
 }
-/* line 84, ../sass/_systeme_commandes.scss */
+/* line 115, ../sass/_systeme_commandes.scss */
 .commande-form #infos-importantes.alert-warning {
   float: right;
 }
-/* line 90, ../sass/_systeme_commandes.scss */
+/* line 121, ../sass/_systeme_commandes.scss */
 .commande-form #datepicker-production .ui-datepicker {
   float: left;
   margin-right: 20px;
 }
-/* line 95, ../sass/_systeme_commandes.scss */
+/* line 126, ../sass/_systeme_commandes.scss */
 .commande-form #datepicker-production .ui-helper-clearfix:after {
   clear: none;
 }
-/* line 99, ../sass/_systeme_commandes.scss */
+/* line 130, ../sass/_systeme_commandes.scss */
 .commande-form #datepicker-production .alert-info {
   float: left;
 }
-/* line 104, ../sass/_systeme_commandes.scss */
+/* line 135, ../sass/_systeme_commandes.scss */
 .commande-form #has-commande-en-cours {
   margin-top: 15px;
 }
-/* line 107, ../sass/_systeme_commandes.scss */
+/* line 138, ../sass/_systeme_commandes.scss */
 .commande-form #has-commande-en-cours a {
   color: #a94442;
   text-decoration: none;
   font-weight: bold;
 }
-/* line 114, ../sass/_systeme_commandes.scss */
+/* line 145, ../sass/_systeme_commandes.scss */
 .commande-form .field-commande-id_point_vente {
   margin-top: 30px;
 }
-/* line 118, ../sass/_systeme_commandes.scss */
+/* line 149, ../sass/_systeme_commandes.scss */
 .commande-form .field-commande-id_production {
   margin-bottom: 0px;
 }
-/* line 120, ../sass/_systeme_commandes.scss */
+/* line 151, ../sass/_systeme_commandes.scss */
 .commande-form .field-commande-id_production label {
   margin-bottom: 0px;
 }
-/* line 124, ../sass/_systeme_commandes.scss */
+/* line 155, ../sass/_systeme_commandes.scss */
 .commande-form .field-commande-id_production .help-block {
   margin-bottom: 0px;
 }
-/* line 129, ../sass/_systeme_commandes.scss */
+/* line 160, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente {
   list-style-type: none;
   margin: 0px;
   padding: 0px;
 }
-/* line 134, ../sass/_systeme_commandes.scss */
+/* line 165, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente {
   width: 268px;
   height: 130px;
@@ -570,107 +586,107 @@ h2 {
   background-color: #f9f9f9;
   border: 1px solid #d8d8d8;
 }
-/* line 147, ../sass/_systeme_commandes.scss */
+/* line 178, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente .nom {
   font-family: "comfortaalight";
   font-size: 20px;
 }
-/* line 153, ../sass/_systeme_commandes.scss */
+/* line 184, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente .adresse {
   color: gray;
   font-size: 13px;
   line-height: 16px;
 }
-/* line 159, ../sass/_systeme_commandes.scss */
+/* line 190, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente .horaires {
   margin-top: 7px;
 }
-/* line 161, ../sass/_systeme_commandes.scss */
+/* line 192, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente .horaires .jour {
   font-weight: bold;
   display: none;
 }
-/* line 167, ../sass/_systeme_commandes.scss */
+/* line 198, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente.selected {
   border-left: solid 5px black;
   -moz-box-shadow: 0px 0px 5px #d8d8d8;
   -webkit-box-shadow: 0px 0px 5px #d8d8d8;
   box-shadow: 0px 0px 5px #d8d8d8;
 }
-/* line 171, ../sass/_systeme_commandes.scss */
+/* line 202, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente.selected .contenu {
   position: relative;
   left: -4px;
 }
-/* line 177, ../sass/_systeme_commandes.scss */
+/* line 208, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente:hover {
   -moz-box-shadow: 0px 0px 5px #d8d8d8;
   -webkit-box-shadow: 0px 0px 5px #d8d8d8;
   box-shadow: 0px 0px 5px #d8d8d8;
 }
-/* line 182, ../sass/_systeme_commandes.scss */
+/* line 213, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente.disabled {
   display: none;
 }
-/* line 189, ../sass/_systeme_commandes.scss */
+/* line 220, ../sass/_systeme_commandes.scss */
 .commande-form #produits {
   margin-top: 15px;
 }
-/* line 192, ../sass/_systeme_commandes.scss */
+/* line 223, ../sass/_systeme_commandes.scss */
 .commande-form #produits #label-produits {
   display: block;
   margin-bottom: 5px;
 }
-/* line 197, ../sass/_systeme_commandes.scss */
+/* line 228, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table {
   margin-top: 7px;
 }
-/* line 200, ../sass/_systeme_commandes.scss */
+/* line 231, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .illu {
   float: left;
   height: auto;
   width: 70px;
   margin-right: 15px;
 }
-/* line 207, ../sass/_systeme_commandes.scss */
+/* line 238, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .photo {
   float: right;
   margin-left: 10px;
   width: 200px;
 }
-/* line 213, ../sass/_systeme_commandes.scss */
+/* line 244, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .nom {
   font-family: "comfortaalight";
   font-weight: bold;
   text-transform: uppercase;
   font-size: 18px;
 }
-/* line 220, ../sass/_systeme_commandes.scss */
+/* line 251, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .description {
   font-style: italic;
 }
-/* line 224, ../sass/_systeme_commandes.scss */
+/* line 255, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .recette {
   font-size: 12px;
 }
-/* line 228, ../sass/_systeme_commandes.scss */
+/* line 259, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .input-group {
   width: 133px;
 }
-/* line 230, ../sass/_systeme_commandes.scss */
+/* line 261, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .input-group .quantity {
   text-align: center;
 }
-/* line 235, ../sass/_systeme_commandes.scss */
+/* line 266, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .colonne-quantite, .commande-form #produits .table .prix-unit, .commande-form #produits .table .total {
   width: 150px;
   text-align: center;
 }
-/* line 240, ../sass/_systeme_commandes.scss */
+/* line 271, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table td#total-commande, .commande-form #produits .table td#total-commande-vrac, .commande-form #produits .table td.total {
   text-align: center;
 }
-/* line 244, ../sass/_systeme_commandes.scss */
+/* line 275, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .epuise {
   display: none;
   text-transform: uppercase;
@@ -679,32 +695,32 @@ h2 {
   font-size: 16px;
   text-align: center;
 }
-/* line 253, ../sass/_systeme_commandes.scss */
+/* line 284, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .quantite-restante {
   font-size: 12px;
   margin-top: 8px;
 }
-/* line 257, ../sass/_systeme_commandes.scss */
+/* line 288, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table .quantite-restante .nb {
   font-weight: bold;
 }
-/* line 262, ../sass/_systeme_commandes.scss */
+/* line 293, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table td.produit, .commande-form #produits .table th.produit {
   width: 70%;
 }
-/* line 266, ../sass/_systeme_commandes.scss */
+/* line 297, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table td.prix-unit, .commande-form #produits .table th.prix-unit {
   width: 10%;
 }
-/* line 270, ../sass/_systeme_commandes.scss */
+/* line 301, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table td.colonne-quantite, .commande-form #produits .table th.colonne-quantite {
   width: 10%;
 }
-/* line 274, ../sass/_systeme_commandes.scss */
+/* line 305, ../sass/_systeme_commandes.scss */
 .commande-form #produits .table td.total, .commande-form #produits .table th.total {
   width: 10%;
 }
-/* line 280, ../sass/_systeme_commandes.scss */
+/* line 311, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed {
   position: fixed;
   bottom: 0px;
@@ -721,7 +737,7 @@ h2 {
   background-color: #F9F9F9;
   text-align: center;
 }
-/* line 294, ../sass/_systeme_commandes.scss */
+/* line 325, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed #total-commande-bottom {
   background-color: white;
   -moz-border-radius: 20px;
@@ -730,37 +746,37 @@ h2 {
   padding: 5px 25px;
   border: solid 1px #e0e0e0;
 }
-/* line 301, ../sass/_systeme_commandes.scss */
+/* line 332, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed .valider-commande, .commande-form #bar-fixed .btn-commentaire {
   float: right;
 }
-/* line 305, ../sass/_systeme_commandes.scss */
+/* line 336, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed .btn-commentaire {
   margin-right: 10px;
 }
-/* line 309, ../sass/_systeme_commandes.scss */
+/* line 340, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed .btn-retour, .commande-form #bar-fixed .annuler-commande {
   float: left;
   margin-right: 5px;
 }
-/* line 314, ../sass/_systeme_commandes.scss */
+/* line 345, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed .annuler-commande {
   color: #b92c28;
   background-color: white;
 }
-/* line 319, ../sass/_systeme_commandes.scss */
+/* line 350, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed #total-commande-bottom {
   display: none;
   font-weight: bold;
   font-family: "comfortaalight";
   font-size: 24px;
 }
-/* line 326, ../sass/_systeme_commandes.scss */
+/* line 357, ../sass/_systeme_commandes.scss */
 .commande-form #bar-fixed .field-commande-commentaire {
   display: none;
 }
 
-/* line 334, ../sass/_systeme_commandes.scss */
+/* line 365, ../sass/_systeme_commandes.scss */
 .ui-datepicker .ui-widget-header {
   background: none;
   background-color: gray;
@@ -768,7 +784,7 @@ h2 {
   color: black;
   font-weight: normal;
 }
-/* line 342, ../sass/_systeme_commandes.scss */
+/* line 373, ../sass/_systeme_commandes.scss */
 .ui-datepicker .ui-datepicker-current-day a,
 .ui-datepicker a.ui-state-hover {
   background: none;

frontend/web/sass/_systeme_commandes.scss

@@ -41,12 +41,43 @@ h2 {
 	}
         
         #liste-boulangeries {
+            
+            #bloc-liste-boulangeries {
+                //border-right: solid 1px #e0e0e0 ;
+            }
+            
+            .remove {
+                float: right;
+            }
+            
             .logo {
                 width: 30% ;
                 max-width: 200px ;
-                float: left ;
-                padding-right: 20px ;
-                padding-bottom: 20px ;
+                float: right ;
+                padding-left: 20px ;
+                //border-right: solid 1px #e0e0e0 ;
+                //padding-bottom: 20px ;
+            }
+            
+            h3 {
+                .localite {
+                    //float: right ;
+                    color: gray ;
+                }
+            }
+        }
+        
+        #bloc-add-etablissement {
+            
+            .help-block {
+                padding-bottom: 0px ;
+            }
+        }
+        
+        #addetablissementform-id_etablissement {
+            option:disabled {
+                font-weight: bold ;
+                color: black ;
             }
         }