Merge branch 'dev'

backend/controllers/DocumentController.php

@@ -374,6 +374,11 @@ class DocumentController extends BackendController
                                                                 'user_producer' => $userProducer,
                                                                 'point_sale' => $pointSale,
                                                         ]),
+                                                        'price' => $product->getPrice([
+                                                                 'user' => $document->user,
+                                                                 'user_producer' => $userProducer,
+                                                                 'point_sale' => $pointSale,
+                                                        ]),
                                                         'wording_unit' => $product->wording_unit,
                                                         'tax_rate' => $product->taxRate->value
                                                 ]);

backend/views/document/_form.php

@@ -178,7 +178,7 @@ use common\models\Producer;
                                         Ajouter un produit
                                 </div>
                                 <div class="panel-body">
-                                        <div class="col-md-3">
+                                        <div class="col-md-6">
                                                 <strong>Produit</strong>
                                                 <select class="form-control" v-model="productAddId"
                                                         @change="changeProductAdd">
@@ -198,7 +198,7 @@ use common\models\Producer;
                                                                             class="glyphicon glyphicon-euro"></span> <span v-if="taxRateProducer != 0">HT</span></span>
                                                         </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3 total">
                                                         <strong>Quantité</strong>
                                                         <div class="input-group input-group-quantity">
                                                                 <span class="input-group-btn">
@@ -214,8 +214,12 @@ use common\models\Producer;
                                                                                     @click="changeQuantityProductAdd(1)">+</button>
                                                                 </span>
                                                         </div>
+                                                        <button class="btn btn-primary" value="Ajouter"
+                                                                @click="submitProductAdd">Ajouter
+                                                        </button>
+                                                        <div class="clr"></div>
                                                 </div>
-                                                <div class="col-md-3 total">
+                                                <!--<div class="col-md-3 total">
                                                         <strong>Total</strong>
                                                         <div class="input-group">
                                                                 <input type="text" class="form-control input-price" readonly
@@ -223,11 +227,7 @@ use common\models\Producer;
                                                                 <span class="input-group-addon"><span
                                                                             class="glyphicon glyphicon-euro"></span> <span v-if="taxRateProducer != 0">HT</span></span>
                                                         </div>
-                                                        <button class="btn btn-primary" value="Ajouter"
-                                                                @click="submitProductAdd">Ajouter
-                                                        </button>
-                                                        <div class="clr"></div>
-                                                </div>
+                                                </div>-->
                                         </template>
                                         <div class="clr"></div>
                                 </div>