Merge branch 'dev'

backend/views/document/_download_product_line.php

@@ -20,7 +20,7 @@
 
         <?php if($displayPrices): ?>
                 <td class="align-center">
-                    <?= Price::format($price) ?>
+                    <?= Price::format($price, $documentPriceDecimals) ?>
                 </td>
         <?php endif; ?>
         <td class="align-center">

backend/views/document/_form.php

@@ -77,7 +77,7 @@ use common\models\Producer;
                             [
                                 '@change' => 'changeUser',
                                 'v-model' => 'idUser',
-                                'class' => 'select2'
+                                'class' => 'select2 select2-document-form'
                             ]
                         ); ?>
                 <?php endif; ?>
@@ -196,9 +196,11 @@ use common\models\Producer;
                 <div class="info-box-content">
                     <span class="info-box-text">Commandes</span>
                     <?php foreach($model->orders as $order): ?>
-                        <a class="btn btn-sm btn-default" href="<?= Yii::$app->urlManager->createUrl(['distribution/index', 'idOrderUpdate' => $order->id]); ?>">
-                            <?= date('d/m/Y', strtotime($order->distribution->date)) ?>
-                        </a>
+                        <?php if($order->distribution): ?>
+                            <a class="btn btn-sm btn-default" href="<?= Yii::$app->urlManager->createUrl(['distribution/index', 'idOrderUpdate' => $order->id]); ?>">
+                                <?= date('d/m/Y', strtotime($order->distribution->date)) ?>
+                            </a>
+                        <?php endif; ?>
                     <?php endforeach; ?>
                 </div>
             </div>
@@ -297,7 +299,7 @@ use common\models\Producer;
                 </div>
                 <div class="panel-body">
                     <div id="block-list-products">
-                        <table class="table table-bordered" v-if="total > 0">
+                        <table class="table table-bordered" v-if="Object.keys(ordersArray).length > 0">
                             <thead>
                             <tr>
                                 <th>Nom</th>

backend/views/document/download.php

@@ -2,6 +2,7 @@
 
 $displayPrices = Yii::$app->controller->getClass() != 'DeliveryNote' || (Yii::$app->controller->getClass() == 'DeliveryNote' && Producer::getConfig('document_display_prices_delivery_note'));
 $displayProductDescription = Producer::getConfig('document_display_product_description');
+$documentPriceDecimals = (int) Producer::getConfig('option_document_price_decimals');
 
 ?>
 
@@ -105,7 +106,8 @@ $displayProductDescription = Producer::getConfig('document_display_product_descr
                                 'productOrder' => $productOrder,
                                 'displayOrders' => true,
                                 'displayPrices' => $displayPrices,
-                                'displayProductDescription' => $displayProductDescription
+                                'displayProductDescription' => $displayProductDescription,
+                                'documentPriceDecimals' => $documentPriceDecimals
                             ]) ?>
                         <?php endforeach; ?>
                     <?php endforeach; ?>
@@ -117,7 +119,8 @@ $displayProductDescription = Producer::getConfig('document_display_product_descr
                                 'document' => $document,
                                 'productOrder' => $productOrder,
                                 'displayPrices' => $displayPrices,
-                                'displayProductDescription' => $displayProductDescription
+                                'displayProductDescription' => $displayProductDescription,
+                                'documentPriceDecimals' => $documentPriceDecimals
                             ]) ?>
                         <?php endforeach; ?>
                     <?php endforeach; ?>

backend/views/producer/update.php

@@ -463,6 +463,10 @@ $this->addBreadcrumb($this->getTitle());
                         0 => 'Non',
                         1 => 'Oui'
                     ]); ?>
+                    <?= $form->field($model, 'option_document_price_decimals')->dropDownList([
+                        2 => '2',
+                        3 => '3'
+                    ]); ?>
                     <?= $form->field($model, 'document_infos_bottom')
                         ->textarea(['rows' => 15]) ?>
                     <?= $form->field($model, 'document_infos_quotation')

backend/web/js/vuejs/document-form.js

@@ -60,9 +60,10 @@ var app = new Vue({
     methods: {
         formatPrice: formatPrice,
         init: function () {
+            var app = this;
 
             if (this.getDocumentId()) {
-                var app = this;
+
                 axios.get(UrlManager.getBaseUrlAbsolute() + "document/ajax-init", {
                     params: {
                         idDocument: this.getDocumentId(),
@@ -86,6 +87,13 @@ var app = new Vue({
                         }
                     });
             }
+            else {
+                $('.select2-document-form').on('select2:select', function (e) {
+                    var idUser = e.params.data.id;
+                    app.idUser = idUser;
+                    app.changeUser();
+                });
+            }
         },
         getProductById: function(idProduct) {
             var app = this;

common/helpers/Price.php

@@ -41,9 +41,9 @@ namespace common\helpers;
 class Price
 {
 
-        public static function format($number)
+        public static function format($number, $decimals = 2)
         {
-                return  self::numberTwoDecimals($number).' €';
+                return  self::numberTwoDecimals($number, $decimals).' €';
         }
 
         public static function round($number)
@@ -74,9 +74,9 @@ class Price
             return $vat;
         }
 
-        public static function numberTwoDecimals($number)
+        public static function numberTwoDecimals($number, $decimals = 2)
         {
-                return number_format(( ($number * 100)) / 100, 2) ;
+                return number_format(( ($number * 100)) / 100, $decimals) ;
         }
 
 }

common/models/CreditHistory.php

@@ -172,6 +172,10 @@ class CreditHistory extends ActiveRecordCommon
      */
     public function save($runValidation = true, $attributeNames = NULL) 
     {
+        if($this->amount > -0.01 && $this->amount < 0.01) {
+            return false;
+        }
+
         // initialisation du commentaire avant sauvegarde
         $this->comment .= $this->getStrComment() ;
         

common/models/Producer.php

@@ -163,7 +163,8 @@ class Producer extends ActiveRecordCommon
                                 'id_tax_rate_default',
                                 'document_quotation_duration',
                                 'option_dashboard_number_distributions',
-                                'option_online_payment_minimum_amount'
+                                'option_online_payment_minimum_amount',
+                                'option_document_price_decimals'
                         ],
                         'integer'
                 ],
@@ -401,7 +402,8 @@ class Producer extends ActiveRecordCommon
                 'latest_version_opendistrib' => 'Dernière version d\'Opendistrib',
                 'option_csv_separator' => 'Séparateur de colonnes (CSV)',
                 'option_display_message_new_opendistrib_version' => 'Afficher les messages de mise à jour du logiciel Opendistrib',
-                'option_online_payment_minimum_amount' => 'Paiement en ligne : montant minimum'
+                'option_online_payment_minimum_amount' => 'Paiement en ligne : montant minimum',
+                'option_document_price_decimals' => 'Prix : nombre de décimales affichées'
         ];
     }
 

console/migrations/m221212_143815_producer_add_option_document_price_decimals.php

@@ -0,0 +1,26 @@
+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m221212_143815_producer_add_option_document_price_decimals
+ */
+class m221212_143815_producer_add_option_document_price_decimals extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('producer', 'option_document_price_decimals', Schema::TYPE_INTEGER . ' DEFAULT 2');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('producer', 'option_document_price_decimals');
+    }
+}