diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 58436a5e..2cbf6e91 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -19,7 +19,7 @@ class ArticleController extends Controller $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo') ->on('T_WEB_Articoli.DataOra', '=', 'b.data'); }) - ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WOO_Ordini GROUP BY CodArticoloGM) O'), 'T_WEB_Articoli.IdArticolo', '=', 'O.CodArticoloGM') + ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WEB_Ordini GROUP BY CodArticoloGM) O'), 'T_WEB_Articoli.IdArticolo', '=', 'O.CodArticoloGM') ->leftJoin(DB::raw('(SELECT g.IdTipologia, g.Descrizione as DescrizioneTipologia FROM T_WEB_Tipologie g JOIN (SELECT IdTipologia, MAX(DataOra) as data1 from T_WEB_Tipologie GROUP BY IdTipologia) h ON g.IdTipologia = h.IdTipologia AND g.DataOra = h.data1 ) i'), function ($join) { $join->on('T_WEB_Articoli.IdTipologia', '=', 'i.IdTipologia'); }) @@ -44,12 +44,14 @@ class ArticleController extends Controller { ini_set("memory_limit", "512M"); try { - $ordini = DB::table('T_WOO_Ordini as O') + $ordini = DB::table('T_WEB_Ordini as O') + ->join('T_WEB_Articoli as A', 'O.CodArticoloGM', '=', 'A.IdArticolo') ->select( DB::raw('ROW_NUMBER() OVER (ORDER BY O.DataOra DESC) AS progressivo'), 'O.DataOra', 'O.Qta', - // 'A.Titolo' + 'A.Titolo', + 'A.Ean13' ) ->orderBy('O.DataOra', 'desc') ->take(100) @@ -81,29 +83,29 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT l.IdTipoFormato, l.Descrizione as DescrizioneFormato FROM T_WEB_TipiFormato l JOIN (SELECT IdTipoFormato, MAX(DataOra) as data1 from T_WEB_TipiFormato GROUP BY IdTipoFormato) m ON l.IdTipoFormato = m.IdTipoFormato AND l.DataOra = m.data1 ) n'), function ($join) { $join->on('T_WEB_Articoli.IdTipoFormato', '=', 'n.IdTipoFormato'); }) - ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WOO_Ordini GROUP BY CodArticoloGM) o'), function ($join) { + ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WEB_Ordini GROUP BY CodArticoloGM) o'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'o.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti3mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank3M - FROM T_WOO_Ordini + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) GROUP BY CodArticoloGM) p'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'p.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti6mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank6M - FROM T_WOO_Ordini + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) GROUP BY CodArticoloGM) q'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti1anno, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank1Y - FROM T_WOO_Ordini + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -12, GETDATE()) GROUP BY CodArticoloGM) r'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'r.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, MAX(DataOra) as ultimoOrdine - FROM T_WOO_Ordini + FROM T_WEB_Ordini GROUP BY CodArticoloGM) s'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 's.CodArticoloGM'); }) diff --git a/resources/views/ordini_test.blade.php b/resources/views/ordini_test.blade.php index bd82451a..b09d63d9 100644 --- a/resources/views/ordini_test.blade.php +++ b/resources/views/ordini_test.blade.php @@ -18,6 +18,7 @@ Data Ora Quantità Titolo Articolo + Ean13 @@ -29,6 +30,8 @@ @if (isset($articolo->Titolo)){{ $ordine->Titolo }}@endif + @if (isset($articolo->Ean13)){{ $ordine->Ean13 }}@endif + @endforeach