[Administration] Distributions > liste commandes : ajouter lien vers fiche client #1016

backend/views/distribution/index.php

@@ -353,7 +353,11 @@ $this->setPageTitle('Distributions') ;
                                             <template v-else>
                                                 {{ order.user.lastname+' '+order.user.name }}
                                             </template>
-
+                                            <span class="shortcuts btn-group" role="group">
+                                                <a class="btn btn-default btn-sm" :href="baseUrl+'/user/credit?id='+order.id_user" data-toggle="popover" data-trigger="hover" data-placement="bottom" :data-content="order.user.credit.toFixed(2)+' €'"><span class="glyphicon glyphicon-euro"></span></a>
+                                                <a class="btn btn-default btn-sm" :href="baseUrl+'/user/update?id='+order.id_user" data-toggle="popover" data-trigger="hover" data-placement="bottom" data-content="Modifier"><span class="glyphicon glyphicon-user"></span></a>
+                                                <a class="btn btn-default btn-sm" :href="baseUrl+'/user/orders?id='+order.id_user" data-toggle="popover" data-trigger="hover" data-placement="bottom" data-content="Voir les commandes"><span class="glyphicon glyphicon-eye-open"></span></a>
+                                            </span>
                                     </span>
                                     <span v-else>{{ order.username }}</span>
                                     <span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span>
@@ -462,7 +466,7 @@ $this->setPageTitle('Distributions') ;
                                                     <span :class="'info-box-icon ' +((order.user.credit > 0) ? 'bg-green' : 'bg-red')"><i class="fa fa-user"></i></span>
                                                     <div class="info-box-content">
                                                         <span class="info-box-text">Crédit utilisateur</span>
-                                                        <span class="info-box-number">{{ order.user.credit.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}</span>
+                                                        <span class="info-box-number">{{ order.user.credit.toFixed(2).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+' €' }}</span>
                                                     </div>
                                                 </div>
 

backend/web/css/screen.css

@@ -2136,10 +2136,26 @@ termes.
   text-transform: uppercase;
 }
 /* line 257, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-user {
+  position: relative;
+}
+/* line 260, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-user:hover .shortcuts {
+  display: block;
+}
+/* line 264, ../sass/distribution/_index.scss */
+.distribution-index #orders table td.column-user .shortcuts {
+  display: none;
+  float: right;
+  position: absolute;
+  top: 1px;
+  right: 1px;
+}
+/* line 273, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller {
   width: 60px;
 }
-/* line 260, ../sass/distribution/_index.scss */
+/* line 276, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller label {
   font-size: 12px;
   cursor: pointer;
@@ -2147,72 +2163,72 @@ termes.
   top: -2px;
   font-weight: normal;
 }
-/* line 269, ../sass/distribution/_index.scss */
+/* line 285, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions {
   position: relative;
   text-align: right;
 }
-/* line 273, ../sass/distribution/_index.scss */
+/* line 289, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .dropdown-menu {
   top: 0px;
   right: 0px;
 }
-/* line 278, ../sass/distribution/_index.scss */
+/* line 294, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .modal-form-order,
 .distribution-index #orders table td.column-actions .modal-payment {
   text-align: left;
 }
-/* line 283, ../sass/distribution/_index.scss */
+/* line 299, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription {
   position: relative;
 }
-/* line 286, ../sass/distribution/_index.scss */
+/* line 302, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription .glyphicon-plus {
   position: absolute;
   top: 4px;
   right: 4px;
   font-size: 7px;
 }
-/* line 295, ../sass/distribution/_index.scss */
+/* line 311, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-state-payment {
   width: 120px;
 }
-/* line 299, ../sass/distribution/_index.scss */
+/* line 315, ../sass/distribution/_index.scss */
 .distribution-index #orders table .state-payment-mobile {
   display: none;
 }
-/* line 304, ../sass/distribution/_index.scss */
+/* line 320, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment div.btn-group {
   width: 125px;
 }
-/* line 310, ../sass/distribution/_index.scss */
+/* line 326, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 320, ../sass/distribution/_index.scss */
+/* line 336, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 324, ../sass/distribution/_index.scss */
+/* line 340, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .delivery {
   margin-top: 20px;
 }
-/* line 333, ../sass/distribution/_index.scss */
+/* line 349, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container {
   width: 100%;
   padding: 0px;
 }
-/* line 337, ../sass/distribution/_index.scss */
+/* line 353, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body {
   padding-right: 15px;
 }
-/* line 340, ../sass/distribution/_index.scss */
+/* line 356, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body table {
   margin-bottom: 150px;
 }
-/* line 345, ../sass/distribution/_index.scss */
+/* line 361, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer {
   border-top-color: #f4f4f4;
   position: fixed;
@@ -2224,64 +2240,64 @@ termes.
   text-align: center;
   border-top: solid 1px #e0e0e0;
 }
-/* line 357, ../sass/distribution/_index.scss */
+/* line 373, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form button {
   float: none;
 }
-/* line 361, ../sass/distribution/_index.scss */
+/* line 377, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form div.right {
   float: right;
 }
-/* line 368, ../sass/distribution/_index.scss */
+/* line 384, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .btn-credit {
   float: right;
 }
-/* line 374, ../sass/distribution/_index.scss */
+/* line 390, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 378, ../sass/distribution/_index.scss */
+/* line 394, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input.input-quantity {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 384, ../sass/distribution/_index.scss */
+/* line 400, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price {
   width: 150px;
 }
-/* line 387, ../sass/distribution/_index.scss */
+/* line 403, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price input {
   text-align: center;
 }
-/* line 391, ../sass/distribution/_index.scss */
+/* line 407, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .input-group-addon {
   background-color: #eee;
 }
-/* line 395, ../sass/distribution/_index.scss */
+/* line 411, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .invoice-price {
   margin-top: 8px;
 }
-/* line 397, ../sass/distribution/_index.scss */
+/* line 413, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .invoice-price .label-invoice-price {
   font-size: 11px;
   font-weight: bold;
   color: gray;
 }
-/* line 405, ../sass/distribution/_index.scss */
+/* line 421, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 165px;
 }
-/* line 408, ../sass/distribution/_index.scss */
+/* line 424, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: black;
 }
-/* line 413, ../sass/distribution/_index.scss */
+/* line 429, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .form-control {
   border-right: 0px none;
   padding-right: 4px;
 }
-/* line 418, ../sass/distribution/_index.scss */
+/* line 434, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -2289,35 +2305,35 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 427, ../sass/distribution/_index.scss */
+/* line 443, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 430, ../sass/distribution/_index.scss */
+/* line 446, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.quantity-remaining, .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite {
   color: #00A65A;
 }
-/* line 434, ../sass/distribution/_index.scss */
+/* line 450, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.negative {
   color: #DD4B39;
 }
-/* line 438, ../sass/distribution/_index.scss */
+/* line 454, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite, .distribution-index .modal-form-order table.table-products td.quantity-remaining.empty {
   font-size: 18px;
 }
-/* line 445, ../sass/distribution/_index.scss */
+/* line 461, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 453, ../sass/distribution/_index.scss */
+/* line 469, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 456, ../sass/distribution/_index.scss */
+/* line 472, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 461, ../sass/distribution/_index.scss */
+/* line 477, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }

backend/web/js/backend.js

@@ -36,7 +36,7 @@
 
 $(document).ready(function () {
     opendistrib_datepicker();
-    $('button[data-toggle=popover]').popover();
+    opendistrib_popover();
     opendistrib_commandeauto();
     opendistrib_points_vente_acces();
     opendistrib_tooltip();
@@ -62,6 +62,10 @@ var UrlManager = {
     }
 };
 
+function opendistrib_popover() {
+    $('button[data-toggle=popover], a[data-toggle=popover]').popover();
+}
+
 function opendistrib_select2() {
     $('.select2').select2({
         width: 'resolve'

backend/web/js/vuejs/distribution-index.js

@@ -229,6 +229,8 @@ var app = new Vue({
                     if(app.idOrderUpdate) {
                         app.updateOrderFromUrl();
                     }
+
+                    setTimeout("opendistrib_popover();", 500);
                 }) ;
         },
         initCountActiveProducts: function() {

backend/web/sass/distribution/_index.scss

@@ -254,6 +254,22 @@ termes.
 
     table {
 
+      td.column-user {
+        position: relative;
+
+        &:hover .shortcuts {
+          display: block;
+        }
+
+        .shortcuts {
+          display: none;
+          float: right;
+          position: absolute;
+          top: 1px;
+          right: 1px;
+        }
+      }
+
       td.tiller {
         width: 60px;