From d4d98c9a4eca512765c20713201031bf15efd56c Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Thu, 20 Feb 2025 10:11:42 +0100
Subject: [PATCH] aa

---
 .env                                       |  2 +
 app/CustomFuncPao.php                      | 74 +++++++++++++---------
 app/Http/Controllers/ArticleController.php |  1 +
 resources/views/mylinkspao.blade.php       |  4 +-
 routes/web.php                             |  1 +
 5 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/.env b/.env
index 833f907d..ca56ef30 100644
--- a/.env
+++ b/.env
@@ -86,3 +86,5 @@ WOOCOMMERCE_CONSUMER_SECRET=cs_c21f786163f49a3853e1c4e95d46e1d0f15761cd
 WOOCOMMERCE_WP_HEADER_TOTAL=x-wp-total
 WOOCOMMERCE_WP_HEADER_TOTAL_PAGES=x-wp-totalpages
 WOOCOMMERCE_TIMEOUT=0
+
+API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK"
\ No newline at end of file
diff --git a/app/CustomFuncPao.php b/app/CustomFuncPao.php
index 5a8aeb2e..da07001e 100644
--- a/app/CustomFuncPao.php
+++ b/app/CustomFuncPao.php
@@ -429,27 +429,37 @@ function isArticleInPrevendita($id, $checkqtanegativa)
 
 
 function loadArticleByIdArticle($id, $checkprevendita = false, $checkqtanegativa = false)
-{   
+{
 
     try {
-        $articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) {
-            $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo')
-                ->on('T_WEB_Articoli.DataOra', '=', 'b.data');
-        })
-        ->leftJoin(DB::raw('(SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto FROM T_WEB_StatiProdotto e 
-                            JOIN (SELECT IdStatoProdotto, MAX(DataOra) as data1 
-                                  FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c 
-                            ON e.IdStatoProdotto = c.IdStatoProdotto AND e.DataOra = c.data1) f'), function ($join) {
-            $join->on('T_WEB_Articoli.IdStatoProdotto', '=', 'f.IdStatoProdotto');
-        })
-        ->leftJoin(DB::raw('(SELECT o.Codice, o.QtaDisponibile FROM T_WEB_Disponibile o 
-                            JOIN (SELECT Codice, MAX(DataOra) as data1 
-                                  FROM T_WEB_Disponibile GROUP BY Codice) p 
-                            ON o.Codice = p.Codice AND o.DataOra = p.data1) q'), function ($join) {
-            $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.Codice');
-        })
-        ->where('T_WEB_Articoli.IdArticolo', $id)
-        ->get();
+        if ($checkprevendita) {
+            $articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) {
+                $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo')
+                    ->on('T_WEB_Articoli.DataOra', '=', 'b.data');
+            })
+                ->leftJoin(DB::raw('(SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto FROM T_WEB_StatiProdotto e 
+                                JOIN (SELECT IdStatoProdotto, MAX(DataOra) as data1 
+                                      FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c 
+                                ON e.IdStatoProdotto = c.IdStatoProdotto AND e.DataOra = c.data1) f'), function ($join) {
+                    $join->on('T_WEB_Articoli.IdStatoProdotto', '=', 'f.IdStatoProdotto');
+                })
+                ->leftJoin(DB::raw('(SELECT o.Codice, o.QtaDisponibile FROM T_WEB_Disponibile o 
+                                JOIN (SELECT Codice, MAX(DataOra) as data1 
+                                      FROM T_WEB_Disponibile GROUP BY Codice) p 
+                                ON o.Codice = p.Codice AND o.DataOra = p.data1) q'), function ($join) {
+                    $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.Codice');
+                })
+                ->where('T_WEB_Articoli.IdArticolo', $id)
+                ->get();
+        } else {
+            $articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) {
+                $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo')
+                    ->on('T_WEB_Articoli.DataOra', '=', 'b.data');
+            })
+                ->where('T_WEB_Articoli.IdArticolo', $id)
+                ->get();
+
+        }
 
         if ($checkprevendita) {
             foreach ($articles as $article) {
@@ -2514,20 +2524,24 @@ function getClienti()
 
 function getvalstr($mystr, $value, $separato = false)
 {
-    $my = '';
-    if ($mystr) {
-        $my = " " . $mystr . ": " . $value;
-    } else {
-        if ($value) {
-            $my = $value;
-            if (!$separato) {
-                $my = " " . $value;
+    try {
+        $my = '';
+        if ($mystr) {
+            $my = " " . $mystr . ": " . $value;
+        } else {
+            if ($value) {
+                $my = $value;
+                if (!$separato) {
+                    $my = " " . $value;
+                }
             }
         }
-    }
 
-    if ($separato) {
-        $my = '[' . $my . '] ';
+        if ($separato) {
+            $my = '[' . $my . '] ';
+        }
+    } catch (Exception $e) {
+        echo "Errore: " . $e->getMessage();
     }
 
     return $my;
diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 977d44c9..d9ed9bba 100755
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -677,6 +677,7 @@ class ArticleController extends Controller
 
         return $output;
     }
+    
 
     public function showTableByName($tableName, $numrec)
     {
diff --git a/resources/views/mylinkspao.blade.php b/resources/views/mylinkspao.blade.php
index 5fea6c64..5c018487 100644
--- a/resources/views/mylinkspao.blade.php
+++ b/resources/views/mylinkspao.blade.php
@@ -60,12 +60,12 @@
         <button type="button" data-action="cartolibri">Cartolibri</button>
         <button type="button" data-action="riviste">Riviste</button>
         <button type="button" data-action="showOrdini">Mostra Ordini</button>
-        <button type="button" data-action="showOrdiniWeb">Mostra Ordini Web</button>
+        <button type="button" data-action="showOrdiniWeb">Ordini GRUPPOMACRO.com</button>
         <button type="button" data-action="showArticoliFatturatiWeb">Mostra Fatturati</button>
         <button type="button" data-action="Vendite">Vendite</button>
 
         <button type="button" data-action="showDettOrdini">Dettaglio Ordini</button>
-        <button type="button" data-action="showDettOrdiniWeb">Dettaglio Ordini Web</button>
+        <button type="button" data-action="showDettOrdiniWeb">Dettaglio Ordini MACRO</button>
     </form>
     <div>
         <a href="http://vps-88271abb.vps.ovh.net/apimacro/public/view-articles-sales" target="_blank">Vedi Articoli Venduti e Fatturati</a> - <a href="http://vps-88271abb.vps.ovh.net/apimacro/public/export-articles-sales-json" target="_blank">(Esporta)</a><br>
diff --git a/routes/web.php b/routes/web.php
index 669c48d3..902edf51 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6477,3 +6477,4 @@ Route::get('/article-test', [ArticleController::class, 'test']);
 Route::get('/view-info-articolo/{idarticolo}', [ArticleController::class, 'showInfoArticolo']);
 
 Route::get('/view-table/{tableName}/{numrec}', [ArticleController::class, 'showTableContent']);
+