From 1a11c06c7d4e0a4fc8235f542ae30f2c7746e342 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Thu, 13 Jun 2024 09:31:34 +0200
Subject: [PATCH] aa

---
 app/CustomFuncPao.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/CustomFuncPao.php b/app/CustomFuncPao.php
index b2d74456..33f44e7f 100644
--- a/app/CustomFuncPao.php
+++ b/app/CustomFuncPao.php
@@ -240,7 +240,7 @@ function loadArticleByIdArticle($id, $checkprevendita = false)
 
 function showOrdini()
 {
-    $str = "Ordini";
+    $str = "";
 
 
     try {
@@ -254,13 +254,15 @@ function showOrdini()
         // Show the fields of the orders
         foreach ($orders as $order) {
             $str .= getvalstr("", $order->Codice) . " ";
+            $str .= getvalstr("", $order->DataOra);
             $str .= getvalstr("IdInternet", $order->IdInternet, true). " ";
             $str .= getvalstr("", $order->CodArticoloGM, true);
             $str .= getvalstr("Qta", $order->Qta);
-            $str .= getvalstr("", $order->DataOra);
             $str .= getvalstr("Prezzo", $order->PrezzoLordo);
-            $str .= getvalstr("Sconto", $order->PercSconto);
-            $str .= getvalstr("Descr", $order->Descrizione);
+            if ($order->PercSconto)
+                $str .= getvalstr("Sconto", $order->PercSconto);
+            if ($order->Descrizione)
+                $str .= getvalstr("Descr", $order->Descrizione);
             $str .= '<br>';
 
         }