Merge branch 'dev'

backend/views/distribution/index.php

@@ -255,7 +255,7 @@ $this->setPageTitle('Distributions') ;
                                     {{ order.pointSale.name }}
                                 </td>
                                 <td>{{ order.amount.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}</td>
-                                <td>
+                                <td class="column-state-payment">
                                     <div class="input-group">   
                                         <span class="label label-success input-group-addon" v-if="order.amount_paid == order.amount">payé</span>
                                         <span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non réglé</span>

backend/web/css/screen.css

@@ -1840,59 +1840,63 @@ termes.
   right: 4px;
   font-size: 7px;
 }
-/* line 241, ../sass/distribution/_index.scss */
+/* line 240, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-state-payment {
+  width: 120px;
+}
+/* line 245, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment div.btn-group {
   width: 125px;
 }
-/* line 247, ../sass/distribution/_index.scss */
+/* line 251, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 256, ../sass/distribution/_index.scss */
+/* line 260, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 267, ../sass/distribution/_index.scss */
+/* line 271, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 271, ../sass/distribution/_index.scss */
+/* line 275, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 277, ../sass/distribution/_index.scss */
+/* line 281, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 150px;
 }
-/* line 280, ../sass/distribution/_index.scss */
+/* line 284, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: gray;
 }
-/* line 286, ../sass/distribution/_index.scss */
+/* line 290, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 292, ../sass/distribution/_index.scss */
+/* line 296, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 300, ../sass/distribution/_index.scss */
+/* line 304, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 302, ../sass/distribution/_index.scss */
+/* line 306, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 306, ../sass/distribution/_index.scss */
+/* line 310, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
-/* line 312, ../sass/distribution/_index.scss */
+/* line 316, ../sass/distribution/_index.scss */
 .distribution-index .modal-mask {
   position: fixed;
   z-index: 9998;
@@ -1904,12 +1908,12 @@ termes.
   display: table;
   transition: opacity .3s ease;
 }
-/* line 324, ../sass/distribution/_index.scss */
+/* line 328, ../sass/distribution/_index.scss */
 .distribution-index .modal-wrapper {
   display: table-cell;
   vertical-align: middle;
 }
-/* line 329, ../sass/distribution/_index.scss */
+/* line 333, ../sass/distribution/_index.scss */
 .distribution-index .modal-container {
   width: 70%;
   margin: 0px auto;
@@ -1920,37 +1924,37 @@ termes.
   transition: all .3s ease;
   font-family: Helvetica, Arial, sans-serif;
 }
-/* line 340, ../sass/distribution/_index.scss */
+/* line 344, ../sass/distribution/_index.scss */
 .distribution-index .modal-header {
   padding-bottom: 0px;
 }
-/* line 342, ../sass/distribution/_index.scss */
+/* line 346, ../sass/distribution/_index.scss */
 .distribution-index .modal-header h3 {
   margin-top: 0;
   color: #333;
   text-transform: uppercase;
   margin-bottom: 0px;
 }
-/* line 350, ../sass/distribution/_index.scss */
+/* line 354, ../sass/distribution/_index.scss */
 .distribution-index .modal-body {
   margin: 20px 0;
   max-height: 300px;
   height: 300px;
   overflow-y: scroll;
 }
-/* line 357, ../sass/distribution/_index.scss */
+/* line 361, ../sass/distribution/_index.scss */
 .distribution-index .modal-default-button {
   float: right;
 }
-/* line 370, ../sass/distribution/_index.scss */
+/* line 374, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter {
   opacity: 0;
 }
-/* line 374, ../sass/distribution/_index.scss */
+/* line 378, ../sass/distribution/_index.scss */
 .distribution-index .modal-leave-active {
   opacity: 0;
 }
-/* line 378, ../sass/distribution/_index.scss */
+/* line 382, ../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

@@ -237,6 +237,10 @@ termes.
                 }
             }
             
+            td.column-state-payment {
+                width: 120px ;
+            }
+            
             td.column-payment {
                 div.btn-group {
                     width: 125px ;