Distributions : problème data bloc ca / poids

backend/views/distribution/index.php

@@ -163,13 +163,13 @@ $this->setPageTitle('Distributions') ;
                     </modal>
                     
                     <div class="col-md-6">
-                        <div class="info-box col-md-4">
+                        <div id="summary-ca-weight" class="info-box col-md-4">
                             <span class="info-box-icon bg-yellow"><i class="fa fa-euro"></i></span>
                             <div class="info-box-content">
-                                <span class="info-box-text">Commandé</span>
-                                <span class="info-box-number">{{ distribution.revenues }} € / {{ distribution.weight }} kg</span>
-                                <span class="info-box-text">Potentiel</span>
-                                <span class="info-box-number">{{ distribution.potential_revenues }} € / {{ distribution.potential_weight }} kg</span>
+                                <span class="info-box-text">CA</span>
+                                <span class="info-box-number">{{ distribution.revenues }} € <span class="normal">/ {{ distribution.potential_revenues }} €</span></span>
+                                <span class="info-box-text">Poids</span>
+                                <span class="info-box-number">{{ distribution.weight }} kg <span class="normal">/ {{ distribution.potential_weight }} kg</span></span>
                             </div>
                         </div>
                     </div>

backend/web/css/screen.css

@@ -1706,56 +1706,60 @@ termes.
 .distribution-index #infos-top #info-box-distribution .btn-active-week {
   float: right;
 }
-/* line 148, ../sass/distribution/_index.scss */
+/* line 144, ../sass/distribution/_index.scss */
+.distribution-index #infos-top #summary-ca-weight .normal {
+  font-weight: normal;
+}
+/* line 154, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table thead tr td {
   font-weight: bold;
 }
-/* line 153, ../sass/distribution/_index.scss */
+/* line 159, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-ordered,
 .distribution-index #modal-products table.table td.quantity-max {
   text-align: center;
 }
-/* line 158, ../sass/distribution/_index.scss */
+/* line 164, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-ordered {
   width: 50px;
 }
-/* line 161, ../sass/distribution/_index.scss */
+/* line 167, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max {
   width: 70px;
 }
-/* line 164, ../sass/distribution/_index.scss */
+/* line 170, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max input {
   text-align: center;
 }
-/* line 172, ../sass/distribution/_index.scss */
+/* line 178, ../sass/distribution/_index.scss */
 .distribution-index #orders #btn-add-order {
   float: right;
 }
-/* line 176, ../sass/distribution/_index.scss */
+/* line 182, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale {
   margin-bottom: 10px;
 }
-/* line 179, ../sass/distribution/_index.scss */
+/* line 185, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale {
   margin: 0px;
   padding: 0px;
   list-style-type: none;
 }
-/* line 184, ../sass/distribution/_index.scss */
+/* line 190, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li {
   float: left;
   margin-right: 10px;
   margin-bottom: 10px;
 }
-/* line 189, ../sass/distribution/_index.scss */
+/* line 195, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a {
   position: relative;
 }
-/* line 193, ../sass/distribution/_index.scss */
+/* line 199, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a.btn-primary .glyphicon {
   display: block;
 }
-/* line 198, ../sass/distribution/_index.scss */
+/* line 204, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a .glyphicon {
   display: none;
   position: absolute;
@@ -1766,7 +1770,7 @@ termes.
   color: #FF7F00;
   position: absolute;
 }
-/* line 209, ../sass/distribution/_index.scss */
+/* line 215, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a .label {
   background-color: white;
   border: solid 1px #e0e0e0;
@@ -1774,57 +1778,57 @@ termes.
   -webkit-border-radius: 10px;
   border-radius: 10px;
 }
-/* line 222, ../sass/distribution/_index.scss */
+/* line 228, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions {
   text-align: right;
   width: 200px;
 }
-/* line 226, ../sass/distribution/_index.scss */
+/* line 232, ../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 233, ../sass/distribution/_index.scss */
+/* line 239, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 249, ../sass/distribution/_index.scss */
+/* line 255, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 253, ../sass/distribution/_index.scss */
+/* line 259, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 259, ../sass/distribution/_index.scss */
+/* line 265, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 150px;
 }
-/* line 262, ../sass/distribution/_index.scss */
+/* line 268, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: gray;
 }
-/* line 268, ../sass/distribution/_index.scss */
+/* line 274, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 276, ../sass/distribution/_index.scss */
+/* line 282, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 278, ../sass/distribution/_index.scss */
+/* line 284, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 282, ../sass/distribution/_index.scss */
+/* line 288, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
-/* line 288, ../sass/distribution/_index.scss */
+/* line 294, ../sass/distribution/_index.scss */
 .distribution-index .modal-mask {
   position: fixed;
   z-index: 9998;
@@ -1836,12 +1840,12 @@ termes.
   display: table;
   transition: opacity .3s ease;
 }
-/* line 300, ../sass/distribution/_index.scss */
+/* line 306, ../sass/distribution/_index.scss */
 .distribution-index .modal-wrapper {
   display: table-cell;
   vertical-align: middle;
 }
-/* line 305, ../sass/distribution/_index.scss */
+/* line 311, ../sass/distribution/_index.scss */
 .distribution-index .modal-container {
   width: 70%;
   margin: 0px auto;
@@ -1852,37 +1856,37 @@ termes.
   transition: all .3s ease;
   font-family: Helvetica, Arial, sans-serif;
 }
-/* line 316, ../sass/distribution/_index.scss */
+/* line 322, ../sass/distribution/_index.scss */
 .distribution-index .modal-header {
   padding-bottom: 0px;
 }
-/* line 318, ../sass/distribution/_index.scss */
+/* line 324, ../sass/distribution/_index.scss */
 .distribution-index .modal-header h3 {
   margin-top: 0;
   color: #333;
   text-transform: uppercase;
   margin-bottom: 0px;
 }
-/* line 326, ../sass/distribution/_index.scss */
+/* line 332, ../sass/distribution/_index.scss */
 .distribution-index .modal-body {
   margin: 20px 0;
   max-height: 300px;
   height: 300px;
   overflow-y: scroll;
 }
-/* line 333, ../sass/distribution/_index.scss */
+/* line 339, ../sass/distribution/_index.scss */
 .distribution-index .modal-default-button {
   float: right;
 }
-/* line 346, ../sass/distribution/_index.scss */
+/* line 352, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter {
   opacity: 0;
 }
-/* line 350, ../sass/distribution/_index.scss */
+/* line 356, ../sass/distribution/_index.scss */
 .distribution-index .modal-leave-active {
   opacity: 0;
 }
-/* line 354, ../sass/distribution/_index.scss */
+/* line 360, ../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

@@ -139,6 +139,12 @@ termes.
                 float: right ;
             }
         }
+        
+        #summary-ca-weight {
+            .normal {
+                font-weight: normal ;
+            }
+        }
     }
     
     #modal-products {