[backend] Affichage des commentaires des utilisateurs dans la liste des commandes

backend/views/distribution/index.php

@@ -238,6 +238,7 @@ $this->setPageTitle('Distributions') ;
                                 <td>
                                     <span v-if="order.user">{{ order.user.lastname+' '+order.user.name }}</span>
                                     <span v-else>{{ order.username }}</span>
+                                    <span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span>
                                 </td>
                                 <td v-if="idActivePointSale == 0">
                                     {{ order.pointSale.name }}
@@ -377,7 +378,11 @@ $this->setPageTitle('Distributions') ;
                                             {{ order.productOrder[product.id] }} x {{ product.name }}
                                         </li>
                                     </ul>
-                                </td> 
+                                    <div v-if="order.comment && order.comment.length > 0" class="comment">
+                                        <strong><span class="glyphicon glyphicon-menu-right"></span> Commentaire</strong><br />
+                                        {{ order.comment }}
+                                    </div>
+                                </td>
                             </tr>
                         </template>
                     </tbody>

backend/web/css/screen.css

@@ -1824,45 +1824,49 @@ termes.
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 247, ../sass/distribution/_index.scss */
+/* line 240, ../sass/distribution/_index.scss */
+.distribution-index #orders table tr.view .comment {
+  margin-top: 20px;
+}
+/* line 251, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 251, ../sass/distribution/_index.scss */
+/* line 255, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 257, ../sass/distribution/_index.scss */
+/* line 261, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 150px;
 }
-/* line 260, ../sass/distribution/_index.scss */
+/* line 264, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: gray;
 }
-/* line 266, ../sass/distribution/_index.scss */
+/* line 270, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 272, ../sass/distribution/_index.scss */
+/* line 276, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 280, ../sass/distribution/_index.scss */
+/* line 284, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 282, ../sass/distribution/_index.scss */
+/* line 286, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 286, ../sass/distribution/_index.scss */
+/* line 290, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
-/* line 292, ../sass/distribution/_index.scss */
+/* line 296, ../sass/distribution/_index.scss */
 .distribution-index .modal-mask {
   position: fixed;
   z-index: 9998;
@@ -1874,12 +1878,12 @@ termes.
   display: table;
   transition: opacity .3s ease;
 }
-/* line 304, ../sass/distribution/_index.scss */
+/* line 308, ../sass/distribution/_index.scss */
 .distribution-index .modal-wrapper {
   display: table-cell;
   vertical-align: middle;
 }
-/* line 309, ../sass/distribution/_index.scss */
+/* line 313, ../sass/distribution/_index.scss */
 .distribution-index .modal-container {
   width: 70%;
   margin: 0px auto;
@@ -1890,37 +1894,37 @@ termes.
   transition: all .3s ease;
   font-family: Helvetica, Arial, sans-serif;
 }
-/* line 320, ../sass/distribution/_index.scss */
+/* line 324, ../sass/distribution/_index.scss */
 .distribution-index .modal-header {
   padding-bottom: 0px;
 }
-/* line 322, ../sass/distribution/_index.scss */
+/* line 326, ../sass/distribution/_index.scss */
 .distribution-index .modal-header h3 {
   margin-top: 0;
   color: #333;
   text-transform: uppercase;
   margin-bottom: 0px;
 }
-/* line 330, ../sass/distribution/_index.scss */
+/* line 334, ../sass/distribution/_index.scss */
 .distribution-index .modal-body {
   margin: 20px 0;
   max-height: 300px;
   height: 300px;
   overflow-y: scroll;
 }
-/* line 337, ../sass/distribution/_index.scss */
+/* line 341, ../sass/distribution/_index.scss */
 .distribution-index .modal-default-button {
   float: right;
 }
-/* line 350, ../sass/distribution/_index.scss */
+/* line 354, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter {
   opacity: 0;
 }
-/* line 354, ../sass/distribution/_index.scss */
+/* line 358, ../sass/distribution/_index.scss */
 .distribution-index .modal-leave-active {
   opacity: 0;
 }
-/* line 358, ../sass/distribution/_index.scss */
+/* line 362, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter .modal-container,
 .distribution-index .modal-leave-active .modal-container {
   -webkit-transform: scale(1.1);

backend/web/sass/distribution/_index.scss

@@ -236,6 +236,10 @@ termes.
                         
                     }
                 }
+                
+                .comment {
+                    margin-top: 20px ;
+                }
             }
         }
     }