From 7d6578e2103ecbc9f1458ad0ea7494b89e0b09e2 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Thu, 13 Jun 2024 09:25:54 +0200
Subject: [PATCH] aa

---
 app/CustomFuncPao.php |  6 ++++--
 routes/web.php        | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/CustomFuncPao.php b/app/CustomFuncPao.php
index d0afde4d..82fa5e81 100644
--- a/app/CustomFuncPao.php
+++ b/app/CustomFuncPao.php
@@ -254,11 +254,13 @@ function showOrdini()
         // Show the fields of the orders
         foreach ($orders as $order) {
             $str .= getvalstr("", $order->Codice);
-            $str .= getvalstr("CodGM", $order->CodArticoloGM);
+            $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("Descr:", $order->Descrizione);
+            $str .= getvalstr("Sconto", $order->PercSconto);
+            $str .= getvalstr("Descr", $order->Descrizione);
             $str .= '<br>';
 
         }
diff --git a/routes/web.php b/routes/web.php
index 8f88fcb4..d152b8cf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1860,8 +1860,19 @@ Route::get('/autori_test', function () {
     }
 });
 
-function getvalstr($mystr, $value) {
-    return " " . $mystr . ": " . $value;
+function getvalstr($mystr, $value, $separato = false) {
+    $my = '';
+    if ($mystr) {
+        $my = " " . $mystr . ": " . $value;
+    } else {
+        $my = $value;
+    }
+
+    if ($separato) {
+        $my = '[' + $my + '] ';
+    }
+
+    return $my;
 
 }