From c05cf28ca929314279197acdc92c670b923f47f0 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Sat, 7 Dec 2024 15:28:56 +0100
Subject: [PATCH] modif

---
 app/Http/Controllers/ArticleController.php    |  9 +++--
 .../views/export_articles_sales.blade.php     | 35 +++++++++++++------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 085f1d1c..8ab80dd8 100755
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -35,7 +35,7 @@ class ArticleController extends Controller
                     T_WEB_Articoli.misure as misure,
                     T_WEB_Articoli.Ean13, 
                     T_WEB_Articoli.Pagine as Pagine, 
-                    SUM(T_WEB_Ordini.qta) as totaleVenduto, 
+                    SUM(T_WEB_Ordini.Qta) as totaleVenduto, 
                     SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -1, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as totaleVendutoUltimoMese,
                     SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -6, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as totaleVendutoUltimi6Mesi,
                     SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(year, -1, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as totaleVendutoUltimoAnno,
@@ -43,7 +43,10 @@ class ArticleController extends Controller
                     MAX(T_WEB_Ordini.DataOra) AS ultimoOrdine,
                     RANK() OVER (ORDER BY SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -3, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) DESC) as rank3M,
                     RANK() OVER (ORDER BY SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -6, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) DESC) as rank6M,
-                    RANK() OVER (ORDER BY SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(year, -1, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) DESC) as rank1Y
+                    RANK() OVER (ORDER BY SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(year, -1, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) DESC) as rank1Y,
+                    SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -3, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as vendite3M,
+                    SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(month, -6, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as vendite6M,
+                    SUM(CASE WHEN T_WEB_Ordini.DataOra >= DATEADD(year, -1, GETDATE()) THEN T_WEB_Ordini.qta ELSE 0 END) as vendite1Y,
                 ')
                 // ->groupBy('T_WEB_Articoli.idArticolo', 'T_WEB_Articoli.Titolo', 'T_WEB_Articoli.Ean13')
                 ->groupBy('T_WEB_Articoli.idArticolo', 'T_WEB_Articoli.Titolo', 'T_WEB_Articoli.Ean13', 'T_WEB_Articoli.DataPubblicazione', 'Pagine', 'IdTipoFormato', 'misure')
@@ -145,7 +148,7 @@ class ArticleController extends Controller
         }
     }
 
-       public function test(Request $request)
+    public function test(Request $request)
     {
         try {
 
diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php
index ba3ab892..feb4cf07 100644
--- a/resources/views/export_articles_sales.blade.php
+++ b/resources/views/export_articles_sales.blade.php
@@ -16,20 +16,23 @@
                 <tr>
                     <th>Id Articolo</th>
                     <th>Titolo</th>
-                    <th>Data Pubblicazione</th>
+                    <th>Data Pubbl</th>
                     <th>ISBN</th>
                     <th>Pagine</th>
                     <th>Formato</th>
                     <th>Misure</th>
-                    <th>Rank 3 Mesi</th>
-                    <th>Rank 6 Mesi</th>
-                    <th>Rank 1 Anno</th>
-                    <th>Data Ultimo Ordine</th>
-                    <th>Totale Venduto</th>
-                    <th>Ultimo Mese</th>
-                    <th>Ultimi 6 Mesi</th>
-                    <th>Ultimo Anno</th>
-                    <th>Ultimi 2 Anni</th>
+                    <th>Rank 3 M</th>
+                    <th>Vendite 3 M</th>
+                    <th>Rank 6 M</th>
+                    <th>Vendite 6 M</th>
+                    <th>Rank 1 Y</th>
+                    <th>Vendite 1 Y</th>
+                    <th>Ult Ordi</th>
+                    <th>Tot Venduto</th>
+                    <th>Ult Mese</th>
+                    <th>Ult 6 Mesi</th>
+                    <th>Ult Anno</th>
+                    <th>Ult 2 Anni</th>
 
                 </tr>
             </thead>
@@ -63,9 +66,21 @@
                                 @if (isset($articolo->rank3M))
                                     <td>{{ $articolo->rank3M }}</td>
                                 @endif
+                                @if (isset($articolo->vendite3M))
+                                    <td>{{ $articolo->vendite3M }}</td>
+                                @endif
                                 @if (isset($articolo->rank6M))
                                     <td>{{ $articolo->rank6M }}</td>
                                 @endif
+                                @if (isset($articolo->vendite6M))
+                                    <td>{{ $articolo->vendite6M }}</td>
+                                @endif
+                                @if (isset($articolo->rank1Y))
+                                    <td>{{ $articolo->rank1Y }}</td>
+                                @endif
+                                @if (isset($articolo->vendite1Y))
+                                    <td>{{ $articolo->vendite1Y }}</td>
+                                @endif
                                 @if (isset($articolo->rank1Y))
                                     <td>{{ $articolo->rank1Y }}</td>
                                 @endif