Merge branch 'develop'

backend/controllers/DistributionController.php

@@ -107,8 +107,6 @@ class DistributionController extends BackendController
         $distributionModule = $this-> getDistributionModule();
         $orderModule = $this->getOrderModule();
         $productModule = $this->getProductModule();
-        $userModule = $this->getUserModule();
-        $producerModule = $this->getProducerModule();
 
         $producer = $this->getProducerCurrent();
         $dateObject = DateTime::createFromFormat('Y-m-d', $date);

backend/views/distribution/index.php

@@ -756,12 +756,17 @@ $this->setPageTitle('Distributions') ;
                                 </div>
                             </td>
                             <td class="quantity-remaining">
-                                <span class="infinite" v-if="(getProductQuantityRemaining(order, product) === null) || order.productOrder[product.id].unit != product.unit">&infin;</span>
-                                <span class="negative" v-else-if="getProductQuantityRemaining(order, product) <= 0">
+                                <template v-if="loadingUpdateProductOrder">
+                                    --
+                                </template>
+                                <template v-else>
+                                    <span class="infinite" v-if="(getProductQuantityRemaining(order, product) === null) || order.productOrder[product.id].unit != product.unit">&infin;</span>
+                                    <span class="negative" v-else-if="getProductQuantityRemaining(order, product) <= 0">
                                     {{ getProductQuantityRemaining(order, product) }} {{ labelUnitReference(order.productOrder[product.id].unit) }}
                                     <span class="glyphicon glyphicon-alert" v-if="getProductQuantityRemaining(order, product) < 0"></span>
                                 </span>
-                                <span class="has-quantity" v-else>{{ getProductQuantityRemaining(order, product) }} {{ labelUnitReference(order.productOrder[product.id].unit) }}</span>
+                                    <span class="has-quantity" v-else>{{ getProductQuantityRemaining(order, product) }} {{ labelUnitReference(order.productOrder[product.id].unit) }}</span>
+                                </template>
                             </td>
                         </tr>
                     </tbody>

backend/web/css/screen.css

@@ -2403,133 +2403,134 @@ termes.
 /* line 96, ../sass/distribution/_index.scss */
 .distribution-index table td.quantity-remaining {
   text-align: right;
+  width: 75px;
 }
-/* line 99, ../sass/distribution/_index.scss */
+/* line 100, ../sass/distribution/_index.scss */
 .distribution-index table td.quantity-remaining .has-quantity, .distribution-index table td.quantity-remaining .infinite {
   color: #00A65A;
 }
-/* line 103, ../sass/distribution/_index.scss */
+/* line 104, ../sass/distribution/_index.scss */
 .distribution-index table td.quantity-remaining .negative {
   color: #DD4B39;
 }
-/* line 107, ../sass/distribution/_index.scss */
+/* line 108, ../sass/distribution/_index.scss */
 .distribution-index table td.quantity-remaining .infinite, .distribution-index table td.quantity-remaining .empty {
   font-size: 18px;
 }
-/* line 113, ../sass/distribution/_index.scss */
+/* line 114, ../sass/distribution/_index.scss */
 .distribution-index #products td.quantities {
   width: 100px;
   text-align: right;
 }
-/* line 118, ../sass/distribution/_index.scss */
+/* line 119, ../sass/distribution/_index.scss */
 .distribution-index #products input.quantity-max {
   width: 50px;
   text-align: center;
   display: inline;
 }
-/* line 126, ../sass/distribution/_index.scss */
+/* line 127, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .col-md-4 {
   padding: 0px;
 }
-/* line 132, ../sass/distribution/_index.scss */
+/* line 133, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box {
   min-height: 96px;
   height: 96px;
 }
-/* line 136, ../sass/distribution/_index.scss */
+/* line 137, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-icon {
   height: 96px;
   width: 50px;
   line-height: 96px;
 }
-/* line 141, ../sass/distribution/_index.scss */
+/* line 142, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-icon i.fa {
   font-size: 30px;
 }
-/* line 146, ../sass/distribution/_index.scss */
+/* line 147, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-content {
   margin-left: 55px;
 }
-/* line 149, ../sass/distribution/_index.scss */
+/* line 150, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-content .info-box-text {
   font-size: 12px;
 }
-/* line 152, ../sass/distribution/_index.scss */
+/* line 153, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-content .info-box-text .btn {
   font-size: 12px;
   text-transform: uppercase;
 }
-/* line 158, ../sass/distribution/_index.scss */
+/* line 159, ../sass/distribution/_index.scss */
 .distribution-index #infos-top .info-box .info-box-content .info-box-number {
   font-size: 14px;
 }
-/* line 165, ../sass/distribution/_index.scss */
+/* line 166, ../sass/distribution/_index.scss */
 .distribution-index #infos-top #info-box-distribution .btn-active-week {
   float: right;
 }
-/* line 171, ../sass/distribution/_index.scss */
+/* line 172, ../sass/distribution/_index.scss */
 .distribution-index #infos-top #summary-ca-weight .normal {
   font-weight: normal;
 }
-/* line 181, ../sass/distribution/_index.scss */
+/* line 182, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table thead tr td {
   font-weight: bold;
 }
-/* line 187, ../sass/distribution/_index.scss */
+/* line 188, ../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 192, ../sass/distribution/_index.scss */
+/* line 193, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-ordered {
   width: 50px;
 }
-/* line 196, ../sass/distribution/_index.scss */
+/* line 197, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max {
   width: 120px;
 }
-/* line 199, ../sass/distribution/_index.scss */
+/* line 200, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max input {
   text-align: center;
   min-width: 50px;
 }
-/* line 204, ../sass/distribution/_index.scss */
+/* line 205, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max .limit-quantity-accessories {
   margin-top: 7px;
   font-size: 12px;
 }
-/* line 208, ../sass/distribution/_index.scss */
+/* line 209, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max .limit-quantity-accessories .quantity {
   font-weight: bold;
 }
-/* line 216, ../sass/distribution/_index.scss */
+/* line 217, ../sass/distribution/_index.scss */
 .distribution-index #orders {
   position: relative;
 }
-/* line 221, ../sass/distribution/_index.scss */
+/* line 222, ../sass/distribution/_index.scss */
 .distribution-index #orders .panel-heading .buttons .btn {
   position: relative;
   top: -19px;
   float: right;
   margin-left: 10px;
 }
-/* line 230, ../sass/distribution/_index.scss */
+/* line 231, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale {
   margin-bottom: 10px;
 }
-/* line 233, ../sass/distribution/_index.scss */
+/* line 234, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale {
   margin: 0px;
   padding: 0px;
   list-style-type: none;
 }
-/* line 238, ../sass/distribution/_index.scss */
+/* line 239, ../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 244, ../sass/distribution/_index.scss */
+/* line 245, ../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;
@@ -2537,7 +2538,7 @@ termes.
   -webkit-border-radius: 10px;
   border-radius: 10px;
 }
-/* line 255, ../sass/distribution/_index.scss */
+/* line 256, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders {
   background-color: #F5F5F5;
   padding: 10px 20px;
@@ -2547,15 +2548,15 @@ termes.
   border-radius: 5px;
   margin-bottom: 20px;
 }
-/* line 266, ../sass/distribution/_index.scss */
+/* line 267, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders .right {
   float: right;
 }
-/* line 270, ../sass/distribution/_index.scss */
+/* line 271, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders .dropdown {
   display: inline-block;
 }
-/* line 275, ../sass/distribution/_index.scss */
+/* line 276, ../sass/distribution/_index.scss */
 .distribution-index #orders .point-sale-totals {
   background-color: white;
   padding: 10px 20px;
@@ -2565,30 +2566,30 @@ termes.
   border-radius: 5px;
   margin-bottom: 20px;
 }
-/* line 282, ../sass/distribution/_index.scss */
+/* line 283, ../sass/distribution/_index.scss */
 .distribution-index #orders .point-sale-totals .title {
   color: gray;
   font-size: 13px;
   margin-right: 13px;
   text-transform: uppercase;
 }
-/* line 292, ../sass/distribution/_index.scss */
+/* line 293, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user {
   position: relative;
 }
-/* line 295, ../sass/distribution/_index.scss */
+/* line 296, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user:hover .shortcuts {
   display: block;
 }
-/* line 299, ../sass/distribution/_index.scss */
+/* line 300, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user a {
   color: #333;
 }
-/* line 302, ../sass/distribution/_index.scss */
+/* line 303, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user a:hover {
   text-decoration: underline;
 }
-/* line 307, ../sass/distribution/_index.scss */
+/* line 308, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user .shortcuts {
   display: none;
   float: right;
@@ -2596,19 +2597,19 @@ termes.
   top: 1px;
   right: 1px;
 }
-/* line 315, ../sass/distribution/_index.scss */
+/* line 316, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-user .user-trust-alert {
   color: red;
 }
-/* line 320, ../sass/distribution/_index.scss */
+/* line 321, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-delivery-note {
   position: relative;
 }
-/* line 324, ../sass/distribution/_index.scss */
+/* line 325, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller {
   width: 60px;
 }
-/* line 327, ../sass/distribution/_index.scss */
+/* line 328, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller label {
   font-size: 12px;
   cursor: pointer;
@@ -2616,88 +2617,88 @@ termes.
   top: -2px;
   font-weight: normal;
 }
-/* line 336, ../sass/distribution/_index.scss */
+/* line 337, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions {
   position: relative;
   text-align: right;
 }
-/* line 340, ../sass/distribution/_index.scss */
+/* line 341, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .wrapper-button-dropdown {
   display: inline-block;
 }
-/* line 344, ../sass/distribution/_index.scss */
+/* line 345, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .dropdown-menu {
   left: -70px;
   width: 227px;
 }
-/* line 349, ../sass/distribution/_index.scss */
+/* line 350, ../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 354, ../sass/distribution/_index.scss */
+/* line 355, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription {
   position: relative;
 }
-/* line 357, ../sass/distribution/_index.scss */
+/* line 358, ../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 366, ../sass/distribution/_index.scss */
+/* line 367, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-state-payment {
   width: 133px;
 }
-/* line 372, ../sass/distribution/_index.scss */
+/* line 373, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-credit a.positive {
   color: green;
 }
-/* line 375, ../sass/distribution/_index.scss */
+/* line 376, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-credit a.negative {
   color: red;
 }
-/* line 381, ../sass/distribution/_index.scss */
+/* line 382, ../sass/distribution/_index.scss */
 .distribution-index #orders table .state-payment-mobile {
   display: none;
 }
-/* line 385, ../sass/distribution/_index.scss */
+/* line 386, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment {
   position: relative;
 }
-/* line 388, ../sass/distribution/_index.scss */
+/* line 389, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment div.btn-group {
   width: 125px;
 }
-/* line 394, ../sass/distribution/_index.scss */
+/* line 395, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 404, ../sass/distribution/_index.scss */
+/* line 405, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 408, ../sass/distribution/_index.scss */
+/* line 409, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .delivery {
   margin-top: 20px;
 }
-/* line 417, ../sass/distribution/_index.scss */
+/* line 418, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container {
   width: 100%;
   padding: 0px;
 }
-/* line 421, ../sass/distribution/_index.scss */
+/* line 422, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body {
   padding-right: 15px;
 }
-/* line 424, ../sass/distribution/_index.scss */
+/* line 425, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body table {
   margin-bottom: 150px;
 }
-/* line 429, ../sass/distribution/_index.scss */
+/* line 430, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer {
   border-top-color: #f4f4f4;
   position: fixed;
@@ -2709,64 +2710,64 @@ termes.
   text-align: center;
   border-top: solid 1px #e0e0e0;
 }
-/* line 441, ../sass/distribution/_index.scss */
+/* line 442, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form button {
   float: none;
 }
-/* line 445, ../sass/distribution/_index.scss */
+/* line 446, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form div.right {
   float: right;
 }
-/* line 452, ../sass/distribution/_index.scss */
+/* line 453, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .btn-credit {
   float: right;
 }
-/* line 458, ../sass/distribution/_index.scss */
+/* line 459, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 462, ../sass/distribution/_index.scss */
+/* line 463, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input.input-quantity {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 468, ../sass/distribution/_index.scss */
+/* line 469, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price {
   width: 150px;
 }
-/* line 471, ../sass/distribution/_index.scss */
+/* line 472, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price input {
   text-align: center;
 }
-/* line 475, ../sass/distribution/_index.scss */
+/* line 476, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .input-group-addon {
   background-color: #eee;
 }
-/* line 479, ../sass/distribution/_index.scss */
+/* line 480, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price .invoice-price {
   margin-top: 8px;
 }
-/* line 481, ../sass/distribution/_index.scss */
+/* line 482, ../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 489, ../sass/distribution/_index.scss */
+/* line 490, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 165px;
 }
-/* line 492, ../sass/distribution/_index.scss */
+/* line 493, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: black;
 }
-/* line 497, ../sass/distribution/_index.scss */
+/* line 498, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .form-control {
   border-right: 0px none;
   padding-right: 4px;
 }
-/* line 502, ../sass/distribution/_index.scss */
+/* line 503, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -2774,19 +2775,19 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 513, ../sass/distribution/_index.scss */
+/* line 514, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 521, ../sass/distribution/_index.scss */
+/* line 522, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 524, ../sass/distribution/_index.scss */
+/* line 525, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 529, ../sass/distribution/_index.scss */
+/* line 530, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }

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

@@ -878,7 +878,6 @@ if($(selector).length) {
                 }
 
                 if (order) {
-
                     if (app.timerAjaxUpdateProductOrder) {
                         clearTimeout(app.timerAjaxUpdateProductOrder);
                     }

backend/web/sass/distribution/_index.scss

@@ -95,6 +95,7 @@ termes.
 
   table td.quantity-remaining {
     text-align: right;
+    width: 75px;
 
     .has-quantity, .infinite {
       color: #00A65A;