diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 8d375698..b8f4b6ba 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -199,7 +199,7 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totVen 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 + ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti3mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank3M FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) GROUP BY CodArticoloGM) p'), function ($join) { @@ -231,11 +231,15 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as totFat FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) u'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'u.CodArticolo'); }) + ->leftJoin(DB::raw('(SELECT v.IdCollana, v.Descrizione as DescrizioneCollana FROM T_WEB_Collane v JOIN (SELECT IdCollana from T_WEB_Collane GROUP BY IdCollana) x ON v.IdCollana = x.IdCollana) y'), function ($join) { + $join->on('T_WEB_Articoli.IdCollana', '=', 'y.IdCollana'); + }) ->select( 'T_WEB_Articoli.*', 'f.DescrizioneStatoProdotto', 'i.DescrizioneTipologia', 'n.DescrizioneFormato', + 'y.DescrizioneCollana', DB::raw('COALESCE(o.totVen, 0) as totVen'), DB::raw('COALESCE(u.totFat, 0) as totFat'), DB::raw('COALESCE(p.venduti3mesi, 0) as venduti3mesi'), @@ -509,6 +513,7 @@ class ArticleController extends Controller 'title' => $articoloVenduto->Titolo, 'DataPubblicazione' => $articoloVenduto->DataPubblicazione, 'isbn' => $articoloVenduto->Ean13, + 'IdCollana' => $articoloVenduto->IdCollana, 'Pagine' => $articoloVenduto->Pagine, 'IdTipoFormato' => $articoloVenduto->IdTipoFormato, 'misure' => $articoloVenduto->misure, diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php index cc8877f0..633461e8 100644 --- a/resources/views/export_articles_sales.blade.php +++ b/resources/views/export_articles_sales.blade.php @@ -19,6 +19,7 @@