Merge branch 'dev'

backend/controllers/DistributionController.php

                         // products
                         $productsArray = Product::find()
                                 ->orWhere(['id_producer' => GlobalParam::getCurrentProducerId(),])
-                                ->joinWith(['productDistribution' => function ($query) use ($distribution) {
+                                ->joinWith(['taxRate','productDistribution' => function ($query) use ($distribution) {
                                         $query->andOnCondition('product_distribution.id_distribution = ' . $distribution->id);
                                 }])
                                 ->orderBy('product_distribution.active DESC, order ASC')
                                         $potentialRevenues += $theProduct['productDistribution'][0]['quantity_max'] * $theProduct['price'];
                                         $potentialWeight += $theProduct['productDistribution'][0]['quantity_max'] * $theProduct['weight'] / 1000;
                                 }
+
+                                if(!isset($theProduct['taxRate'])) {
+                                        $theProduct['taxRate'] = $producer->taxRate ;
+                                }
                         }
 
                         $json['distribution']['potential_revenues'] = Price::format($potentialRevenues);
                                                 $productOrderArray[$productOrder->id_product] = [
                                                         'quantity' => $productOrder->quantity * Product::$unitsArray[$productOrder->unit]['coefficient'],
                                                         'unit' => $productOrder->unit,
+                                                        'price' => Price::getPriceWithTax($productOrder->price, $productOrder->taxRate->value)
                                                 ];
                                         }
 
                                                 if (!isset($productOrderArray[$product['id']])) {
                                                         $productOrderArray[$product['id']] = [
                                                                 'quantity' => 0,
-                                                                'unit' => $product['unit']
+                                                                'unit' => $product['unit'],
+                                                                'price' => Price::getPriceWithTax($product['price'], $product['taxRate']['value']),
                                                         ];
                                                 }
                                         }
                         foreach ($productsArray as $product) {
                                 $productOrderArray[$product['id']] = [
                                         'quantity' => 0,
-                                        'unit' => $product['unit']
+                                        'unit' => $product['unit'],
+                                        'price' => Price::getPriceWithTax($product['price'], $product['taxRate']['value']),
                                 ];
                         }
                         $json['order_create'] = [

backend/controllers/OrderController.php

                                         $productOrder->quantity = $quantity;
                                         $productOrder->unit = $product->unit;
                                         $productOrder->step = $product->step;
-                                        $productOrder->price = $product->price;
+                                        if($dataProductOrder->price) {
+                                                $productOrder->price = number_format(Price::getPrice($dataProductOrder->price, $product->taxRate->value), 3) ;
+                                        }
+                                        else {
+                                                $productOrder->price = $product->price;
+                                        }
                                         $productOrder->id_tax_rate = $product->taxRate->id;
                                         $productOrder->save();
                                 }
                                                         $productOrder->quantity = $quantity;
                                                         $productOrder->unit = $product->unit;
                                                         $productOrder->step = $product->step;
-                                                        $productOrder->price = $product->price;
+                                                        if($dataProductOrder->price) {
+                                                                $productOrder->price = number_format(Price::getPrice($dataProductOrder->price, $product->taxRate->value), 3) ;
+                                                        }
+                                                        else {
+                                                                $productOrder->price = $product->price;
+                                                        }
                                                         $productOrder->id_tax_rate = $product->taxRate->id;
                                                 }
                                         }

backend/models/MailForm.php

                         }
                         if($product->price) {
                             $productDescription .= ' / '.Price::format($product->getPriceWithTax()) ;
+                            $productDescription .= ' ('.Product::strUnit($product->unit, 'wording_unit').')' ;
                         }
                         
                         $messageAutoText .= '- '.$productDescription.'

backend/views/distribution/index.php

                         <tr>
                             <th></th>
                             <th>Nom</th>
+                            <th>Prix unitaire</th>
                             <th>Quantité</th>
                             <th>Reste</th>
                         </tr>
                                 <span class="label label-danger" v-else>Inactif</span>
                             </td>
                             <td>{{ product.name }}</td>
+                            <td class="price">
+                                    <div class="input-group">
+                                            <input type="text" v-model="order.productOrder[product.id].price" class="form-control" @change="productPriceChange" :data-id-product="product.id" />
+                                            <span class="input-group-addon" id="basic-addon2">€ TTC</span>
+                                    </div>
+                            </td>
                             <td class="quantity">
                                 <div class="input-group">
                                     <span class="input-group-btn">

backend/views/document/_form.php

                                         ])->hiddenInput(); ?>
                                 <?php else: ?>
                                         <?php
-                                        $usersArray = User::findBy()->all();
+                                        $usersArray = User::findBy()->orderBy('type DESC')->all();
                                         ?>
                                         <?= $form->field($model, 'id_user', [
                                                 'template' => '{label} <a href="' . Yii::$app->urlManager->createUrl(['user/create']) . '" class="btn btn-xs btn-default">Nouvel utilisateur <span class="glyphicon glyphicon-plus"></span></a><div>{input}</div>{hint}',
                                                 ->dropDownList(
                                                         ArrayHelper::map($usersArray, 'user_id', function ($model) {
                                                                 if(isset($model['name_legal_person']) && strlen($model['name_legal_person'])) {
-                                                                        return $model['name_legal_person'] ;
+                                                                        return 'Personne morale / '.$model['name_legal_person'] ;
                                                                 }
                                                                 else {
                                                                         return $model['lastname'] . ' ' . $model['name'];

backend/views/document/download.php

                                         <?php if(Yii::$app->controller->getClass() != 'DeliveryNote'): ?>
                                                 <td class="align-center"><?= Price::format($productOrder->getPrice()) ?></td>
                                         <?php endif; ?>
-                                        <td class="align-center"><?= $productOrder->quantity ?></td>
+                                        <td class="align-center"><?= $productOrder->quantity * Product::$unitsArray[$productOrder->unit]['coefficient'] ?></td>
                                         <td class="align-center"><?= Product::strUnit($productOrder->unit, 'wording') ?></td>
                                         <?php if(Yii::$app->controller->getClass() != 'DeliveryNote'): ?>
                                                 <?php if(GlobalParam::getCurrentProducer()->taxRate->value != 0): ?>

backend/views/point-sale/_form.php

                         'template' => '{label} <a href="' . Yii::$app->urlManager->createUrl(['user/create']) . '" class="btn btn-xs btn-default">Nouvel utilisateur <span class="glyphicon glyphicon-plus"></span></a><div>{input}</div>{hint}',
                 ])
                         ->dropDownList(
-                                ArrayHelper::map(User::findBy()->all(), 'user_id', function ($model) {
+                                ArrayHelper::map(User::findBy()->orderBy('type DESC')->all(), 'user_id', function ($model) {
                                         if(strlen($model['name_legal_person'])) {
-                                                return $model['name_legal_person'] ;
+                                                return 'Personne morale / '.$model['name_legal_person'] ;
                                         }
                                         else {
                                                 return $model['lastname'] . ' ' . $model['name'];

backend/web/css/screen.css

   font-weight: bold;
 }
 /* line 351, ../sass/distribution/_index.scss */
+.distribution-index .modal-form-order table.table-products td.price {
+  width: 150px;
+}
+/* line 353, ../sass/distribution/_index.scss */
+.distribution-index .modal-form-order table.table-products td.price input {
+  text-align: center;
+}
+/* line 358, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 165px;
 }
-/* line 354, ../sass/distribution/_index.scss */
+/* line 361, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: black;
 }
-/* line 359, ../sass/distribution/_index.scss */
+/* line 366, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .form-control {
   border-right: 0px none;
   padding-right: 4px;
 }
-/* line 364, ../sass/distribution/_index.scss */
+/* line 371, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 373, ../sass/distribution/_index.scss */
+/* line 380, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 376, ../sass/distribution/_index.scss */
+/* line 383, ../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 380, ../sass/distribution/_index.scss */
+/* line 387, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.negative {
   color: #DD4B39;
 }
-/* line 384, ../sass/distribution/_index.scss */
+/* line 391, ../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 391, ../sass/distribution/_index.scss */
+/* line 398, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 399, ../sass/distribution/_index.scss */
+/* line 406, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 402, ../sass/distribution/_index.scss */
+/* line 409, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 407, ../sass/distribution/_index.scss */
+/* line 414, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
     width: 50px;
     height: 52px;
   }
-  /* line 76, ../sass/_responsive.scss */
+  /* line 67, ../sass/_responsive.scss */
+  .distribution-index .modal-form-order .modal-container .modal-body table.table-products td.price {
+    display: none;
+  }
+  /* line 79, ../sass/_responsive.scss */
   .distribution-index #orders #buttons-top-orders .left {
     width: 100%;
     float: none;
   }
-  /* line 80, ../sass/_responsive.scss */
+  /* line 83, ../sass/_responsive.scss */
   .distribution-index #orders #buttons-top-orders .right {
     width: 100%;
     float: none;
   }
-  /* line 85, ../sass/_responsive.scss */
+  /* line 88, ../sass/_responsive.scss */
   .distribution-index #orders #buttons-top-orders .btn {
     padding: 8px 15px;
     margin: 10px;
     display: block;
     width: 100%;
   }
-  /* line 95, ../sass/_responsive.scss */
+  /* line 98, ../sass/_responsive.scss */
   .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li {
     float: none;
     width: 100%;
   }
-  /* line 98, ../sass/_responsive.scss */
+  /* line 101, ../sass/_responsive.scss */
   .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a {
     display: block;
   }
-  /* line 107, ../sass/_responsive.scss */
+  /* line 110, ../sass/_responsive.scss */
   .distribution-index #orders table ul.dropdown-menu a {
     padding: 15px;
   }
-  /* line 111, ../sass/_responsive.scss */
+  /* line 114, ../sass/_responsive.scss */
   .distribution-index #orders table button {
     padding: 15px;
   }
-  /* line 116, ../sass/_responsive.scss */
+  /* line 119, ../sass/_responsive.scss */
   .distribution-index #orders table .column-origin,
   .distribution-index #orders table .column-point-sale,
   .distribution-index #orders table .column-state-payment,

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

             }
             if(parseFloat(this.order.productOrder[id_product].quantity) + quantity >= 0) {
                 var theQuantity = parseFloat(this.order.productOrder[id_product].quantity) + parseFloat(quantity) ;
-                Vue.set(this.order.productOrder, id_product, {quantity: theQuantity, unit: this.order.productOrder[id_product].unit});
+                Vue.set(this.order.productOrder, id_product, {
+                    quantity: theQuantity,
+                    unit: this.order.productOrder[id_product].unit,
+                    price: this.order.productOrder[id_product].price
+                });
             }
         },
+        productPriceChange: function(event) {
+            var idProduct = event.currentTarget.getAttribute('data-id-product') ;
+            var price = parseFloat(event.currentTarget.value) ;
+            if(isNaN(price)) {
+                price = 0 ;
+            }
+
+            Vue.set(this.order.productOrder, idProduct, {
+                quantity: this.order.productOrder[idProduct].quantity,
+                unit: this.order.productOrder[idProduct].unit,
+                price: price
+            });
+        },
         userChange: function(event) {
             var app = this ;
             axios.get(UrlManager.getBaseUrlAbsolute()+"distribution/ajax-point-sale-favorite",{params: {

backend/web/sass/_responsive.scss

                                                                 height: 52px;
                                                         }
                                                 }
+                                                td.price {
+                                                        display: none ;
+                                                }
                                         }
 
                                 }

backend/web/sass/distribution/_index.scss

                                 }
                         }
 
+                        td.price {
+                                width: 150px ;
+                                input {
+                                        text-align: center ;
+                                }
+                        }
+
                         td.quantity {
                                 width: 165px;