From d2daff4b90ab1e38396a0555e0ba3bf47db34737 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 15 Oct 2020 18:33:06 +0200
Subject: [PATCH] Aggiunta visualizzazione riferimenti righe anche in stamp ddt

---
 include/common/articolo.php |  2 +-
 include/common/barcode.php  |  2 +-
 include/common/riga.php     |  6 +++---
 templates/ddt/body.php      | 31 +++++++++++++++++++++++--------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/include/common/articolo.php b/include/common/articolo.php
index ae641803a..cf6dec90f 100755
--- a/include/common/articolo.php
+++ b/include/common/articolo.php
@@ -232,7 +232,7 @@ function verificaPrezzoArticolo() {
     }
 
     div.css("padding-top", "5px");
-    div.html(`<small>'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo()"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
+    div.html(`<small class="label label-warning" >'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo()"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
 }
 
 /**
diff --git a/include/common/barcode.php b/include/common/barcode.php
index d68ae32ba..39ce99770 100644
--- a/include/common/barcode.php
+++ b/include/common/barcode.php
@@ -251,7 +251,7 @@ function verificaPrezzoArticolo(tr) {
     }
 
     div.css("padding-top", "5px");
-    div.html(`<small>'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo(this)"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
+    div.html(`<small class="label label-warning" >'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo(this)"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
 }
 
 /**
diff --git a/include/common/riga.php b/include/common/riga.php
index efe1e82a4..7ca8d1f27 100755
--- a/include/common/riga.php
+++ b/include/common/riga.php
@@ -74,13 +74,13 @@ if ($options['dir'] == 'entrata') {
 
             margine = isNaN(margine) || !isFinite(margine) ? 0: margine; // Fix per magine NaN
 
-            div.html("<small>'.tr('Guadagno').': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; '.tr('Margine').': " + margine.toLocale() + " %</small>");
+            div.html("<small>&nbsp;'.tr('Guadagno').': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; '.tr('Margine').': " + margine.toLocale() + " %</small>");
             if (guadagno < 0) {
                 parent.addClass("has-error");
-                div.addClass("text-danger").removeClass("text-success");
+                div.addClass("label-danger").removeClass("label-success");
             } else {
                 parent.removeClass("has-error");
-                div.removeClass("text-danger").addClass("text-success");
+                div.removeClass("label-danger").addClass("label-success");
             }
         }
 
diff --git a/templates/ddt/body.php b/templates/ddt/body.php
index f84ae61a5..0a5ca02d7 100755
--- a/templates/ddt/body.php
+++ b/templates/ddt/body.php
@@ -35,13 +35,13 @@ echo "
             <th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th>
             <th class='text-center'>".tr('Cod.', [], ['upper' => true])."</th>
             <th class='text-center'>".tr('Descrizione', [], ['upper' => true])."</th>
-            <th class='text-center' style='width:10%'>".tr('Q.tà', [], ['upper' => true]).'</th>';
+            <th class='text-center'>".tr('Q.tà', [], ['upper' => true]).'</th>';
 
 if ($options['pricing']) {
     echo "
-            <th class='text-center' style='width:15%'>".tr('Prezzo unitario', [], ['upper' => true])."</th>
-            <th class='text-center' style='width:15%'>".tr('Importo', [], ['upper' => true])."</th>
-            <th class='text-center' style='width:10%'>".tr('IVA', [], ['upper' => true]).' (%)</th>';
+            <th class='text-center'>".tr('Prezzo unitario', [], ['upper' => true])."</th>
+            <th class='text-center'>".tr('Importo', [], ['upper' => true])."</th>
+            <th class='text-center'>".tr('IVA', [], ['upper' => true]).' (%)</th>';
 }
 
             echo '
@@ -69,8 +69,10 @@ foreach ($righe as $riga) {
 
         if ($riga->isArticolo()) {
             echo $riga->codice;
+            $source_type = 'Modules\DDT\Components\Articolo';
         }else{
             echo '-';
+            $source_type = 'Modules\DDT\Components\Riga';
         }
 
     echo'
@@ -78,6 +80,19 @@ foreach ($righe as $riga) {
         
         <td>
             '.nl2br($r['descrizione']);
+    
+    //Riferimenti odrini/ddt righe
+    if (  $riga->referenceTargets()->count() ){
+       
+        $source = $source_type::find($riga->id);
+        $riferimenti = $source->referenceTargets;
+        
+        foreach ($riferimenti as $riferimento) {
+        
+            echo '
+            <br><small>'.$riferimento->target->descrizione.'<br>'.reference($riferimento->target->getDocument()).'</small>';
+        }
+    }
 
     if ($riga->isArticolo()) {
         // Codice articolo
@@ -119,14 +134,14 @@ foreach ($righe as $riga) {
 
     if (!$riga->isDescrizione()) {
         echo '
-            <td class="text-center">
+            <td class="text-center" nowrap="nowrap">
                 '.Translator::numberToLocale(abs($riga->qta), 'qta').' '.$r['um'].'
             </td>';
 
         if ($options['pricing']) {
             // Prezzo unitario
             echo '
-            <td class="text-right">
+            <td class="text-right" nowrap="nowrap">
 				'.moneyFormat($riga->prezzo_unitario);
 
             if ($riga->sconto > 0) {
@@ -143,13 +158,13 @@ foreach ($righe as $riga) {
 
             // Imponibile
             echo '
-            <td class="text-right">
+            <td class="text-right" nowrap="nowrap">
 				'.moneyFormat($riga->totale_imponibile).'
             </td>';
 
             // Iva
             echo '
-            <td class="text-center">
+            <td class="text-center" nowrap="nowrap">
                 '.Translator::numberToLocale($riga->aliquota->percentuale, 0).'
             </td>';
         }