aa

.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"

app/CustomFuncPao.php

@@ -432,6 +432,7 @@ function loadArticleByIdArticle($id, $checkprevendita = false, $checkqtanegativa
 {
 
     try {
+        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');
@@ -450,6 +451,15 @@ function loadArticleByIdArticle($id, $checkprevendita = false, $checkqtanegativa
                 })
                 ->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,6 +2524,7 @@ function getClienti()
 
 function getvalstr($mystr, $value, $separato = false)
 {
+    try {
         $my = '';
         if ($mystr) {
             $my = " " . $mystr . ": " . $value;
@@ -2529,6 +2540,9 @@ function getvalstr($mystr, $value, $separato = false)
         if ($separato) {
             $my = '[' . $my . '] ';
         }
+    } catch (Exception $e) {
+        echo "Errore: " . $e->getMessage();
+    }
 
     return $my;
 }

app/Http/Controllers/ArticleController.php

@@ -678,6 +678,7 @@ class ArticleController extends Controller
         return $output;
     }
     
+
     public function showTableByName($tableName, $numrec)
     {
 

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>

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']);
+