diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 6d89c249..4c2b8053 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -30,13 +30,19 @@ class ArticleController extends Controller ->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 o.Codice, o.QtaDisponibile FROM T_WEB_Disponibile o JOIN (SELECT Codice, MAX(DataOra) as data1 from T_WEB_Disponibile GROUP BY Codice) p ON o.Codice = p.Codice AND o.DataOra = p.data1 ) q'), function ($join) { + $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.Codice'); + }) + ->select('T_WEB_Articoli.*', 'f.DescrizioneStatoProdotto', 'i.DescrizioneTipologia', 'n.DescrizioneFormato', + 'o.QtaDisponibile', DB::raw('COALESCE(o.totaleVenduti, 0) as totaleVenduti')) ->where('DescrizioneStatoProdotto','In commercio') ->where('DescrizioneTipologia','Libri') + ->where(DB::raw('CONVERT(INT, QtaDisponibile)'),'!=',0) ->orderBy('totaleVenduti', 'desc') ->get(); diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php index ecc6319d..0a22eabf 100644 --- a/resources/views/export_articles_sales.blade.php +++ b/resources/views/export_articles_sales.blade.php @@ -24,7 +24,8 @@