[Espace producteur] Commande : mise en avant titre produits

backend/controllers/DistributionController.php

@@ -1335,7 +1335,7 @@ class DistributionController extends BackendController
         $dateSaturday = date('Y-m-d', strtotime('Saturday', $start));
         $dateSunday = date('Y-m-d', strtotime('Sunday', $start));
 
-        $pointsSaleArray = PointSale::searchAll();
+        $pointsSaleArray = PointSale::searchAll(['status' => 1]);
 
         $activeMonday = false;
         $activeTuesday = false;

producer/views/order/order.php

@@ -311,14 +311,17 @@ $this->setTitle('Commander') ;
                                                     <td class="name">
                                                         <span class="name">{{ product.name }}</span>
                                                         <span class="other">
-                                                        <span v-if="product.description.length">/</span>
-                                                        <span class="description">{{ product.description }}</span>
-                                                        <span v-if="product.weight">({{ product.weight }}&nbsp;g)</span>
-                                                    </span>
+                                                            <span v-if="product.weight">({{ product.weight }}&nbsp;g)</span>
+                                                        </span>
                                                         <span v-if="product.quantity_max > 0 && ((product.quantity_form / product.coefficient_unit == product.quantity_remaining) || ((product.quantity_remaining * product.coefficient_unit) - product.quantity_form) < product.step)" class="label label-danger">
-                                                        Épuisé
-                                                    </span>
-                                                        <div class="recipe" v-if="product.recipe.length">{{ product.recipe }}</div>
+                                                            Épuisé
+                                                        </span>
+                                                        <div class="description" v-if="product.description.length">
+                                                            {{ product.description }}
+                                                        </div>
+                                                        <div class="recipe" v-if="product.recipe.length">
+                                                            {{ product.recipe }}
+                                                        </div>
                                                     </td>
                                                     <td class="price-unit">
                                                         <template v-if="productHasPrice(product)">
@@ -365,10 +368,12 @@ $this->setTitle('Commander') ;
                                                         <li v-for="product in products" v-if="product.quantity_form > 0">
                                                             <span class="quantity">{{ product.quantity_form }} {{ product.unit == 'piece' ? 'p.' : product.unit }} x</span>
                                                             <span class="name">{{ product.name }}</span>
-                                                            <span class="other">
+                                                            <!--<span class="other">
                                                             <span v-if="product.description.length">/</span>
-                                                            <span class="description">{{ product.description }}</span>
-                                                            <span v-if="product.weight">({{ product.weight }}&nbsp;g)</span>
+                                                            <span class="description">{{ product.description }}</span>-->
+                                                            <span class="other">
+                                                                <span v-if="product.weight">({{ product.weight }}&nbsp;g)</span>
+                                                            </span>
                                                         </li>
                                                     </ul>
                                                 </template>

producer/web/css/screen.css

@@ -1543,17 +1543,24 @@ termes.
   color: black;
   font-size: 20px;
   line-height: 25px;
+  font-weight: bold;
 }
-/* line 276, ../sass/order/_order.scss */
+/* line 277, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .other {
-  font-size: 14px;
-  color: #333;
+  font-family: "capsuularegular";
+  color: black;
+  font-weight: bold;
+  font-size: 17px;
 }
-/* line 280, ../sass/order/_order.scss */
-.order-order #main #app-order-order table#products td.name .recipe {
+/* line 283, ../sass/order/_order.scss */
+.order-order #main #app-order-order table#products td.name .description {
   color: gray;
 }
 /* line 286, ../sass/order/_order.scss */
+.order-order #main #app-order-order table#products td.name .recipe {
+  color: gray;
+}
+/* line 292, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices {
   margin-top: 10px;
   font-size: 10px;
@@ -1561,34 +1568,34 @@ termes.
   padding-bottom: 2px;
   margin-bottom: 0px;
 }
-/* line 294, ../sass/order/_order.scss */
+/* line 300, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li {
   margin-bottom: 5px;
 }
-/* line 296, ../sass/order/_order.scss */
+/* line 302, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li strong {
   font-weight: bold;
 }
-/* line 304, ../sass/order/_order.scss */
+/* line 310, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit, .order-order #main #app-order-order table#products .price-total {
   width: 135px;
   text-align: center;
 }
-/* line 308, ../sass/order/_order.scss */
+/* line 314, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .unit, .order-order #main #app-order-order table#products .price-total .unit {
   color: gray;
   font-size: 13px;
 }
-/* line 313, ../sass/order/_order.scss */
+/* line 319, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity {
   width: 175px;
 }
-/* line 315, ../sass/order/_order.scss */
+/* line 321, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity input.quantity {
   text-align: center;
   border-right: 0px none;
 }
-/* line 319, ../sass/order/_order.scss */
+/* line 325, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -1596,69 +1603,69 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 330, ../sass/order/_order.scss */
+/* line 336, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary h3 {
   margin-top: 0px;
   font-family: "capsuularegular";
   text-transform: none;
   margin-bottom: 5px;
 }
-/* line 337, ../sass/order/_order.scss */
+/* line 343, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul {
   margin-bottom: 15px;
   padding-left: 20px;
   font-size: 23px;
 }
-/* line 344, ../sass/order/_order.scss */
+/* line 350, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .quantity {
   font-size: 18px;
 }
-/* line 348, ../sass/order/_order.scss */
+/* line 354, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .name {
   font-family: "capsuularegular";
   font-size: 24px;
 }
-/* line 352, ../sass/order/_order.scss */
+/* line 358, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .other {
-  font-family: "arial";
-  font-size: 14px;
+  font-family: "capsuularegular";
+  font-size: 18px;
 }
-/* line 359, ../sass/order/_order.scss */
+/* line 366, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .price-total {
   font-size: 23px;
 }
-/* line 367, ../sass/order/_order.scss */
+/* line 374, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery {
   margin-bottom: 20px;
 }
-/* line 370, ../sass/order/_order.scss */
+/* line 377, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery .delivery-home {
   margin-bottom: 20px;
 }
-/* line 379, ../sass/order/_order.scss */
+/* line 386, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .comment {
   margin-bottom: 20px;
 }
-/* line 384, ../sass/order/_order.scss */
+/* line 391, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .credit .info {
   margin-left: 20px;
   color: gray;
 }
-/* line 391, ../sass/order/_order.scss */
+/* line 398, ../sass/order/_order.scss */
 .order-order #main #app-order-order #specific-delays {
   margin-top: 15px;
 }
-/* line 399, ../sass/order/_order.scss */
+/* line 406, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos {
   margin-top: 30px;
 }
-/* line 401, ../sass/order/_order.scss */
+/* line 408, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos .panel-body {
   padding-top: 0px;
   white-space: pre-line;
 }
 
-/* line 411, ../sass/order/_order.scss */
+/* line 418, ../sass/order/_order.scss */
 #main #content .panel h3 {
   font-family: "highvoltageregular";
   margin: 0px;

producer/web/sass/order/_order.scss

@@ -272,10 +272,16 @@
                     color: black ;
                     font-size: 20px ;
                     line-height: 25px ;
+                    font-weight: bold;
                 }
                 .other {
-                    font-size: 14px ;
-                    color: #333 ;
+                    font-family: 'capsuularegular' ;
+                    color: black ;
+                    font-weight: bold;
+                    font-size: 17px ;
+                }
+                .description {
+                    color: gray;
                 }
                 .recipe {
                     color: gray ;
@@ -350,8 +356,9 @@
                                 font-size: 24px ;
                             }
                             .other {
-                                font-family: 'arial' ;
-                                font-size: 14px ;
+                                //font-family: 'arial' ;
+                                font-family: 'capsuularegular' ;
+                                font-size: 18px ;
                             }
                         }
                     }