Merge branch 'master' into dev

backend/views/distribution/index.php

@@ -263,7 +263,7 @@ $this->setPageTitle('Distributions') ;
                                         <span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à payer</span>
                                     </div>
                                 </td>
-                                <td>
+                                <td class="column-payment">
                                     <div class="btn-group" v-if="order.user">
                                         <button class="btn btn-xs btn-default" v-if="order.amount_paid == order.amount" @click="orderPaymentClick" :data-id-order="order.id" data-type="refund" :data-amount="order.amount">
                                             <span class="glyphicon glyphicon-euro"></span> Rembourser

backend/web/css/screen.css

@@ -1841,54 +1841,58 @@ termes.
   font-size: 7px;
 }
 /* line 241, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-payment div.btn-group {
+  width: 125px;
+}
+/* line 247, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 250, ../sass/distribution/_index.scss */
+/* line 256, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 261, ../sass/distribution/_index.scss */
+/* line 267, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 265, ../sass/distribution/_index.scss */
+/* line 271, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 271, ../sass/distribution/_index.scss */
+/* line 277, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 150px;
 }
-/* line 274, ../sass/distribution/_index.scss */
+/* line 280, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: gray;
 }
-/* line 280, ../sass/distribution/_index.scss */
+/* line 286, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 286, ../sass/distribution/_index.scss */
+/* line 292, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 294, ../sass/distribution/_index.scss */
+/* line 300, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 296, ../sass/distribution/_index.scss */
+/* line 302, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 300, ../sass/distribution/_index.scss */
+/* line 306, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
-/* line 306, ../sass/distribution/_index.scss */
+/* line 312, ../sass/distribution/_index.scss */
 .distribution-index .modal-mask {
   position: fixed;
   z-index: 9998;
@@ -1900,12 +1904,12 @@ termes.
   display: table;
   transition: opacity .3s ease;
 }
-/* line 318, ../sass/distribution/_index.scss */
+/* line 324, ../sass/distribution/_index.scss */
 .distribution-index .modal-wrapper {
   display: table-cell;
   vertical-align: middle;
 }
-/* line 323, ../sass/distribution/_index.scss */
+/* line 329, ../sass/distribution/_index.scss */
 .distribution-index .modal-container {
   width: 70%;
   margin: 0px auto;
@@ -1916,37 +1920,37 @@ termes.
   transition: all .3s ease;
   font-family: Helvetica, Arial, sans-serif;
 }
-/* line 334, ../sass/distribution/_index.scss */
+/* line 340, ../sass/distribution/_index.scss */
 .distribution-index .modal-header {
   padding-bottom: 0px;
 }
-/* line 336, ../sass/distribution/_index.scss */
+/* line 342, ../sass/distribution/_index.scss */
 .distribution-index .modal-header h3 {
   margin-top: 0;
   color: #333;
   text-transform: uppercase;
   margin-bottom: 0px;
 }
-/* line 344, ../sass/distribution/_index.scss */
+/* line 350, ../sass/distribution/_index.scss */
 .distribution-index .modal-body {
   margin: 20px 0;
   max-height: 300px;
   height: 300px;
   overflow-y: scroll;
 }
-/* line 351, ../sass/distribution/_index.scss */
+/* line 357, ../sass/distribution/_index.scss */
 .distribution-index .modal-default-button {
   float: right;
 }
-/* line 364, ../sass/distribution/_index.scss */
+/* line 370, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter {
   opacity: 0;
 }
-/* line 368, ../sass/distribution/_index.scss */
+/* line 374, ../sass/distribution/_index.scss */
 .distribution-index .modal-leave-active {
   opacity: 0;
 }
-/* line 372, ../sass/distribution/_index.scss */
+/* line 378, ../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,12 @@ termes.
                 }
             }
             
+            td.column-payment {
+                div.btn-group {
+                    width: 125px ;
+                }
+            }
+            
             tr.view {
                 ul {
                     list-style-type: none ;