From 796de53c5a1fa6616358a55e5a6d86eb1186688b Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 29 Jun 2018 13:35:39 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20decimali=20delle=20quantit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/articoli/plugins/articoli.movimenti.php      | 8 ++++----
 modules/articoli/widgets/articoli.dashboard.php      | 2 +-
 modules/contratti/plugins/ajax_articoli.php          | 2 +-
 modules/contratti/plugins/ajax_righe.php             | 8 ++++----
 modules/contratti/plugins/contratti.consuntivo.php   | 4 ++--
 modules/contratti/row-list.php                       | 2 +-
 modules/ddt/row-list.php                             | 4 ++--
 modules/fatture/row-list.php                         | 2 +-
 modules/interventi/ajax_articoli.php                 | 2 +-
 modules/interventi/ajax_righe.php                    | 2 +-
 modules/ordini/crea_documento.php                    | 2 +-
 modules/ordini/row-list.php                          | 4 ++--
 modules/preventivi/plugins/preventivi.consuntivo.php | 4 ++--
 modules/preventivi/row-list.php                      | 2 +-
 src/Intl/Formatter.php                               | 1 +
 src/Translator.php                                   | 8 ++++++--
 templates/contratti/body.php                         | 2 +-
 templates/contratti_cons/body.php                    | 4 ++--
 templates/ddt/body.php                               | 2 +-
 templates/fatture/body.php                           | 2 +-
 templates/interventi/body.php                        | 6 +++---
 templates/ordini/body.php                            | 2 +-
 templates/preventivi/body.php                        | 2 +-
 templates/preventivi_cons/body.php                   | 4 ++--
 24 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/modules/articoli/plugins/articoli.movimenti.php b/modules/articoli/plugins/articoli.movimenti.php
index 655526160..7765f7870 100644
--- a/modules/articoli/plugins/articoli.movimenti.php
+++ b/modules/articoli/plugins/articoli.movimenti.php
@@ -18,10 +18,10 @@ $qta_totale_attuale = $rst[0]['qta_totale_attuale'];
 
 if ($rst[0]['row'] > 0) {
     echo '
-	<p>'.tr('Quantità calcolata dai movimenti').': <b>'.Translator::numberToLocale($qta_totale).' '.$records[0]['um'].'</b> <span  class=\'tip\' title=\''.tr('Quantità calcolata da tutti i movimenti registrati').'.\' ><i class="fa fa-question-circle-o"></i></span></p>';
+	<p>'.tr('Quantità calcolata dai movimenti').': <b>'.Translator::numberToLocale($qta_totale, 'qta').' '.$records[0]['um'].'</b> <span  class=\'tip\' title=\''.tr('Quantità calcolata da tutti i movimenti registrati').'.\' ><i class="fa fa-question-circle-o"></i></span></p>';
 
     echo '
-	<p>'.tr('Quantità calcolata attuale').': <b>'.Translator::numberToLocale($qta_totale_attuale).' '.$records[0]['um'].'</b> <span  class=\'tip\' title=\''.tr('Quantità calcolata secondo i movimenti registrati con data oggi o date trascorse').'.\' ><i class="fa fa-question-circle-o"></i></span></p>';
+	<p>'.tr('Quantità calcolata attuale').': <b>'.Translator::numberToLocale($qta_totale_attuale, 'qta').' '.$records[0]['um'].'</b> <span  class=\'tip\' title=\''.tr('Quantità calcolata secondo i movimenti registrati con data oggi o date trascorse').'.\' ><i class="fa fa-question-circle-o"></i></span></p>';
 }
 
 // Elenco movimenti magazzino
@@ -53,13 +53,13 @@ if (!empty($rs2)) {
         // Quantità
         echo '
             <tr>
-                <td class="text-right">'.Translator::numberToLocale($r['qta']).' '.$records[0]['um'].'</td>';
+                <td class="text-right">'.Translator::numberToLocale($r['qta'], 'qta').' '.$records[0]['um'].'</td>';
 
         // Causale
         $dir = ($r['qta'] < 0) ? 'vendita' : 'acquisto';
 
         echo '
-                <td>'.$r['movimento'].' 
+                <td>'.$r['movimento'].'
 				'.((!empty($r['idintervento'])) ? Modules::link('Interventi', $r['idintervento']) : '').'
 				'.((!empty($r['idautomezzo'])) ? Modules::link('Automezzi', $r['idautomezzo']) : '').'
 				'.((!empty($r['iddt'])) ? Modules::link('DDt di '.$dir.'', $r['iddt']) : '').'
diff --git a/modules/articoli/widgets/articoli.dashboard.php b/modules/articoli/widgets/articoli.dashboard.php
index a52c82d57..7f8829889 100644
--- a/modules/articoli/widgets/articoli.dashboard.php
+++ b/modules/articoli/widgets/articoli.dashboard.php
@@ -19,7 +19,7 @@ if (!empty($rs)) {
             '.Modules::link('Articoli', $r['id'], $r['descrizione']).'
         </td>
         <td>
-            '.Translator::numberToLocale($r['qta'], get_var('Cifre decimali per quantità') ).' '.$r['unitamisura'].'
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['unitamisura'].'
         </td>
     </tr>';
     }
diff --git a/modules/contratti/plugins/ajax_articoli.php b/modules/contratti/plugins/ajax_articoli.php
index 81197a117..f5fc26d4f 100644
--- a/modules/contratti/plugins/ajax_articoli.php
+++ b/modules/contratti/plugins/ajax_articoli.php
@@ -82,7 +82,7 @@ if (!empty($rs)) {
         // Quantità
         echo '
         <td class="text-right">
-            '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
         </td>';
 
         if (Auth::admin() || $_SESSION['gruppo'] != 'Tecnici') {
diff --git a/modules/contratti/plugins/ajax_righe.php b/modules/contratti/plugins/ajax_righe.php
index ffe121c23..72796bab5 100644
--- a/modules/contratti/plugins/ajax_righe.php
+++ b/modules/contratti/plugins/ajax_righe.php
@@ -42,7 +42,7 @@ if (count($rs2) > 0) {
         // Quantità
         echo '
         <td class="text-right">
-            '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
         </td>';
 
         //Costo unitario
@@ -90,11 +90,11 @@ if (count($rs2) > 0) {
         if (empty($readonly)) {
             echo '
         <td>
-        
+
 			 <button type="button" class="btn btn-warning btn-xs" data-title="'.tr('Modifica spesa').'" onclick="launch_modal(\'Modifica spesa\', \''.$rootdir.'/modules/contratti/plugins/add_righe.php?id_module='.$id_module.'&id_record='.$id_record.'&idriga='.$r['id'].'\', 1, \'#bs-popup2\');" >
 			 <i class="fa fa-edit"></i></button>
-			
-			
+
+
             <button type="button" class="btn btn-danger btn-xs" data-toggle="tooltip" onclick="if(confirm(\''.tr('Eliminare questa spesa?').'\')){ elimina_riga( \''.$r['id'].'\' ); }"><i class="fa fa-trash"></i></button>
         </td>';
         }
diff --git a/modules/contratti/plugins/contratti.consuntivo.php b/modules/contratti/plugins/contratti.consuntivo.php
index e432e3293..de1e88c03 100644
--- a/modules/contratti/plugins/contratti.consuntivo.php
+++ b/modules/contratti/plugins/contratti.consuntivo.php
@@ -152,7 +152,7 @@ if (!empty($rsi)) {
                     <td>
                         '.Modules::link('Articoli', $r['idarticolo'], $r['descrizione']).(!empty($extra) ? '<small class="help-block">'.implode(', ', $extra).'</small>' : '').'
                     </td>
-                    <td class="text-right">'.Translator::numberToLocale($r['qta']).'</td>
+                    <td class="text-right">'.Translator::numberToLocale($r['qta'], 'qta').'</td>
                     <td class="text-right danger">'.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).'</td>
                     <td class="text-right success">'.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.'</td>
                 </tr>';
@@ -185,7 +185,7 @@ if (!empty($rsi)) {
                     <td>
                         '.$r['descrizione'].'
                     </td>
-                    <td class="text-right">'.Translator::numberToLocale($r['qta']).'</td>
+                    <td class="text-right">'.Translator::numberToLocale($r['qta'], 'qta').'</td>
                     <td class="text-right danger">'.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).'</td>
                     <td class="text-right success">'.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.'</td>
                 </tr>';
diff --git a/modules/contratti/row-list.php b/modules/contratti/row-list.php
index 72fcac199..08cba4bdc 100644
--- a/modules/contratti/row-list.php
+++ b/modules/contratti/row-list.php
@@ -41,7 +41,7 @@ foreach ($rs as $r) {
             <td class="text-right">';
     if (empty($r['is_descrizione'])) {
         echo '
-                '.Translator::numberToLocale($r['qta']);
+                '.Translator::numberToLocale($r['qta'], 'qta');
     }
     echo '
             </td>';
diff --git a/modules/ddt/row-list.php b/modules/ddt/row-list.php
index 0479168f8..7230aa3b7 100644
--- a/modules/ddt/row-list.php
+++ b/modules/ddt/row-list.php
@@ -82,8 +82,8 @@ if (!empty($rs)) {
         if (empty($r['is_descrizione'])) {
             if (empty($r['sconto_globale'])) {
                 echo '
-                <big>'.Translator::numberToLocale($r['qta'] - $r['qta_evasa']).'</big>
-                <br><small>('.tr('Q.tà iniziale').': '.Translator::numberToLocale($r['qta']).')</small>';
+                <big>'.Translator::numberToLocale($r['qta'] - $r['qta_evasa'], 'qta').'</big>
+                <br><small>('.tr('Q.tà iniziale').': '.Translator::numberToLocale($r['qta'], 'qta').')</small>';
             } else {
                 echo '1';
             }
diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php
index 0f545db12..e730288f8 100644
--- a/modules/fatture/row-list.php
+++ b/modules/fatture/row-list.php
@@ -108,7 +108,7 @@ if (!empty($rs)) {
 
         if (empty($r['is_descrizione'])) {
             echo '
-            '.Translator::numberToLocale($r['qta']);
+            '.Translator::numberToLocale($r['qta'], 'qta');
         }
 
         echo '
diff --git a/modules/interventi/ajax_articoli.php b/modules/interventi/ajax_articoli.php
index ada93b027..daced5cab 100644
--- a/modules/interventi/ajax_articoli.php
+++ b/modules/interventi/ajax_articoli.php
@@ -75,7 +75,7 @@ if (!empty($rs)) {
         // Quantità
         echo '
         <td class="text-right">
-            '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
         </td>';
 
         if (Auth::admin() || $_SESSION['gruppo'] != 'Tecnici') {
diff --git a/modules/interventi/ajax_righe.php b/modules/interventi/ajax_righe.php
index 6437b16ae..e1edfdd2a 100644
--- a/modules/interventi/ajax_righe.php
+++ b/modules/interventi/ajax_righe.php
@@ -42,7 +42,7 @@ if (count($rs2) > 0) {
         // Quantità
         echo '
         <td class="text-right">
-            '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
         </td>';
 
         //Costo unitario
diff --git a/modules/ordini/crea_documento.php b/modules/ordini/crea_documento.php
index 591a5035c..a921e32c7 100644
--- a/modules/ordini/crea_documento.php
+++ b/modules/ordini/crea_documento.php
@@ -111,7 +111,7 @@ if (!empty($rs)) {
         <td>
             <input type="hidden" id="qtamax_'.$i.'" value="'.($r['qta']).'" />
             <input type="hidden" id="um_'.$i.'" name="um['.$r['id'].']" value="'.$r['um'].'" />
-            <p class="text-center">'.Translator::numberToLocale($r['qta']).'</p>
+            <p class="text-center">'.Translator::numberToLocale($r['qta'], 'qta').'</p>
         </td>';
 
         // Q.tà da evadere
diff --git a/modules/ordini/row-list.php b/modules/ordini/row-list.php
index 9b875bf7e..2e5262108 100644
--- a/modules/ordini/row-list.php
+++ b/modules/ordini/row-list.php
@@ -84,8 +84,8 @@ if (!empty($rs)) {
         if (empty($r['is_descrizione'])) {
             if (empty($r['sconto_globale'])) {
                 echo '
-                <big>'.Translator::numberToLocale($r['qta'] - $r['qta_evasa']).'</big>
-                <br><small>('.tr('Q.tà iniziale').': '.Translator::numberToLocale($r['qta']).')</small>';
+                <big>'.Translator::numberToLocale($r['qta'] - $r['qta_evasa'], 'qta').'</big>
+                <br><small>('.tr('Q.tà iniziale').': '.Translator::numberToLocale($r['qta'], 'qta').')</small>';
             } else {
                 echo '1';
             }
diff --git a/modules/preventivi/plugins/preventivi.consuntivo.php b/modules/preventivi/plugins/preventivi.consuntivo.php
index dc6cc9e73..1fcfec0e2 100644
--- a/modules/preventivi/plugins/preventivi.consuntivo.php
+++ b/modules/preventivi/plugins/preventivi.consuntivo.php
@@ -154,7 +154,7 @@ if (!empty($rsi)) {
                     <td>
                         '.Modules::link('Articoli', $r['idarticolo'], $r['descrizione']).(!empty($extra) ? '<small class="help-block">'.implode(', ', $extra).'</small>' : '').'
                     </td>
-                    <td class="text-right">'.Translator::numberToLocale($r['qta']).'</td>
+                    <td class="text-right">'.Translator::numberToLocale($r['qta'], 'qta').'</td>
                     <td class="text-right danger">'.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).'</td>
                     <td class="text-right success">'.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.'</td>
                 </tr>';
@@ -187,7 +187,7 @@ if (!empty($rsi)) {
                     <td>
                         '.$r['descrizione'].'
                     </td>
-                    <td class="text-right">'.Translator::numberToLocale($r['qta']).'</td>
+                    <td class="text-right">'.Translator::numberToLocale($r['qta'], 'qta').'</td>
                     <td class="text-right danger">'.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).'</td>
                     <td class="text-right success">'.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.'</td>
                 </tr>';
diff --git a/modules/preventivi/row-list.php b/modules/preventivi/row-list.php
index 15a21b0c5..ec8c8fb27 100644
--- a/modules/preventivi/row-list.php
+++ b/modules/preventivi/row-list.php
@@ -43,7 +43,7 @@ foreach ($rs as $r) {
             <td class="text-right">';
     if (empty($r['is_descrizione'])) {
         echo '
-                '.Translator::numberToLocale($r['qta']);
+                '.Translator::numberToLocale($r['qta'], 'qta');
     }
     echo '
             </td>';
diff --git a/src/Intl/Formatter.php b/src/Intl/Formatter.php
index 43fe4281f..10f72893d 100644
--- a/src/Intl/Formatter.php
+++ b/src/Intl/Formatter.php
@@ -108,6 +108,7 @@ class Formatter
      * Converte un numero da una formattazione all'altra.
      *
      * @param string $value
+     * @param int    $decimals
      *
      * @return string|bool
      */
diff --git a/src/Translator.php b/src/Translator.php
index 9eb7f1e3d..0b788ed94 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -204,8 +204,8 @@ class Translator extends Util\Singleton
     /**
      * Converte il numero dalla formattazione inglese a quella locale.
      *
-     * @param string $string
-     * @param mixed  $decimals
+     * @param string     $string
+     * @param string|int $decimals
      *
      * @return string
      */
@@ -213,6 +213,10 @@ class Translator extends Util\Singleton
     {
         $string = !isset($string) ? 0 : $string;
 
+        if (!empty($decimals) && is_string($decimals)) {
+            $decimals = ($decimals == 'qta') ? \Settings::get('Cifre decimali per quantità') : null;
+        }
+
         return self::getFormatter()->formatNumber($string, $decimals);
     }
 
diff --git a/templates/contratti/body.php b/templates/contratti/body.php
index 7a7d62eab..10361ef30 100644
--- a/templates/contratti/body.php
+++ b/templates/contratti/body.php
@@ -109,7 +109,7 @@ foreach ($righe as $r) {
             <td class='text-center'>";
     if (empty($r['is_descrizione'])) {
         echo '
-                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'])).' '.$r['um'];
+                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'], 'qta')).' '.$r['um'];
     }
     echo '
             </td>';
diff --git a/templates/contratti_cons/body.php b/templates/contratti_cons/body.php
index 2cd0730f1..d027b9fcb 100644
--- a/templates/contratti_cons/body.php
+++ b/templates/contratti_cons/body.php
@@ -244,7 +244,7 @@ if (!empty($interventi)) {
                 // Quantità
                 echo '
             <td class="text-center">
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
             </td>';
 
                 // Prezzo unitario
@@ -381,7 +381,7 @@ if (!empty($interventi)) {
                 // Quantità
                 echo '
             <td class="text-center">
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
             </td>';
 
                 // Prezzo unitario
diff --git a/templates/ddt/body.php b/templates/ddt/body.php
index 9595e998d..7d5cd3b4c 100644
--- a/templates/ddt/body.php
+++ b/templates/ddt/body.php
@@ -97,7 +97,7 @@ foreach ($rs_gen as $r) {
         <td class="text-center">';
     if (empty($r['is_descrizione'])) {
         echo '
-            '.Translator::numberToLocale($r['qta']).' '.$r['um'];
+            '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'];
     }
     echo '
         </td>';
diff --git a/templates/fatture/body.php b/templates/fatture/body.php
index 834709478..c512ea2a1 100644
--- a/templates/fatture/body.php
+++ b/templates/fatture/body.php
@@ -102,7 +102,7 @@ foreach ($righe as $r) {
             <td class="text-center">';
     if (empty($r['is_descrizione'])) {
         echo '
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'];
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'];
     }
     echo '
             </td>';
diff --git a/templates/interventi/body.php b/templates/interventi/body.php
index f09b680cc..6d6a375c4 100644
--- a/templates/interventi/body.php
+++ b/templates/interventi/body.php
@@ -163,7 +163,7 @@ if (!empty($rs2)) {
         // Quantità
         echo '
             <td class="text-center">
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
             </td>';
 
         // Netto
@@ -242,7 +242,7 @@ if (!empty($rs2)) {
         // Quantità
         echo '
         <td class="text-center">
-            '.Translator::numberToLocale($r['qta']).'
+            '.Translator::numberToLocale($r['qta'], 'qta').'
         </td>';
 
         // Prezzo unitario
@@ -434,7 +434,7 @@ if ($options['pricing']) {
             <b>'.Translator::numberToLocale($costi_intervento['totale_addebito']).' &euro;</b>
         </th>
     </tr>';
-	
+
     //$sconto_addebito = $costi_intervento['totale_addebito'] - $costi_intervento['totale_scontato'];
 	$totale_sconto = $costi_intervento['totale_addebito'] - $costi_intervento['totale_scontato'];
     //$totale_sconto = $costi_intervento['sconto_globale'] + $sconto_addebito;
diff --git a/templates/ordini/body.php b/templates/ordini/body.php
index bafff212a..4fc6b6d59 100644
--- a/templates/ordini/body.php
+++ b/templates/ordini/body.php
@@ -76,7 +76,7 @@ foreach ($righe as $r) {
             <td class='text-center'>";
     if (empty($r['is_descrizione'])) {
         echo '
-                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'])).' '.$r['um'];
+                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'], 'qta')).' '.$r['um'];
     }
     echo '
             </td>';
diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php
index 51f81ace7..1426e89ef 100644
--- a/templates/preventivi/body.php
+++ b/templates/preventivi/body.php
@@ -110,7 +110,7 @@ foreach ($righe as $r) {
             <td class='text-center'>";
     if (empty($r['is_descrizione'])) {
         echo '
-                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'])).' '.$r['um'];
+                '.(empty($r['qta']) ? '' : Translator::numberToLocale($r['qta'], 'qta')).' '.$r['um'];
     }
     echo '
             </td>';
diff --git a/templates/preventivi_cons/body.php b/templates/preventivi_cons/body.php
index e541ee0ee..5ab39f312 100644
--- a/templates/preventivi_cons/body.php
+++ b/templates/preventivi_cons/body.php
@@ -237,7 +237,7 @@ if (!empty($interventi)) {
                 // Quantità
                 echo '
             <td class="text-center">
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
             </td>';
 
                 // Prezzo unitario
@@ -374,7 +374,7 @@ if (!empty($interventi)) {
                 // Quantità
                 echo '
             <td class="text-center">
-                '.Translator::numberToLocale($r['qta']).' '.$r['um'].'
+                '.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].'
             </td>';
 
                 // Prezzo unitario