From 31d21b361bd5a7ce5bdb377e9f3fe373bd2ae26b Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Mon, 14 Apr 2025 10:11:35 +0200
Subject: [PATCH] view-articles

---
 app/Http/Controllers/ArticleController.php      |  1 +
 resources/views/export_articles_sales.blade.php | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 3c09fe7a..d2e6b1fe 100755
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -275,6 +275,7 @@ class ArticleController extends Controller
                     DB::raw('COALESCE(u.totFat, 0) as totFat'),
                     DB::raw('COALESCE(p.venduti3mesi, 0) as venduti3mesi'),
                     DB::raw('COALESCE(t.fat3mesi, 0) as fat3mesi'),
+                    DB::raw('COALESCE(t.fat6mesi, 0) as fat6mesi'),
                     DB::raw('COALESCE(p.rank3M, 0) as rank3M'),
                     DB::raw('COALESCE(t.fatrank3M, 0) as fatrank3M'),
                     DB::raw('COALESCE(t2.fatrank6M, 0) as fatrank6M'),
diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php
index a5e26729..713ff422 100644
--- a/resources/views/export_articles_sales.blade.php
+++ b/resources/views/export_articles_sales.blade.php
@@ -21,7 +21,6 @@
                     <th>ISBN</th>
                     <th>Collana</th>
                     <th>Argomento</th>
-                    <th>ListaArgomenti</th>
                     <th>Pagine</th>
                     <th>Misure</th>
                     <th>Rank 3 M</th>
@@ -32,6 +31,7 @@
                     <th>Ult 3 Mese</th>
                     <th>Tot Fatt</th>
                     <th>Fatt 3 Mesi</th>
+                    <th>Fatt 6 Mesi</th>
                     <th>Ult 6 Mesi</th>
                     <th>Ult Anno</th>
 
@@ -87,7 +87,9 @@
                                 @endif
                                 </td>
 
-                                <td>@if (isset($articolo->ultimoOrdine)){{ \Carbon\Carbon::parse($articolo->ultimoOrdine)->format('d/m/Y') }}@endif
+                                <td>@if (isset($articolo->ultimoOrdine))
+                                    {{ \Carbon\Carbon::parse($articolo->ultimoOrdine)->format('d/m/Y') }}
+                                @endif
                                 </td>
 
 
@@ -109,6 +111,10 @@
                                     Fatt 3M: {{ $articolo->fat3mesi }}
                                 @endif
                                 </td>
+                                <td>@if (isset($articolo->fat6mesi))
+                                    Fatt 3M: {{ $articolo->fat6mesi }}
+                                @endif
+                                </td>
                                 <td>@if (isset($articolo->venduti6mesi))
                                     {{ $articolo->venduti6mesi }}
                                 @endif
@@ -125,4 +131,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>