Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -785,7 +785,7 @@ class DistributionController extends BackendController
                         'id_product' => $idProduct,
                 ]);
 
-                $productDistribution->quantity_max = (!$quantityMax) ? null : (int)$quantityMax;
+                $productDistribution->quantity_max = (!$quantityMax) ? null : (float) $quantityMax;
 
                 $productDistribution->save();
 

producer/views/site/index.php

@@ -77,12 +77,37 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
             [
                 'label' => 'Jours de livraison',
                 'format' => 'raw',
+                 'contentOptions' => ['class' => 'days'],
                 'value' => function($model) {
 
                         $producer = \Yii::$app->controller->getProducer() ;
 
                         if($producer->behavior_home_point_sale_day_list == Producer::BEHAVIOR_HOME_POINT_SALE_DAY_LIST_WEEK) {
-                                return $model->getStrDeliveryDays() ;
+                                $arrayDays = [
+                                    'monday' => 'Lundi',
+                                    'tuesday' => 'Mardi',
+                                    'wednesday' => 'Mercredi',
+                                    'thursday' => 'Jeudi',
+                                    'friday' => 'Vendredi',
+                                    'saturday' => 'Samedi',
+                                    'sunday' => 'Dimanche'
+                                ] ;
+
+                                $html = '' ;
+                                foreach($arrayDays as $dayEn => $dayFr) {
+                                        $fieldDelivery = 'delivery_'.$dayEn ;
+                                        $fieldInfos = 'infos_'.$dayEn ;
+
+                                        if ($model->$fieldDelivery) {
+                                                $html .= '<strong>'.$dayFr.'</strong>';
+                                                if(strlen($model->$fieldInfos)) {
+                                                        $html .= ' / <small>'.nl2br(str_replace(['[select_previous_day]', '[/select_previous_day]'], '', $model->$fieldInfos)).'</small>' ;
+                                                }
+                                                $html .= '<br />' ;
+                                        }
+                                }
+
+                                return $html  ;
                         }
                         elseif($producer->behavior_home_point_sale_day_list == Producer::BEHAVIOR_HOME_POINT_SALE_DAY_LIST_INCOMING_DISTRIBUTIONS) {
                                 $html = '' ;

producer/web/css/screen.css

@@ -634,19 +634,23 @@ termes.
   color: black;
 }
 /* line 67, ../sass/site/_index.scss */
+.site-index #points-sale .days small {
+  color: gray;
+}
+/* line 75, ../sass/site/_index.scss */
 .site-index #products td.photo {
   width: 100px;
 }
-/* line 69, ../sass/site/_index.scss */
+/* line 77, ../sass/site/_index.scss */
 .site-index #products td.photo img.photo-product {
   width: 120px;
   height: auto;
 }
-/* line 75, ../sass/site/_index.scss */
+/* line 83, ../sass/site/_index.scss */
 .site-index #products .name {
   color: #333;
 }
-/* line 77, ../sass/site/_index.scss */
+/* line 85, ../sass/site/_index.scss */
 .site-index #products .name .the-name {
   font-family: "capsuularegular";
   font-size: 20px;
@@ -1932,38 +1936,42 @@ termes.
   }
 
   /* line 175, ../sass/_responsive.scss */
+  .order-order #app-order-order h3 {
+    line-height: 28px;
+  }
+  /* line 180, ../sass/_responsive.scss */
   .order-order #app-order-order #steps ul {
-    height: auto;
+    height: auto !important;
   }
-  /* line 177, ../sass/_responsive.scss */
+  /* line 182, ../sass/_responsive.scss */
   .order-order #app-order-order #steps ul li {
-    padding-left: 0px;
-    padding-right: 0px;
+    padding-left: 0px !important;
+    padding-right: 0px !important;
   }
-  /* line 181, ../sass/_responsive.scss */
+  /* line 186, ../sass/_responsive.scss */
   .order-order #app-order-order #steps ul li .info-step {
     display: none;
   }
-  /* line 185, ../sass/_responsive.scss */
+  /* line 190, ../sass/_responsive.scss */
   .order-order #app-order-order #steps ul li .btn::after,
   .order-order #app-order-order #steps ul li .btn::before {
     display: none;
   }
-  /* line 196, ../sass/_responsive.scss */
+  /* line 201, ../sass/_responsive.scss */
   .order-order #app-order-order table#products td.name .recipe {
     display: none;
   }
-  /* line 202, ../sass/_responsive.scss */
+  /* line 207, ../sass/_responsive.scss */
   .order-order #app-order-order table#products td.td-quantity .input-group-btn {
     width: 100%;
     display: block;
   }
-  /* line 206, ../sass/_responsive.scss */
+  /* line 211, ../sass/_responsive.scss */
   .order-order #app-order-order table#products td.td-quantity .input-group-btn button {
     width: 100%;
     display: block;
   }
-  /* line 216, ../sass/_responsive.scss */
+  /* line 221, ../sass/_responsive.scss */
   .order-order #app-order-order #order-success .alert .glyphicon-big {
     font-size: 90px;
     color: white;
@@ -1973,13 +1981,13 @@ termes.
     text-align: center;
     margin-bottom: 20px;
   }
-  /* line 225, ../sass/_responsive.scss */
+  /* line 230, ../sass/_responsive.scss */
   .order-order #app-order-order #order-success .alert div.content {
     margin-left: 0px;
     text-align: center;
   }
 
-  /* line 236, ../sass/_responsive.scss */
+  /* line 241, ../sass/_responsive.scss */
   #footer .content {
     text-align: center;
   }

producer/web/sass/_responsive.scss

@@ -171,12 +171,17 @@ termes.
     
     .order-order {
         #app-order-order {
+
+            h3 {
+                line-height: 28px ;
+            }
+
             #steps {
                 ul {
-                    height: auto ;
+                    height: auto !important ;
                     li {
-                        padding-left: 0px ;
-                        padding-right: 0px ;
+                        padding-left: 0px !important;
+                        padding-right: 0px !important ;
                         
                         .info-step {
                             display: none ;

producer/web/sass/site/_index.scss

@@ -60,7 +60,15 @@ termes.
                 color: black ;
             }
         }
-        
+        .days {
+            strong {
+
+            }
+            small {
+                color: gray ;
+                //font-size: 14px ;
+            }
+        }
     }
     
     #products {