From 12950c6976a83013172d461440df4330dfb8de13 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Sun, 8 Dec 2024 11:34:21 +0100
Subject: [PATCH] aa

---
 app/Http/Controllers/ArticleController.php | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index e0839af9..c64b01e0 100755
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -45,27 +45,27 @@ class ArticleController extends Controller
         ini_set("memory_limit", "512M");
         try {
             $ordini = DB::table('T_WEB_Ordini as O')
-                ->leftJoin(DB::raw('(
-        SELECT
-            CodArticoloGM,
-            MAX(DataOra) as data
-        FROM T_WEB_Articoli
-        GROUP BY CodArticoloGM
-    ) b'), 'O.CodArticoloGM', '=', 'b.IdArticolo')
-                ->join('T_WEB_Articoli as A', function ($join) {
-                    $join->on('O.CodArticoloGM', '=', 'A.IdArticolo')
-                        ->on('b.data', '=', 'A.DataOra');
-                })
-                ->select(
-                    DB::raw('ROW_NUMBER() OVER (ORDER BY O.DataOra DESC) AS progressivo'),
-                    'O.DataOra',
-                    'O.Qta',
-                    'A.Titolo',
-                    'A.Ean13'
-                )
-                ->orderBy('O.DataOra', 'desc')
-                ->take(100)
-                ->get();
+            ->leftJoin(DB::raw('(
+                SELECT
+                    IdArticolo AS CodArticoloGM,
+                    MAX(DataOra) as data
+                FROM T_WEB_Articoli
+                GROUP BY IdArticolo
+            ) b'), 'O.IdArticolo', '=', 'b.CodArticoloGM')
+            ->join('T_WEB_Articoli as A', function ($join) {
+                $join->on('O.IdArticolo', '=', 'A.IdArticolo')
+                     ->on('b.data', '=', 'A.DataOra');
+            })
+            ->select(
+                DB::raw('ROW_NUMBER() OVER (ORDER BY O.DataOra DESC) AS progressivo'),
+                'O.DataOra',
+                'O.Qta',
+                'A.Titolo',
+                'A.Ean13'
+            )
+            ->orderBy('O.DataOra', 'desc')
+            ->take(100)
+            ->get();
 
         } catch (\Exception $e) {
             // Registrazione dell'errore